Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 25302469b6ceb2fa10ac68c07da25c6068ffd218 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 7 Nov 2018 01:16:59 -0800 |
| 4 | Subject: [PATCH] Fix build with vc4 driver |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | SubtitleRenderer.cpp | 7 ++++++- |
| 9 | SubtitleRenderer.h | 1 + |
| 10 | 2 files changed, 7 insertions(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/SubtitleRenderer.cpp b/SubtitleRenderer.cpp |
| 13 | index 540162f..fcfc708 100644 |
| 14 | --- a/SubtitleRenderer.cpp |
| 15 | +++ b/SubtitleRenderer.cpp |
| 16 | @@ -36,6 +36,11 @@ |
| 17 | #include <algorithm> |
| 18 | |
| 19 | #include "bcm_host.h" |
| 20 | +typedef struct { |
| 21 | + DISPMANX_ELEMENT_HANDLE_T element; |
| 22 | + int width; |
| 23 | + int height; |
| 24 | +} EGL_DISPMANX_WINDOW_T; |
| 25 | |
| 26 | class BoxRenderer { |
| 27 | VGPath path_; |
| 28 | @@ -618,4 +623,4 @@ void SubtitleRenderer::set_rect(int x1, int y1, int x2, int y2) BOOST_NOEXCEPT |
| 29 | float font_size = height*font_size_; |
| 30 | ENFORCE(!FT_Set_Pixel_Sizes(ft_face_, 0, font_size)); |
| 31 | ENFORCE(!FT_Set_Pixel_Sizes(ft_face_italic_, 0, font_size)); |
| 32 | -} |
| 33 | \ No newline at end of file |
| 34 | +} |
| 35 | diff --git a/SubtitleRenderer.h b/SubtitleRenderer.h |
| 36 | index 3f60798..ebac9a1 100644 |
| 37 | --- a/SubtitleRenderer.h |
| 38 | +++ b/SubtitleRenderer.h |
| 39 | @@ -26,6 +26,7 @@ |
| 40 | // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 41 | // DEALINGS IN THE SOFTWARE. |
| 42 | |
| 43 | +#include <interface/vmcs_host/vc_dispmanx.h> |
| 44 | #include <EGL/egl.h> |
| 45 | #include <VG/openvg.h> |
| 46 | #include <ft2build.h> |
| 47 | -- |
| 48 | 2.19.1 |
| 49 | |