vlc: fix build with kernel headers 3.9 and newer
PATCH 1/2 vlc: fix build with kernel headers 3.9 and newer
* V4L2_CID_HCENTER and V4L2_CID_VCENTER removed from linux v3.9
--- ...orizontal-and-vertical-center-controls-ob.patch | 53 ++++++++++++++++++++++ .../recipes-multimedia/vlc/vlc_1.1.11.bb | 2 + 2 files changed, 55 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch
meta-multimedia/recipes-multimedia/vlc/vlc/0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 4da99e58bd1b06267793ef728a368e4032789376 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]> +Date: Sat, 1 Oct 2011 22:58:21 +0300 +Subject: [PATCH] V4L2: mark horizontal and vertical center controls obsolete + +Upstream-Status: Backport + +Signed-off-by: Martin Jansa <[email protected]> + +They were deprecated in Linux version 2.6.26. +--- + modules/access/v4l2/controls.c | 2 -- + modules/access/v4l2/video.c | 12 ++---------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff -uNr vlc-1.1.11.orig/modules/access/v4l2.c vlc-1.1.11/modules/access/v4l2.c +--- vlc-1.1.11.orig/modules/access/v4l2.c 2011-06-03 19:59:40.000000000 +0200 ++++ vlc-1.1.11/modules/access/v4l2.c 2014-02-01 07:38:28.905142516 +0100 +@@ -159,12 +159,6 @@ + #define VFLIP_TEXT N_( "Vertical flip" ) + #define VFLIP_LONGTEXT N_( \ + "Flip the video vertically (if supported by the v4l2 driver)." ) +-#define HCENTER_TEXT N_( "Horizontal centering" ) +-#define HCENTER_LONGTEXT N_( \ +- "Set the camera's horizontal centering (if supported by the v4l2 driver)." ) +-#define VCENTER_TEXT N_( "Vertical centering" ) +-#define VCENTER_LONGTEXT N_( \ +- "Set the camera's vertical centering (if supported by the v4l2 driver)." ) + + #define AUDIO_VOLUME_TEXT N_( "Volume" ) + #define AUDIO_VOLUME_LONGTEXT N_( \ +@@ -351,10 +345,8 @@ + HFLIP_LONGTEXT, true ) + add_integer( CFG_PREFIX "vflip", -1, NULL, VFLIP_TEXT, + VFLIP_LONGTEXT, true ) +- add_integer( CFG_PREFIX "hcenter", -1, NULL, HCENTER_TEXT, +- HCENTER_LONGTEXT, true ) +- add_integer( CFG_PREFIX "vcenter", -1, NULL, VCENTER_TEXT, +- VCENTER_LONGTEXT, true ) ++ add_obsolete_integer( CFG_PREFIX "hcenter" ) /* since Linux 2.6.26 */ ++ add_obsolete_integer( CFG_PREFIX "vcenter" ) /* since Linux 2.6.26 */ + add_integer( CFG_PREFIX "audio-volume", -1, NULL, AUDIO_VOLUME_TEXT, + AUDIO_VOLUME_LONGTEXT, true ) + add_integer( CFG_PREFIX "audio-balance", -1, NULL, AUDIO_BALANCE_TEXT, +@@ -518,8 +510,6 @@ + { "gain", V4L2_CID_GAIN }, + { "hflip", V4L2_CID_HFLIP }, + { "vflip", V4L2_CID_VFLIP }, +- { "hcenter", V4L2_CID_HCENTER }, +- { "vcenter", V4L2_CID_VCENTER }, + { NULL, 0 } + }; +
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb +2 -0
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13" require vlc.inc +SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch" + PR = "r4" # work around build failure
Signature · 1 line
1.8.5.3
PATCH 2/2 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 <[email protected]>
Date: Mon Nov 11 17:25:22 2013 +0000
Subject: freetype: upgrade to 2.5.0.1
--- .../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
meta-multimedia/recipes-multimedia/vlc/vlc/0002-fix-build-with-newer-freetype.patch new file +16 -0
@@ -0,0 +1,16 @@ +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <[email protected]> + +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)
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb +1 -0
@@ -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"
Signature · 1 line
1.8.5.3
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Jansa schreef op 01-02-14 08:37:
Quoted 1 line
*
V4L2_CID_HCENTERandV4L2_CID_VCENTERremoved from linux v3.9
Any volunteers to update vlc to 1.1.13 (2 years old) or 2.1.2 (2 months old)?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFS8LPgMkyGM64RGpERAus7AJ9DvBIc0TQlxq0x5gaHc0EYeIuK4QCfTbLC DMm4ye2CFWLT4S01BGJdmT8=
=4PkK
-----END PGP SIGNATURE-----
Quoted 8 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Martin Jansa schreef op 01-02-14 08:37:
Quoted 1 line
*
V4L2_CID_HCENTERandV4L2_CID_VCENTERremoved from linux v3.9Any volunteers to update vlc to 1.1.13 (2 years old) or 2.1.2 (2 months old)?
I tried this about 6 months ago (for the then-current 2.x.x version of vlc) but ran into a bunch of problems. I can't remember what they were though - that'll teach me to keep a few notes in future!
Signature · 4 lines
Paul Barker Email: [email protected] http://www.paulbarker.me.uk
Quoted 7 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Martin Jansa schreef op 01-02-14 08:37:
Quoted 1 line
*
V4L2_CID_HCENTERandV4L2_CID_VCENTERremoved from linux v3.9Any volunteers to update vlc to 1.1.13 (2 years old) or 2.1.2 (2 months old)?
I would like to see 2* (required by emotion-generic-players), but don't have plans to work on it myself, because I have no use for that in runtime.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]