[meta-multimedia][PULL REQUEST]

["Rafaël Carré" <funman@videolan.org>]

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(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 9adcdb1..ce3601d 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -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