From 12bd2ffe3c19609594773a2dda5ac6dafba02242 Mon Sep 17 00:00:00 2001 From: hschang Date: Wed, 2 Jul 2014 13:47:37 +0900 Subject: [PATCH] [libtuxtxt] build fix --- .../recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb | 6 ++++-- .../tuxbox-libtuxtxt/libtuxtxt_buildfix.patch | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt/libtuxtxt_buildfix.patch diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb index 63ade82..9f9e70f 100644 --- a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb +++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://libtuxtxt/libtuxtxt.c;endline=19;md5=75fd12b0664044ec DEPENDS = "dreambox-dvbincludes libpng freetype" PR = "r3" -SRC_URI = "git://code.vuplus.com/git/tuxbox-libs.git;protocol=git;tag=HEAD \ +SRCREV = "master" + +SRC_URI = "git://code.vuplus.com/git/tuxbox-libs.git;protocol=git \ file://acinclude.m4 \ file://ignorelibs.patch \ file://32bpp.diff \ @@ -12,6 +14,7 @@ SRC_URI = "git://code.vuplus.com/git/tuxbox-libs.git;protocol=git;tag=HEAD \ file://allow_different_demux.diff \ file://videodev2.patch \ file://libz.patch \ + file://libtuxtxt_buildfix.patch \ " S = "${WORKDIR}/git" @@ -24,4 +27,3 @@ do_configure_prepend() { } CPPFLAGS += "-DHAVE_DREAMBOX_HARDWARE -DDREAMBOX" - diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt/libtuxtxt_buildfix.patch b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt/libtuxtxt_buildfix.patch new file mode 100644 index 0000000..ff08183 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt/libtuxtxt_buildfix.patch @@ -0,0 +1,22 @@ +diff --git a/libtuxtxt/tuxtxt_common.h b/libtuxtxt/tuxtxt_common.h +index 207fdaa..1590217 100644 +--- a/libtuxtxt/tuxtxt_common.h ++++ b/libtuxtxt/tuxtxt_common.h +@@ -5313,7 +5313,7 @@ int tuxtxt_InitRendering(tstRenderInfo* renderinfo,int setTVFormat) + if ((error = FTC_Manager_LookupFace(renderinfo->manager, renderinfo->typettf.face_id, &renderinfo->face))) + { + renderinfo->typettf.face_id = (renderinfo->usettf ? (FTC_FaceID) TUXTXTTTF : TUXTXTOTB); +- if ((error = FTC_Manager_Lookup_Face(renderinfo->manager, renderinfo->typettf.face_id, &renderinfo->face))) ++ if ((error = FTC_Manager_LookupFace(renderinfo->manager, renderinfo->typettf.face_id, &renderinfo->face))) + { + #else + renderinfo->typettf.image_type = ftc_image_mono; +@@ -5323,7 +5323,7 @@ int tuxtxt_InitRendering(tstRenderInfo* renderinfo,int setTVFormat) + if ((error = FTC_Manager_Lookup_Face(renderinfo->manager, renderinfo->typettf.font.face_id, &renderinfo->face))) + { + #endif +- printf("TuxTxt \n", error); ++ printf("TuxTxt \n", error); + FTC_Manager_Done(renderinfo->manager); + FT_Done_FreeType(renderinfo->library); + return 0; -- 2.7.4