summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2015-11-19 14:14:56 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:30:22 +0100
commit07448b6ee33e7b4302cf44da5efcd595fcd0e214 (patch)
tree6515f6e7ea83d5b8fb00a034e8380feaac35a63e /meta-multimedia
parent890ec9362f3b34cd4ede9c9e96081adcd58a735a (diff)
downloadmeta-openembedded-07448b6ee33e7b4302cf44da5efcd595fcd0e214.tar.gz
VLC: make libdvdread PACKAGECONFIG
Enable it by default. Make both dvdread and dvdnav also depend on libdvdcss Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index af39ae6d1..99a6c6659 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ 8DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
9 virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \ 9 virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
10 tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ 10 tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
11 libdvdcss libdvdread lua-native lua libidn \ 11 lua-native lua libidn \
12 avahi libjpeg-turbo xz libmodplug mpeg2dec \ 12 avahi libjpeg-turbo xz libmodplug mpeg2dec \
13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ 13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
14 tiff xcb-util-keysyms" 14 tiff xcb-util-keysyms"
@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
22ARM_INSTRUCTION_SET = "arm" 22ARM_INSTRUCTION_SET = "arm"
23 23
24EXTRA_OECONF = "\ 24EXTRA_OECONF = "\
25 --enable-dvdread \
26 --with-contrib \ 25 --with-contrib \
27 --enable-run-as-root \ 26 --enable-run-as-root \
28 --enable-xvideo \ 27 --enable-xvideo \
@@ -43,7 +42,7 @@ EXTRA_OECONF = "\
43 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ 42 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
44" 43"
45 44
46PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype" 45PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread"
47PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" 46PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
48PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" 47PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
49PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 48PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
@@ -62,7 +61,7 @@ PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
62PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs" 61PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs"
63PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" 62PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
64PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" 63PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp"
65PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav" 64PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss"
66PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" 65PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2"
67PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" 66PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg"
68PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" 67PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg"
@@ -73,6 +72,7 @@ PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
73PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+" 72PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
74PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" 73PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
75PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" 74PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
75PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
76 76
77do_configure_prepend() { 77do_configure_prepend() {
78 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true 78 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true