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>
This commit is contained in:
Rafaël Carré
2015-11-19 14:14:56 +01:00
committed by Martin Jansa
parent 890ec9362f
commit 07448b6ee3
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \ virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
libdvdcss libdvdread lua-native lua libidn \ lua-native lua libidn \
avahi libjpeg-turbo xz libmodplug mpeg2dec \ avahi libjpeg-turbo xz libmodplug mpeg2dec \
libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
tiff xcb-util-keysyms" tiff xcb-util-keysyms"
@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
ARM_INSTRUCTION_SET = "arm" ARM_INSTRUCTION_SET = "arm"
EXTRA_OECONF = "\ EXTRA_OECONF = "\
--enable-dvdread \
--with-contrib \ --with-contrib \
--enable-run-as-root \ --enable-run-as-root \
--enable-xvideo \ --enable-xvideo \
@@ -43,7 +42,7 @@ EXTRA_OECONF = "\
ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
" "
PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype" PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread"
PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
@@ -62,7 +61,7 @@ PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs" PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs, gnome-vfs"
PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp"
PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav" PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss"
PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2"
PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg"
PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg"
@@ -73,6 +72,7 @@ PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+" PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
do_configure_prepend() { do_configure_prepend() {
cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true