Patchwork [WIP,21/66] vlc: Add PACKAGECONFIG for undeterministic dependencies

login
register
mail settings
Submitter Martin Jansa
Date Aug. 29, 2013, 3:51 p.m.
Message ID <58dc1e31a8235e414a5e18d9d5039f554b0baf3b.1377791377.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/56901/
State New, archived
Headers show

Comments

Martin Jansa - Aug. 29, 2013, 3:51 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index f3d8a03..db303be 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -3,7 +3,7 @@  HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPLv2"
 SECTION = "multimedia"
 
-DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
+DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
 
@@ -56,7 +56,6 @@  EXTRA_OECONF = "\
     --enable-png \
     --enable-live555 --enable-tremor \
     --enable-v4l2 --enable-v4l --disable-aa --disable-faad \
-    --enable-dbus \
     --without-contrib \
     --without-kde-solid \
     --disable-opengl --disable-glx \
@@ -66,10 +65,27 @@  EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
+# keep libv4l enabled by default, otherwise v4l2 enabled in EXTRA_OECONF fails with:
+# | v4l2.c:521:18: error: 'V4L2_CID_HCENTER' undeclared here (not in a function)
+PACKAGECONFIG ??= "libv4l"
+
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs,gnome-vfs"
+PACKAGECONFIG[portaudio] = "--enable-portaudio,--disable-portaudio,portaudio-v19"
+PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
+PACKAGECONFIG[libv4l] = "--enable-libv4l,--disable-libv4l,libv4l"
+PACKAGECONFIG[mtp] = "--enable-mtp,--disable-mtp,libmtp"
+PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska"
+PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,samba"
+PACKAGECONFIG[libsdl-image] = "--enable-libsdl-image,--disable-libsdl-image,libsdl-image"
+PACKAGECONFIG[ncurses] = "--enable-ncurses,--disable-ncurses,ncurses"
+PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
+PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
 
 do_configure() {
     cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/