vlc: dependency change: ffmpeg -> ffmpeg-compat

2 files changed, 12 insertions, 51 deletions

diff --git a/vlc/.footprint b/vlc/.footprint
index 7368ce7e3..2b7098ab0 100644
--- a/vlc/.footprint
+++ b/vlc/.footprint
@@ -1,9 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cvlc
+-rwxr-xr-x	root/root	usr/bin/nvlc
 -rwxr-xr-x	root/root	usr/bin/qvlc
 -rwxr-xr-x	root/root	usr/bin/rvlc
--rwxr-xr-x	root/root	usr/bin/svlc
 -rwxr-xr-x	root/root	usr/bin/vlc
 -rwxr-xr-x	root/root	usr/bin/vlc-wrapper
 drwxr-xr-x	root/root	usr/include/
@@ -124,8 +124,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_bd_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_mms_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_mms_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_mtp_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libaccess_mtp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libattachment_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libattachment_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libavio_plugin.la
@@ -134,8 +132,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libcdda_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libdtv_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libdtv_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libdvb_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libdvb_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libfilesystem_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libfilesystem_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libftp_plugin.la
@@ -146,20 +142,18 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/access/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libidummy_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libimem_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libimem_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/liblibbluray_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/liblibbluray_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/liblinsys_hdsdi_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/liblinsys_hdsdi_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librar_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librar_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librdp_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librdp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librtp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/librtp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libsdp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libsdp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libshm_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libshm_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libsmb_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libsmb_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libtcp_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libtcp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/access/libtimecode_plugin.la
@@ -202,8 +196,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libcompressor_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdtstospdif_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libdtstospdif_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libequalizer_plugin.la
@@ -224,8 +216,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libparam_eq_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libremap_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libremap_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libsamplerate_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libsamplerate_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libscaletempo_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libscaletempo_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.la
@@ -279,10 +269,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libdvbsub_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libedummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libedummy_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libfaad_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libfaad_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libflac_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libflac_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libg711_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libg711_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libhwdummy_plugin.la
@@ -291,12 +277,12 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libjpeg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblibass_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblibass_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblpcm_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/liblpcm_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libopus_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libopus_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libpng_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/librawvideo_plugin.la
@@ -305,8 +291,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libschroedinger_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libscte27_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libscte27_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspeex_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libspudec_plugin.la
@@ -339,6 +323,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libvpx_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libx264_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libx264_plugin.so
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libx265_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libx265_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libxwd_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/codec/libxwd_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
@@ -354,8 +340,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/control/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libnetsync_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/liboldrc_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/liboldrc_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libaiff_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libaiff_plugin.so
@@ -389,14 +373,10 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libimage_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmjpeg_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmkv_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmod_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmod_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmp4_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmp4_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmpc_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmpc_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmpgv_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libmpgv_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libnsc_plugin.la
@@ -425,8 +405,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libsmf_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libsubtitle_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libsubtitle_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libts_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libtta_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libtta_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libty_plugin.la
@@ -442,10 +420,10 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libxa_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/demux/libxa_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libncurses_plugin.la
+-rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libncurses_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libqt4_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libqt4_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libskins2_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/gui/libskins2_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/meta_engine/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/meta_engine/libfolder_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/meta_engine/libfolder_plugin.so
@@ -487,13 +465,8 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_ogg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_ps_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_ps_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_ts_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_ts_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_wav_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/mux/libmux_wav_plugin.so
-drwxr-xr-x	root/root	usr/lib/vlc/plugins/notify/
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/notify/libnotify_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/notify/libnotify_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
@@ -521,8 +494,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/packetizer/
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmtp_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/services_discovery/libsap_plugin.la
@@ -584,8 +555,6 @@ drwxr-xr-x	root/root	usr/lib/vlc/plugins/stream_out/
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.so
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libsvg_plugin.la
--rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libsvg_plugin.so
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libtdummy_plugin.la
 -rwxr-xr-x	root/root	usr/lib/vlc/plugins/text_renderer/libtdummy_plugin.so
 drwxr-xr-x	root/root	usr/lib/vlc/plugins/vdpau/
@@ -809,14 +778,6 @@ drwxr-xr-x	root/root	usr/share/kde4/apps/solid/actions/
 -rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-opendvd.desktop
 -rw-r--r--	root/root	usr/share/kde4/apps/solid/actions/vlc-openvcd.desktop
 drwxr-xr-x	root/root	usr/share/vlc/
-drwxr-xr-x	root/root	usr/share/vlc/skins2/
--rw-r--r--	root/root	usr/share/vlc/skins2/default.vlt
-drwxr-xr-x	root/root	usr/share/vlc/skins2/fonts/
--rw-r--r--	root/root	usr/share/vlc/skins2/fonts/FreeSans.ttf
--rw-r--r--	root/root	usr/share/vlc/skins2/fonts/FreeSansBold.ttf
--rw-r--r--	root/root	usr/share/vlc/skins2/skin.catalog
--rw-r--r--	root/root	usr/share/vlc/skins2/skin.dtd
--rw-r--r--	root/root	usr/share/vlc/skins2/winamp2.xml
 drwxr-xr-x	root/root	usr/share/vlc/utils/
 -rwxr-xr-x	root/root	usr/share/vlc/utils/audio-vlc-default.sh
 -rwxr-xr-x	root/root	usr/share/vlc/utils/gnome-vlc-default.sh
diff --git a/vlc/Pkgfile b/vlc/Pkgfile
index 6cc68c43d..06f6a0dc4 100644
--- a/vlc/Pkgfile
+++ b/vlc/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://www.videolan.org/vlc/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: libmad, ffmpeg, qt4, libdvdnav, liba52, libgcrypt
+# Depends on: libmad, ffmpeg-compat, qt4, libdvdnav, liba52, libgcrypt
 
 name=vlc
 version=2.2.1
-release=1
+release=2
 source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz)
 
 build() {
@@ -19,7 +19,7 @@ build() {
   # initialize avformat structure
   sed -i 's/AVProbeData *pd;/AVProbeData pd={};/g' modules/demux/avformat/demux.c
 
-
+  PKG_CONFIG_PATH="/usr/lib/ffmpeg-compat/pkgconfig" \
   ./configure --prefix=/usr \
     --mandir=/usr/man \
     --disable-nls \