mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

vlc: make x11 DISTRO_FEATURE optional (enabled by default)

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Rafaël Carré
2016-02-10 13:54:21 +01:00
committed by Armin Kuster
parent 8b03f47c22
commit 9a2f0196fc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-multimedia/vlc/vlc.inc
+4 -5
View File
@@ -7,17 +7,15 @@ 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 fluidsynth alsa-lib \
lua-native lua libidn \ lua-native lua libidn \
avahi jpeg xz libmodplug mpeg2dec \ avahi jpeg xz libmodplug mpeg2dec \
libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
tiff xcb-util-keysyms" tiff"
SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
inherit autotools gettext pkgconfig distro_features_check inherit autotools gettext pkgconfig distro_features_check
# depends on libxinerama libxpm xcb-util-keysyms
REQUIRED_DISTRO_FEATURES = "x11"
ARM_INSTRUCTION_SET = "arm" ARM_INSTRUCTION_SET = "arm"
@@ -41,7 +39,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 dvdread" PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
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"
@@ -73,6 +71,7 @@ PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfi
PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama"
do_configure_prepend() { do_configure_prepend() {
cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true