[libtuxtxt] build fix

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
index 63ade82..9f9e70f 100644 (file)
--- 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 (file)
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 <FTC_Manager_Lookup_Face failed with Errorcode 0x%.2X>\n", error);
++                      printf("TuxTxt <FTC_Manager_LookupFace failed with Errorcode 0x%.2X>\n", error);
+                       FTC_Manager_Done(renderinfo->manager);
+                       FT_Done_FreeType(renderinfo->library);
+                       return 0;