diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-01 07:50:24 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-18 09:22:38 +0100 |
| commit | 6d7b3097b4084d5ffdfac0cee2fba2c825a7a827 (patch) | |
| tree | 679fe586b2898646a9b1a34d58786fbbe2679587 | |
| parent | 30cd9379972711746b057e49ededb26749bb51a1 (diff) | |
vlc: fix build with newer freetype from oe-core
* 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>
| -rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch | 16 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch new file mode 100644 index 00000000..100ba972 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch @@ -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) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb index e88e9647..b381e468 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb @@ -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" |