* [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default)
@ 2016-02-10 12:54 Rafaël Carré
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
2016-03-02 19:24 ` [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE " Martin Jansa
0 siblings, 2 replies; 6+ messages in thread
From: Rafaël Carré @ 2016-02-10 12:54 UTC (permalink / raw)
To: openembedded-devel
---
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 46dbd5d..2887a68 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -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
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)
2016-02-10 12:54 [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default) Rafaël Carré
@ 2016-02-10 12:54 ` Rafaël Carré
2016-02-10 13:19 ` Martin Jansa
2016-02-10 13:25 ` [meta-multimedia][PATCHv2] " Rafaël Carré
2016-03-02 19:24 ` [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE " Martin Jansa
1 sibling, 2 replies; 6+ messages in thread
From: Rafaël Carré @ 2016-02-10 12:54 UTC (permalink / raw)
To: openembedded-devel
---
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 2887a68..c85a811 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -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"
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
@ 2016-02-10 13:19 ` Martin Jansa
2016-02-10 13:20 ` Rafaël Carré
2016-02-10 13:25 ` [meta-multimedia][PATCHv2] " Rafaël Carré
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2016-02-10 13:19 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2007 bytes --]
On Wed, Feb 10, 2016 at 01:54:22PM +0100, Rafaël Carré wrote:
> ---
Did you forget to add sdl to default PACKAGECONFIG?
> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 2887a68..c85a811 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -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"
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)
2016-02-10 13:19 ` Martin Jansa
@ 2016-02-10 13:20 ` Rafaël Carré
0 siblings, 0 replies; 6+ messages in thread
From: Rafaël Carré @ 2016-02-10 13:20 UTC (permalink / raw)
To: openembedded-devel
On 10/02/2016 14:19, Martin Jansa wrote:
> On Wed, Feb 10, 2016 at 01:54:22PM +0100, Rafaël Carré wrote:
>> ---
>
> 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)}
?
>> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> index 2887a68..c85a811 100644
>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> @@ -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"
>> --
>> 2.5.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-multimedia][PATCHv2] vlc: make sdl optional (enabled by default)
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
2016-02-10 13:19 ` Martin Jansa
@ 2016-02-10 13:25 ` Rafaël Carré
1 sibling, 0 replies; 6+ messages in thread
From: Rafaël Carré @ 2016-02-10 13:25 UTC (permalink / raw)
To: openembedded-devel
---
Add sdl to x11 check
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 2887a68..3267dad 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -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"
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default)
2016-02-10 12:54 [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default) Rafaël Carré
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
@ 2016-03-02 19:24 ` Martin Jansa
1 sibling, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2016-03-02 19:24 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3171 bytes --]
On Wed, Feb 10, 2016 at 01:54:21PM +0100, Rafaël Carré wrote:
> ---
> meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 46dbd5d..2887a68 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -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)}"
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.
> 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
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-02 19:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-10 12:54 [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default) Rafaël Carré
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
2016-02-10 13:19 ` Martin Jansa
2016-02-10 13:20 ` Rafaël Carré
2016-02-10 13:25 ` [meta-multimedia][PATCHv2] " Rafaël Carré
2016-03-02 19:24 ` [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE " Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.