summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/vlc
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-01 07:50:24 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-18 09:22:38 +0100
commit6d7b3097b4084d5ffdfac0cee2fba2c825a7a827 (patch)
tree679fe586b2898646a9b1a34d58786fbbe2679587 /meta-multimedia/recipes-multimedia/vlc
parent30cd9379972711746b057e49ededb26749bb51a1 (diff)
downloadmeta-openembedded-6d7b3097b4084d5ffdfac0cee2fba2c825a7a827.tar.gz
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>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/vlc')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch16
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb1
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 000000000..100ba9724
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2
3Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
4
5diff -uNr vlc-1.1.11.orig/modules/misc/freetype.c vlc-1.1.11/modules/misc/freetype.c
6--- vlc-1.1.11.orig/modules/misc/freetype.c 2011-07-09 17:18:51.000000000 +0200
7+++ vlc-1.1.11/modules/misc/freetype.c 2014-02-01 07:45:32.078131862 +0100
8@@ -60,7 +60,7 @@
9 #endif
10
11 /* Freetype */
12-#include <freetype/ftsynth.h>
13+#include <freetype2/ftsynth.h>
14 #include FT_FREETYPE_H
15 #include FT_GLYPH_H
16 #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 e88e9647d..b381e4682 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"
6require vlc.inc 6require vlc.inc
7 7
8SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch" 8SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
9SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
9 10
10PR = "r4" 11PR = "r4"
11 12