Patchwork [meta-multimedia,2/2] vlc: fix build with newer freetype from oe-core

login
register
mail settings
Submitter Martin Jansa
Date Feb. 1, 2014, 7:37 a.m.
Message ID <1391240222-2020-2-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/66205/
State Accepted, archived
Headers show

Comments

Martin Jansa - Feb. 1, 2014, 7:37 a.m.
* 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>
---
 .../vlc/vlc/0002-fix-build-with-newer-freetype.patch     | 16 ++++++++++++++++
 meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb     |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch

Patch

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 0000000..100ba97
--- /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 e88e964..b381e46 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"