Skip to contentSkip to conversation

vlc: make x11 DISTRO_FEATURE optional (enabled by default)

PATCH Superseded Rafaël Carré 2 participants 6 messages Feb 10, 2016 – Mar 2, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 vlc: make x11 DISTRO_FEATURE optional (enabled by default)

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +4 -5
index 46dbd5d..2887a68 100644
@@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
    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 \
    avahi jpeg xz libmodplug mpeg2dec \
    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"
 
 inherit autotools gettext pkgconfig distro_features_check
-# depends on libxinerama libxpm xcb-util-keysyms
-REQUIRED_DISTRO_FEATURES = "x11"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -41,7 +39,7 @@ EXTRA_OECONF = "\
     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[a52] = "--enable-a52,--disable-a52,liba52"
 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[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
 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() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
2.5.0
#1 lore raw

PATCH 2/2 vlc: make sdl optional (enabled by default)

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -2
index 2887a68..c85a811 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
-   virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
+   dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac fluidsynth alsa-lib \
    lua-native lua libidn \
    avahi jpeg xz libmodplug mpeg2dec \
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
     --disable-screen --disable-caca \
     --enable-httpd --enable-vlm \
     --enable-freetype \
-    --enable-sdl \ 
     --enable-png \
     --enable-tremor \
     --enable-v4l2 --disable-aa --disable-faad \
@@ -41,6 +40,7 @@ EXTRA_OECONF = "\
 
 PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
Signature · 1 line
2.5.0
#2 lore raw

Re: [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)

Quoted 1 line · Rafaël Carré

---

Did you forget to add sdl to default PACKAGECONFIG?

Quoted 40 lines
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -2
index 2887a68..c85a811 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
-   virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
+   dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac fluidsynth alsa-lib \
    lua-native lua libidn \
    avahi jpeg xz libmodplug mpeg2dec \
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
     --disable-screen --disable-caca \
     --enable-httpd --enable-vlm \
     --enable-freetype \
-    --enable-sdl \ 
     --enable-png \
     --enable-tremor \
     --enable-v4l2 --disable-aa --disable-faad \
@@ -41,6 +40,7 @@ EXTRA_OECONF = "\
 
 PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
Signature · 7 lines
2.5.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)

Quoted 4 lines · Martin Jansa
Quoted 1 line · Rafaël Carré

---

Did you forget to add sdl to default PACKAGECONFIG?

Oops yes,

sdl also depends on x11 and I am not sure how to add that dependency:
Something like

	{@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}

?

Quoted 34 lines
Quoted 34 lines
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -2
index 2887a68..c85a811 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
-   virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
+   dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac fluidsynth alsa-lib \
    lua-native lua libidn \
    avahi jpeg xz libmodplug mpeg2dec \
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
     --disable-screen --disable-caca \
     --enable-httpd --enable-vlm \
     --enable-freetype \
-    --enable-sdl \ 
     --enable-png \
     --enable-tremor \
     --enable-v4l2 --disable-aa --disable-faad \
@@ -41,6 +40,7 @@ EXTRA_OECONF = "\
 
 PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
Signature · 1 line
2.5.0
#4 lore raw

PATCH v2 1/1 vlc: make sdl optional (enabled by default)

In reply to Rafaël Carré

---
Add sdl to x11 check

 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3 -3
index 2887a68..3267dad 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
-   virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
+   dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac fluidsynth alsa-lib \
    lua-native lua libidn \
    avahi jpeg xz libmodplug mpeg2dec \
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
     --disable-screen --disable-caca \
     --enable-httpd --enable-vlm \
     --enable-freetype \
-    --enable-sdl \ 
     --enable-png \
     --enable-tremor \
     --enable-v4l2 --disable-aa --disable-faad \
@@ -39,8 +38,9 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
Signature · 1 line
2.5.0
#5 lore raw
In reply to Rafaël Carré
Quoted 29 lines · Rafaël Carré
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -4
index 46dbd5d..2887a68 100644
@@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
    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 \
    avahi jpeg xz libmodplug mpeg2dec \
    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"
 
 inherit autotools gettext pkgconfig distro_features_check
-# depends on libxinerama libxpm xcb-util-keysyms
-REQUIRED_DISTRO_FEATURES = "x11"
 
 ARM_INSTRUCTION_SET = "arm"
 

meta-multimedia/recipes-multimedia/vlc/vlc.inc EXTRA_OECONF = "\ · line 42

Quoted 5 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1 -1
@@ -41,7 +39,7 @@ EXTRA_OECONF = "\
     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)}"

Missing $ before {@ causes few QA errors:

vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES', [invalid-packageconfig] vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig]

Interesting that nobody noticed.

Quoted 19 lines
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1 -0
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 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[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
 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() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 7 lines
2.5.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]