[SCM] vlc/master: Multi-arch-ify
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat Oct 15 16:50:24 UTC 2016
The following commit has been merged in the master branch:
commit 512b44fe9494a46b7312e8f161bc3b64075b4817
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Oct 15 18:03:56 2016 +0200
Multi-arch-ify
diff --git a/debian/clean b/debian/clean
index 7ad2927..0c693c1 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,3 +2,5 @@ extras/analyser/vlc
extras/analyser/zsh_gen
po/*.gmo
po/stamp-po
+debian/libvlc-bin.post*
+debian/libvlc-bin.triggers
diff --git a/debian/control b/debian/control
index 047eb37..b74a3db 100644
--- a/debian/control
+++ b/debian/control
@@ -176,6 +176,7 @@ Description: multimedia player and streamer
Package: libvlc-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libvlc5 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlc
@@ -189,6 +190,7 @@ Description: development files for libvlc
Package: libvlc5
Section: libs
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libvlc-bin (= ${binary:Version})
@@ -203,6 +205,7 @@ Description: multimedia player and streamer library
Package: libvlccore-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libvlccore8 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlccore
@@ -215,11 +218,12 @@ Description: development files for libvlccore
Package: libvlccore8
Section: libs
+Multi-Arch: same
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libproxy-tools,
${misc:Depends},
${shlibs:Depends}
+Recommends: libproxy-tools
Description: base library for VLC and its modules
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
@@ -229,6 +233,7 @@ Description: base library for VLC and its modules
Package: libvlc-bin
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: vlc-nox (<< 2.2.4-7~)
@@ -282,6 +287,7 @@ Description: Translations for VLC
Package: vlc-plugin-base
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
vlc-data (= ${source:Version})
@@ -296,6 +302,7 @@ Description: multimedia player and streamer (base plugins)
Package: vlc-plugin-access-extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
@@ -310,6 +317,7 @@ Description: multimedia player and streamer (extra access plugins)
Package: vlc-plugin-video-splitter
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
@@ -324,6 +332,7 @@ Description: multimedia player and streamer (video splitter plugins)
Package: vlc-plugin-visualization
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
@@ -338,6 +347,7 @@ Description: multimedia player and streamer (visualization plugins)
Package: vlc-plugin-skins2
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
fonts-freefont-ttf
@@ -355,9 +365,9 @@ Description: multimedia player and streamer (Skins2 plugin)
Package: vlc-plugin-qt
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
-Enhances: vlc
Breaks: vlc (<< 2.2.4-7~)
Replaces: vlc (<< 2.2.4-7~)
Description: multimedia player and streamer (Qt plugin)
@@ -369,6 +379,7 @@ Description: multimedia player and streamer (Qt plugin)
Package: vlc-plugin-fluidsynth
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: fluid-soundfont-gm | musescore-soundfont-gm,
${misc:Depends},
@@ -384,6 +395,7 @@ Description: FluidSynth plugin for VLC
Package: vlc-plugin-jack
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@ -399,6 +411,7 @@ Description: Jack audio plugins for VLC
Package: vlc-plugin-notify
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@ -412,6 +425,7 @@ Description: LibNotify plugin for VLC
Package: vlc-plugin-sdl
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@ -427,6 +441,7 @@ Description: SDL video and audio output plugin for VLC
Package: vlc-plugin-svg
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@ -442,6 +457,7 @@ Description: SVG plugin for VLC
Package: vlc-plugin-zvbi
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@ -454,6 +470,7 @@ Description: VBI teletext plugin for VLC
Package: vlc-plugin-samba
Architecture: linux-any kfreebsd-any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: vlc-nox (<< 2.2.0~pre2-2~)
diff --git a/debian/libvlc-bin.install b/debian/libvlc-bin.install
index a40d666..a296739 100644
--- a/debian/libvlc-bin.install
+++ b/debian/libvlc-bin.install
@@ -1 +1 @@
-usr/lib/vlc/vlc-cache-gen
+usr/lib/*/vlc/vlc-cache-gen
diff --git a/debian/libvlc-bin.postinst.in b/debian/libvlc-bin.postinst.in
new file mode 100644
index 0000000..137841e
--- /dev/null
+++ b/debian/libvlc-bin.postinst.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+run_vlc_cache_gen() {
+ if ! /usr/lib/#DEB_HOST_MULTIARCH#/vlc/vlc-cache-gen -f /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins ; then
+ echo "WARNING: Regenerating VLC plugin cache failed."
+ echo "Please run '/usr/lib/#DEB_HOST_MULTIARCH#/vlc/vlc-cache-gen -f /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins' manually."
+ fi
+}
+
+case "$1" in
+ triggered)
+ run_vlc_cache_gen
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/libvlc-bin.postrm.in b/debian/libvlc-bin.postrm.in
new file mode 100644
index 0000000..159ea07
--- /dev/null
+++ b/debian/libvlc-bin.postrm.in
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+#DEBHELPER#
+
+if [ -d /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins ] ; then
+ rm -f /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins/plugins.dat
+ rmdir -p --ignore-fail-on-non-empty /usr/lib/#DEB_HOST_MULTIARCH#/vlc/plugins
+fi
diff --git a/debian/libvlc-bin.triggers b/debian/libvlc-bin.triggers
deleted file mode 100644
index e493a9c..0000000
--- a/debian/libvlc-bin.triggers
+++ /dev/null
@@ -1 +0,0 @@
-interest-noawait /usr/lib/vlc/plugins
diff --git a/debian/libvlc-dev.install b/debian/libvlc-dev.install
index 33d8b2f..ffaa00c 100644
--- a/debian/libvlc-dev.install
+++ b/debian/libvlc-dev.install
@@ -1,3 +1,3 @@
usr/include/vlc/*.h
-usr/lib/libvlc.so
-usr/lib/pkgconfig/libvlc.pc
+usr/lib/*/libvlc.so
+usr/lib/*/pkgconfig/libvlc.pc
diff --git a/debian/libvlc5.install b/debian/libvlc5.install
index 4aaafb6..2137b90 100644
--- a/debian/libvlc5.install
+++ b/debian/libvlc5.install
@@ -1 +1 @@
-usr/lib/libvlc.so.*
+usr/lib/*/libvlc.so.*
diff --git a/debian/libvlccore-dev.install b/debian/libvlccore-dev.install
index f8ef3bb..b90fe24 100644
--- a/debian/libvlccore-dev.install
+++ b/debian/libvlccore-dev.install
@@ -1,4 +1,4 @@
usr/include/vlc/plugins/*.h
-usr/lib/libvlccore.so
-usr/lib/pkgconfig/vlc-plugin.pc
-usr/lib/vlc/libcompat.a
+usr/lib/*/libvlccore.so
+usr/lib/*/pkgconfig/vlc-plugin.pc
+usr/lib/*/vlc/libcompat.a
diff --git a/debian/libvlccore8.install b/debian/libvlccore8.install
index 2c18f04..8066c95 100644
--- a/debian/libvlccore8.install
+++ b/debian/libvlccore8.install
@@ -1 +1 @@
-usr/lib/libvlccore.so.*
+usr/lib/*/libvlccore.so.*
diff --git a/debian/rules b/debian/rules
index 998d980..66b7d6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,6 @@ confflags += \
--disable-update-check \
--enable-fast-install \
--docdir=/usr/share/doc/vlc-data \
- --libdir=/usr/lib \
--with-binary-version=$(DEB_VERSION) \
$(NULL)
# configure features
@@ -411,3 +410,11 @@ override_dh_makeshlibs:
override_dh_bugfiles:
dh_bugfiles -A
+
+override_dh_installdeb:
+ sed 's/#DEB_HOST_MULTIARCH#/${DEB_HOST_MULTIARCH}/g' \
+ debian/libvlc-bin.postinst.in > debian/libvlc-bin.postinst
+ sed 's/#DEB_HOST_MULTIARCH#/${DEB_HOST_MULTIARCH}/g' \
+ debian/libvlc-bin.postrm.in > debian/libvlc-bin.postrm
+ echo 'interest-noawait /usr/lib/${DEB_HOST_MULTIARCH}/vlc/plugins' > debian/libvlc-bin.triggers
+ dh_installdeb
diff --git a/debian/vlc-plugin-access-extra.install b/debian/vlc-plugin-access-extra.install
index 62f9943..b1483d3 100644
--- a/debian/vlc-plugin-access-extra.install
+++ b/debian/vlc-plugin-access-extra.install
@@ -1,3 +1,3 @@
-usr/lib/vlc/plugins/access/librdp_plugin.so
-usr/lib/vlc/plugins/access/libvnc_plugin.so
-usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
+usr/lib/*/vlc/plugins/access/librdp_plugin.so
+usr/lib/*/vlc/plugins/access/libvnc_plugin.so
+usr/lib/*/vlc/plugins/access/libxcb_screen_plugin.so
diff --git a/debian/vlc-plugin-base.install b/debian/vlc-plugin-base.install
index ef4dce6..c2244ba 100755
--- a/debian/vlc-plugin-base.install
+++ b/debian/vlc-plugin-base.install
@@ -1,197 +1,197 @@
#!/bin/bash
exec python3 $(dirname $0)/filter-plugin.py <<EOF
-usr/lib/vlc/libvlc_vdpau.so*
-usr/lib/vlc/lua/
-usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so [alsa]
-usr/lib/vlc/plugins/access/libaccess_mms_plugin.so
-usr/lib/vlc/plugins/access/libaccess_mtp_plugin.so
-usr/lib/vlc/plugins/access/libaccess_oss_plugin.so [oss]
-usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
-usr/lib/vlc/plugins/access/libattachment_plugin.so
-usr/lib/vlc/plugins/access/libcdda_plugin.so [cdda]
-usr/lib/vlc/plugins/access/libdc1394_plugin.so [dc1394]
-usr/lib/vlc/plugins/access/libdtv_plugin.so [dtv]
-usr/lib/vlc/plugins/access/libdv1394_plugin.so [dv1394]
-usr/lib/vlc/plugins/access/libdvb_plugin.so [dvb]
-usr/lib/vlc/plugins/access/libdvdnav_plugin.so
-usr/lib/vlc/plugins/access/libdvdread_plugin.so
-usr/lib/vlc/plugins/access/libfilesystem_plugin.so
-usr/lib/vlc/plugins/access/libftp_plugin.so
-usr/lib/vlc/plugins/access/libhttp_plugin.so
-usr/lib/vlc/plugins/access/libidummy_plugin.so
-usr/lib/vlc/plugins/access/libimem_plugin.so
-usr/lib/vlc/plugins/access/liblibbluray_plugin.so
-usr/lib/vlc/plugins/access/liblinsys_hdsdi_plugin.so [linsys]
-usr/lib/vlc/plugins/access/liblinsys_sdi_plugin.so [linsys]
-usr/lib/vlc/plugins/access/liblive555_plugin.so
-usr/lib/vlc/plugins/access/libpulsesrc_plugin.so
-usr/lib/vlc/plugins/access/librar_plugin.so
-usr/lib/vlc/plugins/access/librtp_plugin.so
-usr/lib/vlc/plugins/access/libsdp_plugin.so
-usr/lib/vlc/plugins/access/libsftp_plugin.so
-usr/lib/vlc/plugins/access/libshm_plugin.so
-usr/lib/vlc/plugins/access/libtcp_plugin.so
-usr/lib/vlc/plugins/access/libtimecode_plugin.so
-usr/lib/vlc/plugins/access/libudp_plugin.so
-usr/lib/vlc/plugins/access/libv4l2_plugin.so [v4l2]
-usr/lib/vlc/plugins/access/libvcd_plugin.so [vcd]
-usr/lib/vlc/plugins/access/libvcdx_plugin.so
-usr/lib/vlc/plugins/access/libvdr_plugin.so
-usr/lib/vlc/plugins/access/libzip_plugin.so
-usr/lib/vlc/plugins/access_output
-usr/lib/vlc/plugins/arm_neon [neon]
-usr/lib/vlc/plugins/audio_filter
-usr/lib/vlc/plugins/audio_mixer
-usr/lib/vlc/plugins/audio_output/libadummy_plugin.so
-usr/lib/vlc/plugins/audio_output/libafile_plugin.so
-usr/lib/vlc/plugins/audio_output/libalsa_plugin.so [alsa]
-usr/lib/vlc/plugins/audio_output/libamem_plugin.so
-usr/lib/vlc/plugins/audio_output/liboss_plugin.so [oss]
-usr/lib/vlc/plugins/audio_output/libpulse_plugin.so
-usr/lib/vlc/plugins/audio_output/libsndio_plugin.so
-usr/lib/vlc/plugins/codec/liba52_plugin.so
-usr/lib/vlc/plugins/codec/libadpcm_plugin.so
-usr/lib/vlc/plugins/codec/libaes3_plugin.so
-usr/lib/vlc/plugins/codec/libaraw_plugin.so
-usr/lib/vlc/plugins/codec/libavcodec_plugin.so
-usr/lib/vlc/plugins/codec/libcc_plugin.so
-usr/lib/vlc/plugins/codec/libcdg_plugin.so
-usr/lib/vlc/plugins/codec/libcrystalhd_plugin.so [crystalhd]
-usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
-usr/lib/vlc/plugins/codec/libddummy_plugin.so
-usr/lib/vlc/plugins/codec/libdts_plugin.so
-usr/lib/vlc/plugins/codec/libdvbsub_plugin.so
-usr/lib/vlc/plugins/codec/libedummy_plugin.so
-usr/lib/vlc/plugins/codec/libfaad_plugin.so
-usr/lib/vlc/plugins/codec/libflac_plugin.so
-usr/lib/vlc/plugins/codec/libg711_plugin.so
-usr/lib/vlc/plugins/codec/libhwdummy_plugin.so
-usr/lib/vlc/plugins/codec/libjpeg_plugin.so
-usr/lib/vlc/plugins/codec/libkate_plugin.so
-usr/lib/vlc/plugins/codec/liblibass_plugin.so
-usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
-usr/lib/vlc/plugins/codec/liblpcm_plugin.so
-usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
-usr/lib/vlc/plugins/codec/libomxil_plugin.so [omxil]
-usr/lib/vlc/plugins/codec/libopus_plugin.so
-usr/lib/vlc/plugins/codec/libpng_plugin.so
-usr/lib/vlc/plugins/codec/librawvideo_plugin.so
-usr/lib/vlc/plugins/codec/libschroedinger_plugin.so
-usr/lib/vlc/plugins/codec/libscte27_plugin.so
-usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
-usr/lib/vlc/plugins/codec/libshine_plugin.so
-usr/lib/vlc/plugins/codec/libspeex_plugin.so
-usr/lib/vlc/plugins/codec/libspudec_plugin.so
-usr/lib/vlc/plugins/codec/libstl_plugin.so
-usr/lib/vlc/plugins/codec/libsubsdec_plugin.so
-usr/lib/vlc/plugins/codec/libsubstx3g_plugin.so
-usr/lib/vlc/plugins/codec/libsubsusf_plugin.so
-usr/lib/vlc/plugins/codec/libsvcdsub_plugin.so
-usr/lib/vlc/plugins/codec/libsvgdec_plugin.so
-usr/lib/vlc/plugins/codec/libt140_plugin.so
-usr/lib/vlc/plugins/codec/libtheora_plugin.so
-usr/lib/vlc/plugins/codec/libtwolame_plugin.so
-usr/lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
-usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so [libva]
-usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so [libva]
-usr/lib/vlc/plugins/codec/libvorbis_plugin.so
-usr/lib/vlc/plugins/codec/libx264_plugin.so
-usr/lib/vlc/plugins/codec/libx265_plugin.so
-usr/lib/vlc/plugins/codec/libxwd_plugin.so
-usr/lib/vlc/plugins/control/libdbus_plugin.so
-usr/lib/vlc/plugins/control/libdummy_plugin.so
-usr/lib/vlc/plugins/control/libgestures_plugin.so
-usr/lib/vlc/plugins/control/libhotkeys_plugin.so
-usr/lib/vlc/plugins/control/liblirc_plugin.so
-usr/lib/vlc/plugins/control/libmotion_plugin.so
-usr/lib/vlc/plugins/control/libnetsync_plugin.so
-usr/lib/vlc/plugins/control/liboldrc_plugin.so
-usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
-usr/lib/vlc/plugins/demux
-usr/lib/vlc/plugins/gui/libncurses_plugin.so
-usr/lib/vlc/plugins/lua/liblua_plugin.so
-usr/lib/vlc/plugins/meta_engine
-usr/lib/vlc/plugins/misc/libaddonsfsstorage_plugin.so
-usr/lib/vlc/plugins/misc/libaddonsvorepository_plugin.so
-usr/lib/vlc/plugins/misc/libaudioscrobbler_plugin.so
-usr/lib/vlc/plugins/misc/libdbus_screensaver_plugin.so
-usr/lib/vlc/plugins/misc/libexport_plugin.so
-usr/lib/vlc/plugins/misc/libfingerprinter_plugin.so
-usr/lib/vlc/plugins/misc/libgnutls_plugin.so
-usr/lib/vlc/plugins/misc/liblogger_plugin.so
-usr/lib/vlc/plugins/misc/libstats_plugin.so
-usr/lib/vlc/plugins/misc/libvod_rtsp_plugin.so
-usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
-usr/lib/vlc/plugins/misc/libxml_plugin.so
-usr/lib/vlc/plugins/mux
-usr/lib/vlc/plugins/packetizer
-usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
-usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
-usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
-usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
-usr/lib/vlc/plugins/services_discovery/libpulselist_plugin.so
-usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
-usr/lib/vlc/plugins/services_discovery/libudev_plugin.so [udev]
-usr/lib/vlc/plugins/services_discovery/libupnp_plugin.so
-usr/lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
-usr/lib/vlc/plugins/stream_filter
-usr/lib/vlc/plugins/stream_out
-usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.so
-usr/lib/vlc/plugins/text_renderer/libtdummy_plugin.so
-usr/lib/vlc/plugins/vdpau
-usr/lib/vlc/plugins/video_chroma
-usr/lib/vlc/plugins/video_filter/libadjust_plugin.so
-usr/lib/vlc/plugins/video_filter/libalphamask_plugin.so
-usr/lib/vlc/plugins/video_filter/libanaglyph_plugin.so
-usr/lib/vlc/plugins/video_filter/libantiflicker_plugin.so
-usr/lib/vlc/plugins/video_filter/libatmo_plugin.so [atmo]
-usr/lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
-usr/lib/vlc/plugins/video_filter/libball_plugin.so
-usr/lib/vlc/plugins/video_filter/libblend_plugin.so
-usr/lib/vlc/plugins/video_filter/libblendbench_plugin.so
-usr/lib/vlc/plugins/video_filter/libbluescreen_plugin.so
-usr/lib/vlc/plugins/video_filter/libcanvas_plugin.so
-usr/lib/vlc/plugins/video_filter/libcolorthres_plugin.so
-usr/lib/vlc/plugins/video_filter/libcroppadd_plugin.so
-usr/lib/vlc/plugins/video_filter/libdeinterlace_plugin.so
-usr/lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
-usr/lib/vlc/plugins/video_filter/liberase_plugin.so
-usr/lib/vlc/plugins/video_filter/libextract_plugin.so
-usr/lib/vlc/plugins/video_filter/libfreeze_plugin.so
-usr/lib/vlc/plugins/video_filter/libgaussianblur_plugin.so
-usr/lib/vlc/plugins/video_filter/libgradfun_plugin.so
-usr/lib/vlc/plugins/video_filter/libgradient_plugin.so
-usr/lib/vlc/plugins/video_filter/libgrain_plugin.so
-usr/lib/vlc/plugins/video_filter/libhqdn3d_plugin.so
-usr/lib/vlc/plugins/video_filter/libinvert_plugin.so
-usr/lib/vlc/plugins/video_filter/liblogo_plugin.so
-usr/lib/vlc/plugins/video_filter/libmagnify_plugin.so
-usr/lib/vlc/plugins/video_filter/libmarq_plugin.so
-usr/lib/vlc/plugins/video_filter/libmirror_plugin.so
-usr/lib/vlc/plugins/video_filter/libmosaic_plugin.so
-usr/lib/vlc/plugins/video_filter/libmotionblur_plugin.so
-usr/lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
-usr/lib/vlc/plugins/video_filter/liboldmovie_plugin.so
-usr/lib/vlc/plugins/video_filter/libposterize_plugin.so
-usr/lib/vlc/plugins/video_filter/libpostproc_plugin.so
-usr/lib/vlc/plugins/video_filter/libpsychedelic_plugin.so
-usr/lib/vlc/plugins/video_filter/libpuzzle_plugin.so
-usr/lib/vlc/plugins/video_filter/libremoteosd_plugin.so
-usr/lib/vlc/plugins/video_filter/libripple_plugin.so
-usr/lib/vlc/plugins/video_filter/librotate_plugin.so
-usr/lib/vlc/plugins/video_filter/librss_plugin.so
-usr/lib/vlc/plugins/video_filter/libscale_plugin.so
-usr/lib/vlc/plugins/video_filter/libscene_plugin.so
-usr/lib/vlc/plugins/video_filter/libsepia_plugin.so
-usr/lib/vlc/plugins/video_filter/libsharpen_plugin.so
-usr/lib/vlc/plugins/video_filter/libsubsdelay_plugin.so
-usr/lib/vlc/plugins/video_filter/libtransform_plugin.so
-usr/lib/vlc/plugins/video_filter/libvhs_plugin.so
-usr/lib/vlc/plugins/video_filter/libwave_plugin.so
-usr/lib/vlc/plugins/video_filter/libyuvp_plugin.so
-usr/lib/vlc/plugins/video_output/libdirectfb_plugin.so
-usr/lib/vlc/plugins/video_output/libfb_plugin.so [fb]
-usr/lib/vlc/plugins/video_output/libvdummy_plugin.so
-usr/lib/vlc/plugins/video_output/libvmem_plugin.so
-usr/lib/vlc/plugins/video_output/libyuv_plugin.so
+usr/lib/*/vlc/libvlc_vdpau.so*
+usr/lib/*/vlc/lua/
+usr/lib/*/vlc/plugins/access/libaccess_alsa_plugin.so [alsa]
+usr/lib/*/vlc/plugins/access/libaccess_mms_plugin.so
+usr/lib/*/vlc/plugins/access/libaccess_mtp_plugin.so
+usr/lib/*/vlc/plugins/access/libaccess_oss_plugin.so [oss]
+usr/lib/*/vlc/plugins/access/libaccess_realrtsp_plugin.so
+usr/lib/*/vlc/plugins/access/libattachment_plugin.so
+usr/lib/*/vlc/plugins/access/libcdda_plugin.so [cdda]
+usr/lib/*/vlc/plugins/access/libdc1394_plugin.so [dc1394]
+usr/lib/*/vlc/plugins/access/libdtv_plugin.so [dtv]
+usr/lib/*/vlc/plugins/access/libdv1394_plugin.so [dv1394]
+usr/lib/*/vlc/plugins/access/libdvb_plugin.so [dvb]
+usr/lib/*/vlc/plugins/access/libdvdnav_plugin.so
+usr/lib/*/vlc/plugins/access/libdvdread_plugin.so
+usr/lib/*/vlc/plugins/access/libfilesystem_plugin.so
+usr/lib/*/vlc/plugins/access/libftp_plugin.so
+usr/lib/*/vlc/plugins/access/libhttp_plugin.so
+usr/lib/*/vlc/plugins/access/libidummy_plugin.so
+usr/lib/*/vlc/plugins/access/libimem_plugin.so
+usr/lib/*/vlc/plugins/access/liblibbluray_plugin.so
+usr/lib/*/vlc/plugins/access/liblinsys_hdsdi_plugin.so [linsys]
+usr/lib/*/vlc/plugins/access/liblinsys_sdi_plugin.so [linsys]
+usr/lib/*/vlc/plugins/access/liblive555_plugin.so
+usr/lib/*/vlc/plugins/access/libpulsesrc_plugin.so
+usr/lib/*/vlc/plugins/access/librar_plugin.so
+usr/lib/*/vlc/plugins/access/librtp_plugin.so
+usr/lib/*/vlc/plugins/access/libsdp_plugin.so
+usr/lib/*/vlc/plugins/access/libsftp_plugin.so
+usr/lib/*/vlc/plugins/access/libshm_plugin.so
+usr/lib/*/vlc/plugins/access/libtcp_plugin.so
+usr/lib/*/vlc/plugins/access/libtimecode_plugin.so
+usr/lib/*/vlc/plugins/access/libudp_plugin.so
+usr/lib/*/vlc/plugins/access/libv4l2_plugin.so [v4l2]
+usr/lib/*/vlc/plugins/access/libvcd_plugin.so [vcd]
+usr/lib/*/vlc/plugins/access/libvcdx_plugin.so
+usr/lib/*/vlc/plugins/access/libvdr_plugin.so
+usr/lib/*/vlc/plugins/access/libzip_plugin.so
+usr/lib/*/vlc/plugins/access_output
+usr/lib/*/vlc/plugins/arm_neon [neon]
+usr/lib/*/vlc/plugins/audio_filter
+usr/lib/*/vlc/plugins/audio_mixer
+usr/lib/*/vlc/plugins/audio_output/libadummy_plugin.so
+usr/lib/*/vlc/plugins/audio_output/libafile_plugin.so
+usr/lib/*/vlc/plugins/audio_output/libalsa_plugin.so [alsa]
+usr/lib/*/vlc/plugins/audio_output/libamem_plugin.so
+usr/lib/*/vlc/plugins/audio_output/liboss_plugin.so [oss]
+usr/lib/*/vlc/plugins/audio_output/libpulse_plugin.so
+usr/lib/*/vlc/plugins/audio_output/libsndio_plugin.so
+usr/lib/*/vlc/plugins/codec/liba52_plugin.so
+usr/lib/*/vlc/plugins/codec/libadpcm_plugin.so
+usr/lib/*/vlc/plugins/codec/libaes3_plugin.so
+usr/lib/*/vlc/plugins/codec/libaraw_plugin.so
+usr/lib/*/vlc/plugins/codec/libavcodec_plugin.so
+usr/lib/*/vlc/plugins/codec/libcc_plugin.so
+usr/lib/*/vlc/plugins/codec/libcdg_plugin.so
+usr/lib/*/vlc/plugins/codec/libcrystalhd_plugin.so [crystalhd]
+usr/lib/*/vlc/plugins/codec/libcvdsub_plugin.so
+usr/lib/*/vlc/plugins/codec/libddummy_plugin.so
+usr/lib/*/vlc/plugins/codec/libdts_plugin.so
+usr/lib/*/vlc/plugins/codec/libdvbsub_plugin.so
+usr/lib/*/vlc/plugins/codec/libedummy_plugin.so
+usr/lib/*/vlc/plugins/codec/libfaad_plugin.so
+usr/lib/*/vlc/plugins/codec/libflac_plugin.so
+usr/lib/*/vlc/plugins/codec/libg711_plugin.so
+usr/lib/*/vlc/plugins/codec/libhwdummy_plugin.so
+usr/lib/*/vlc/plugins/codec/libjpeg_plugin.so
+usr/lib/*/vlc/plugins/codec/libkate_plugin.so
+usr/lib/*/vlc/plugins/codec/liblibass_plugin.so
+usr/lib/*/vlc/plugins/codec/liblibmpeg2_plugin.so
+usr/lib/*/vlc/plugins/codec/liblpcm_plugin.so
+usr/lib/*/vlc/plugins/codec/libmpeg_audio_plugin.so
+usr/lib/*/vlc/plugins/codec/libomxil_plugin.so [omxil]
+usr/lib/*/vlc/plugins/codec/libopus_plugin.so
+usr/lib/*/vlc/plugins/codec/libpng_plugin.so
+usr/lib/*/vlc/plugins/codec/librawvideo_plugin.so
+usr/lib/*/vlc/plugins/codec/libschroedinger_plugin.so
+usr/lib/*/vlc/plugins/codec/libscte27_plugin.so
+usr/lib/*/vlc/plugins/codec/libsdl_image_plugin.so
+usr/lib/*/vlc/plugins/codec/libshine_plugin.so
+usr/lib/*/vlc/plugins/codec/libspeex_plugin.so
+usr/lib/*/vlc/plugins/codec/libspudec_plugin.so
+usr/lib/*/vlc/plugins/codec/libstl_plugin.so
+usr/lib/*/vlc/plugins/codec/libsubsdec_plugin.so
+usr/lib/*/vlc/plugins/codec/libsubstx3g_plugin.so
+usr/lib/*/vlc/plugins/codec/libsubsusf_plugin.so
+usr/lib/*/vlc/plugins/codec/libsvcdsub_plugin.so
+usr/lib/*/vlc/plugins/codec/libsvgdec_plugin.so
+usr/lib/*/vlc/plugins/codec/libt140_plugin.so
+usr/lib/*/vlc/plugins/codec/libtheora_plugin.so
+usr/lib/*/vlc/plugins/codec/libtwolame_plugin.so
+usr/lib/*/vlc/plugins/codec/libuleaddvaudio_plugin.so
+usr/lib/*/vlc/plugins/codec/libvaapi_drm_plugin.so [libva]
+usr/lib/*/vlc/plugins/codec/libvaapi_x11_plugin.so [libva]
+usr/lib/*/vlc/plugins/codec/libvorbis_plugin.so
+usr/lib/*/vlc/plugins/codec/libx264_plugin.so
+usr/lib/*/vlc/plugins/codec/libx265_plugin.so
+usr/lib/*/vlc/plugins/codec/libxwd_plugin.so
+usr/lib/*/vlc/plugins/control/libdbus_plugin.so
+usr/lib/*/vlc/plugins/control/libdummy_plugin.so
+usr/lib/*/vlc/plugins/control/libgestures_plugin.so
+usr/lib/*/vlc/plugins/control/libhotkeys_plugin.so
+usr/lib/*/vlc/plugins/control/liblirc_plugin.so
+usr/lib/*/vlc/plugins/control/libmotion_plugin.so
+usr/lib/*/vlc/plugins/control/libnetsync_plugin.so
+usr/lib/*/vlc/plugins/control/liboldrc_plugin.so
+usr/lib/*/vlc/plugins/control/libxcb_hotkeys_plugin.so
+usr/lib/*/vlc/plugins/demux
+usr/lib/*/vlc/plugins/gui/libncurses_plugin.so
+usr/lib/*/vlc/plugins/lua/liblua_plugin.so
+usr/lib/*/vlc/plugins/meta_engine
+usr/lib/*/vlc/plugins/misc/libaddonsfsstorage_plugin.so
+usr/lib/*/vlc/plugins/misc/libaddonsvorepository_plugin.so
+usr/lib/*/vlc/plugins/misc/libaudioscrobbler_plugin.so
+usr/lib/*/vlc/plugins/misc/libdbus_screensaver_plugin.so
+usr/lib/*/vlc/plugins/misc/libexport_plugin.so
+usr/lib/*/vlc/plugins/misc/libfingerprinter_plugin.so
+usr/lib/*/vlc/plugins/misc/libgnutls_plugin.so
+usr/lib/*/vlc/plugins/misc/liblogger_plugin.so
+usr/lib/*/vlc/plugins/misc/libstats_plugin.so
+usr/lib/*/vlc/plugins/misc/libvod_rtsp_plugin.so
+usr/lib/*/vlc/plugins/misc/libxdg_screensaver_plugin.so
+usr/lib/*/vlc/plugins/misc/libxml_plugin.so
+usr/lib/*/vlc/plugins/mux
+usr/lib/*/vlc/plugins/packetizer
+usr/lib/*/vlc/plugins/services_discovery/libbonjour_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libmediadirs_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libmtp_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libpodcast_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libpulselist_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libsap_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libudev_plugin.so [udev]
+usr/lib/*/vlc/plugins/services_discovery/libupnp_plugin.so
+usr/lib/*/vlc/plugins/services_discovery/libxcb_apps_plugin.so
+usr/lib/*/vlc/plugins/stream_filter
+usr/lib/*/vlc/plugins/stream_out
+usr/lib/*/vlc/plugins/text_renderer/libfreetype_plugin.so
+usr/lib/*/vlc/plugins/text_renderer/libtdummy_plugin.so
+usr/lib/*/vlc/plugins/vdpau
+usr/lib/*/vlc/plugins/video_chroma
+usr/lib/*/vlc/plugins/video_filter/libadjust_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libalphamask_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libanaglyph_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libantiflicker_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libatmo_plugin.so [atmo]
+usr/lib/*/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libball_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libblend_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libblendbench_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libbluescreen_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libcanvas_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libcolorthres_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libcroppadd_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libdeinterlace_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
+usr/lib/*/vlc/plugins/video_filter/liberase_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libextract_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libfreeze_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libgaussianblur_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libgradfun_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libgradient_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libgrain_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libhqdn3d_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libinvert_plugin.so
+usr/lib/*/vlc/plugins/video_filter/liblogo_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmagnify_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmarq_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmirror_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmosaic_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmotionblur_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libmotiondetect_plugin.so
+usr/lib/*/vlc/plugins/video_filter/liboldmovie_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libposterize_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libpostproc_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libpsychedelic_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libpuzzle_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libremoteosd_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libripple_plugin.so
+usr/lib/*/vlc/plugins/video_filter/librotate_plugin.so
+usr/lib/*/vlc/plugins/video_filter/librss_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libscale_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libscene_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libsepia_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libsharpen_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libsubsdelay_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libtransform_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libvhs_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libwave_plugin.so
+usr/lib/*/vlc/plugins/video_filter/libyuvp_plugin.so
+usr/lib/*/vlc/plugins/video_output/libdirectfb_plugin.so
+usr/lib/*/vlc/plugins/video_output/libfb_plugin.so [fb]
+usr/lib/*/vlc/plugins/video_output/libvdummy_plugin.so
+usr/lib/*/vlc/plugins/video_output/libvmem_plugin.so
+usr/lib/*/vlc/plugins/video_output/libyuv_plugin.so
EOF
diff --git a/debian/vlc-plugin-fluidsynth.install b/debian/vlc-plugin-fluidsynth.install
index 276fda9..4e3e115 100644
--- a/debian/vlc-plugin-fluidsynth.install
+++ b/debian/vlc-plugin-fluidsynth.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/codec/libfluidsynth_plugin.so
+usr/lib/*/vlc/plugins/codec/libfluidsynth_plugin.so
diff --git a/debian/vlc-plugin-jack.install b/debian/vlc-plugin-jack.install
index c0edb4f..a9b5b21 100644
--- a/debian/vlc-plugin-jack.install
+++ b/debian/vlc-plugin-jack.install
@@ -1,2 +1,2 @@
-usr/lib/vlc/plugins/access/libaccess_jack_plugin.so
-usr/lib/vlc/plugins/audio_output/libjack_plugin.so
+usr/lib/*/vlc/plugins/access/libaccess_jack_plugin.so
+usr/lib/*/vlc/plugins/audio_output/libjack_plugin.so
diff --git a/debian/vlc-plugin-notify.install b/debian/vlc-plugin-notify.install
index 8864fae..d43dfbc 100644
--- a/debian/vlc-plugin-notify.install
+++ b/debian/vlc-plugin-notify.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/notify/libnotify_plugin.so
+usr/lib/*/vlc/plugins/notify/libnotify_plugin.so
diff --git a/debian/vlc-plugin-qt.install b/debian/vlc-plugin-qt.install
index 665f71f..0e50df6 100644
--- a/debian/vlc-plugin-qt.install
+++ b/debian/vlc-plugin-qt.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/gui/libqt4_plugin.so
+usr/lib/*/vlc/plugins/gui/libqt4_plugin.so
diff --git a/debian/vlc-plugin-qt.lintian-overrides b/debian/vlc-plugin-qt.lintian-overrides
new file mode 100644
index 0000000..0ca356e
--- /dev/null
+++ b/debian/vlc-plugin-qt.lintian-overrides
@@ -0,0 +1,2 @@
+# Lintian fails to detect UTF-8 names (bug #588661)
+vlc-plugin-qt binary: spelling-error-in-binary usr/lib/*/vlc/plugins/gui/libqt4_plugin.so ment meant
diff --git a/debian/vlc-plugin-samba.install b/debian/vlc-plugin-samba.install
index 02f60f5..4c46489 100644
--- a/debian/vlc-plugin-samba.install
+++ b/debian/vlc-plugin-samba.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/access/libsmb_plugin.so
+usr/lib/*/vlc/plugins/access/libsmb_plugin.so
diff --git a/debian/vlc-plugin-sdl.install b/debian/vlc-plugin-sdl.install
index cbb3b89..992580a 100644
--- a/debian/vlc-plugin-sdl.install
+++ b/debian/vlc-plugin-sdl.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/video_output/libvout_sdl_plugin.so
+usr/lib/*/vlc/plugins/video_output/libvout_sdl_plugin.so
diff --git a/debian/vlc-plugin-skins2.install b/debian/vlc-plugin-skins2.install
index 7ddaca7..1e367d2 100644
--- a/debian/vlc-plugin-skins2.install
+++ b/debian/vlc-plugin-skins2.install
@@ -1,2 +1,2 @@
-usr/lib/vlc/plugins/gui/libskins2_plugin.so
+usr/lib/*/vlc/plugins/gui/libskins2_plugin.so
usr/share/vlc/skins2
diff --git a/debian/vlc-plugin-svg.install b/debian/vlc-plugin-svg.install
index 3b9f485..49ba370 100644
--- a/debian/vlc-plugin-svg.install
+++ b/debian/vlc-plugin-svg.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/text_renderer/libsvg_plugin.so
+usr/lib/*/vlc/plugins/text_renderer/libsvg_plugin.so
diff --git a/debian/vlc-plugin-video-splitter.install b/debian/vlc-plugin-video-splitter.install
index 8318313..667e40b 100644
--- a/debian/vlc-plugin-video-splitter.install
+++ b/debian/vlc-plugin-video-splitter.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/video_splitter
+usr/lib/*/vlc/plugins/video_splitter
diff --git a/debian/vlc-plugin-visualization.install b/debian/vlc-plugin-visualization.install
index 6efb358..ca4fb06 100644
--- a/debian/vlc-plugin-visualization.install
+++ b/debian/vlc-plugin-visualization.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/visualization
+usr/lib/*/vlc/plugins/visualization
diff --git a/debian/vlc-plugin-zvbi.install b/debian/vlc-plugin-zvbi.install
index c739992..1ed9798 100644
--- a/debian/vlc-plugin-zvbi.install
+++ b/debian/vlc-plugin-zvbi.install
@@ -1 +1 @@
-usr/lib/vlc/plugins/codec/libzvbi_plugin.so
+usr/lib/*/vlc/plugins/codec/libzvbi_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index 22bd7fb..6319e1f 100755
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -2,17 +2,17 @@
exec python3 $(dirname $0)/filter-plugin.py <<EOF
usr/bin/qvlc
usr/bin/svlc
-usr/lib/vlc/plugins/video_output/libaa_plugin.so
-usr/lib/vlc/plugins/video_output/libcaca_plugin.so
-usr/lib/vlc/plugins/video_output/libegl_x11_plugin.so
-usr/lib/vlc/plugins/video_output/libgl_plugin.so
-usr/lib/vlc/plugins/video_output/libgles1_plugin.so
-usr/lib/vlc/plugins/video_output/libgles2_plugin.so
-usr/lib/vlc/plugins/video_output/libglx_plugin.so
-usr/lib/vlc/plugins/video_output/libxcb_glx_plugin.so
-usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so
-usr/lib/vlc/plugins/video_output/libxcb_x11_plugin.so
-usr/lib/vlc/plugins/video_output/libxcb_xv_plugin.so
+usr/lib/*/vlc/plugins/video_output/libaa_plugin.so
+usr/lib/*/vlc/plugins/video_output/libcaca_plugin.so
+usr/lib/*/vlc/plugins/video_output/libegl_x11_plugin.so
+usr/lib/*/vlc/plugins/video_output/libgl_plugin.so
+usr/lib/*/vlc/plugins/video_output/libgles1_plugin.so
+usr/lib/*/vlc/plugins/video_output/libgles2_plugin.so
+usr/lib/*/vlc/plugins/video_output/libglx_plugin.so
+usr/lib/*/vlc/plugins/video_output/libxcb_glx_plugin.so
+usr/lib/*/vlc/plugins/video_output/libxcb_window_plugin.so
+usr/lib/*/vlc/plugins/video_output/libxcb_x11_plugin.so
+usr/lib/*/vlc/plugins/video_output/libxcb_xv_plugin.so
usr/share/applications
usr/share/solid
EOF
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list