CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlc: fix build with newer freetype from oe-core

Browse Source 
* ftsynth.h header was moved to freetype2 and vlc is broken since:
  commit 7cbf6060ac14b0f4d2f038f821ca980be0d46cb0
  Author: Ross Burton <ross.burton@intel.com>
  Date:   Mon Nov 11 17:25:22 2013 +0000
  Subject: freetype: upgrade to 2.5.0.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2014-02-01 07:50:24 +01:00
parent 30cd937997
commit 6d7b3097b4
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch Normal file
View File

@ -0,0 +1,16 @@
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
diff -uNr vlc-1.1.11.orig/modules/misc/freetype.c vlc-1.1.11/modules/misc/freetype.c
--- vlc-1.1.11.orig/modules/misc/freetype.c 2011-07-09 17:18:51.000000000 +0200
+++ vlc-1.1.11/modules/misc/freetype.c 2014-02-01 07:45:32.078131862 +0100
@@ -60,7 +60,7 @@
#endif
/* Freetype */
-#include <freetype/ftsynth.h>
+#include <freetype2/ftsynth.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#define FT_FLOOR(X) ((X & -64) >> 6)

1
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
View File

@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
require vlc.inc
SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
PR = "r4"