Skip to contentSkip to conversation

[meta-multimedia][PULL REQUEST]

GIT PULL In review Rafaël Carré 2 participants 9 messages Nov 19, 2015 – Dec 18, 2015

lore
Share & tools
lore

Rafaël Carré

author
#0 lore raw

The following changes since commit ea319464b673cbf9a416b582dc4766faeb998430:

vlc: add PACKAGECONFIG for samba, upnp, dvdnav, sftp, vorbis, dc1394,
dv1394, svg, svgdec (2015-11-16 21:50:11 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib funman/vlc

for you to fetch changes up to f36d074464df24595882c68743e43b7d57af448f:

  VLC: do not use --with-contrib (2015-11-19 13:22:16 +0100)

----------------------------------------------------------------
Rafaël Carré (6):
vlc: remove libdc1394 libraw1394 from DEPENDS
VLC: make libnotify a configurable dependency
VLC: explicit PACKAGECONFIG for fontconfig
VLC: explicit PACKAGECONFIG for freetype
VLC: make libdvdread PACKAGECONFIG
VLC: do not use --with-contrib

 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 9adcdb1..ce3601d 100644

meta-multimedia/recipes-multimedia/vlc/vlc.inc +0 -0
@@ -8,8 +8,8 @@ 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 \
-   libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \
-   libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
+   lua-native lua libidn \
+   avahi libjpeg-turbo xz libmodplug mpeg2dec \
    libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
    tiff xcb-util-keysyms"

@@ -22,8 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
ARM_INSTRUCTION_SET = "arm"

EXTRA_OECONF = "\
- --enable-dvdread \

-    --with-contrib \
     --enable-run-as-root \
     --enable-xvideo \
     --disable-screen --disable-caca \
@@ -43,7 +41,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \

"

-PACKAGECONFIG ?= " live555"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread"
PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
@@ -62,7 +60,7 @@ PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
PACKAGECONFIG[gnome-vfs] = "--enable-gnomevfs,--disable-gnomevfs,
gnome-vfs"
PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" 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[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg"
@@ -70,6 +68,10 @@ PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394
libavc1394"
PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
+PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+" +PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
+PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"

 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
author
#1 lore raw

PATCH 1/6 vlc: remove libdc1394 libraw1394 from DEPENDS

They are only needed if the modules introduced in ea31946 are enabled. Add these modules to default PACKAGECONFIG to keep existing defaults.

---
 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 9adcdb1..dd00174 100644
@@ -9,7 +9,7 @@ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
    virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
    tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \
    libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \
-   libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \
+   avahi libjpeg-turbo xz libmodplug mpeg2dec \
    libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
    tiff xcb-util-keysyms"
 

@@ -43,7 +43,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555"
+PACKAGECONFIG ?= " live555 dc1394 dv1394"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
Signature · 1 line
2.5.0
author
#2 lore raw

PATCH 2/6 VLC: make libnotify a configurable dependency

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +3 -2
index dd00174..0d0baed 100644
@@ -8,7 +8,7 @@ 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 \
-   libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \
+   libdvdcss libdvdread lua-native lua libidn \
    avahi libjpeg-turbo xz libmodplug mpeg2dec \
    libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
    tiff xcb-util-keysyms"

@@ -43,7 +43,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"

@@ -70,6 +70,7 @@ PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
 PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394"
 PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
 PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
+PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
2.5.0
author
#3 lore raw

PATCH 3/6 VLC: explicit PACKAGECONFIG for fontconfig

In reply to Rafaël Carré

Enable it by default

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -1
index 0d0baed..f93daf0 100644
@@ -43,7 +43,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"

@@ -71,6 +71,7 @@ PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394"
 PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
 PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
 PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
+PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
2.5.0
author
#4 lore raw

PATCH 4/6 VLC: explicit PACKAGECONFIG for freetype

In reply to Rafaël Carré

Enable it by default

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +2 -1
index f93daf0..af39ae6 100644
@@ -43,7 +43,7 @@ EXTRA_OECONF = "\
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype"
 PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
 PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
 PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"

@@ -72,6 +72,7 @@ PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
 PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
 PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
 PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
+PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
2.5.0
author
#5 lore raw

PATCH 5/6 VLC: make libdvdread PACKAGECONFIG

In reply to Rafaël Carré

Enable it by default.
Make both dvdread and dvdnav also depend on libdvdcss

---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +4 -4
index af39ae6..99a6c66 100644
@@ -8,7 +8,7 @@ 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 \
-   libdvdcss libdvdread lua-native lua libidn \
+   lua-native lua libidn \
    avahi libjpeg-turbo xz libmodplug mpeg2dec \
    libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
    tiff xcb-util-keysyms"

@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_OECONF = "\
-    --enable-dvdread \
     --with-contrib \
     --enable-run-as-root \
     --enable-xvideo \ 

@@ -43,7 +42,7 @@ EXTRA_OECONF = "\
     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[a52] = "--enable-a52,--disable-a52,liba52"
 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[samba] = "--enable-smbclient,--disable-smbclient, samba"
 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[vorbis] = "--enable-vorbis,--disable-vorbis,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[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
 PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
+PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
 
 do_configure_prepend() {
     cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
Signature · 1 line
2.5.0
author
#6 lore raw

PATCH 6/6 VLC: do not use --with-contrib

In reply to Rafaël Carré
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 -
 1 file changed, 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0 -1
index 99a6c66..ce3601d 100644
@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_OECONF = "\
-    --with-contrib \
     --enable-run-as-root \
     --enable-xvideo \ 
     --disable-screen --disable-caca \
Signature · 1 line
2.5.0
#7 lore raw

Re: [meta-multimedia][PATCH 6/6] VLC: do not use --with-contrib

Quoted 1 line · Rafaël Carré

---

I'll finally merge this patchset today, but can you please fix:

vlc-2.2.1: vlc rdepends on libvncserver, but it isn't a build dependency? [build-deps]

in follow-up change?

Quoted 23 lines
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 -
 1 file changed, 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0 -1
index 99a6c66..ce3601d 100644
@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_OECONF = "\
-    --with-contrib \
     --enable-run-as-root \
     --enable-xvideo \ 
     --disable-screen --disable-caca \
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]
author
#8 lore raw

Re: [meta-multimedia][PATCH 6/6] VLC: do not use --with-contrib

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

---

I'll finally merge this patchset today, but can you please fix:

vlc-2.2.1: vlc rdepends on libvncserver, but it isn't a build dependency? [build-deps]

in follow-up change?

Sure

Quoted 17 lines
Quoted 17 lines
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 -
 1 file changed, 1 deletion(-)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +0 -1
index 99a6c66..ce3601d 100644
@@ -22,7 +22,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_OECONF = "\
-    --with-contrib \
     --enable-run-as-root \
     --enable-xvideo \ 
     --disable-screen --disable-caca \
Signature · 1 line
2.5.0