[SCM] vlc/master: Filter plugins with a helper script
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Apr 4 20:24:20 UTC 2016
The following commit has been merged in the master branch:
commit 2f60c6f64c4856b56a75deda1ab5785d503f38c9
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Apr 4 22:23:57 2016 +0200
Filter plugins with a helper script
diff --git a/debian/control b/debian/control
index dc30728..b196fff 100644
--- a/debian/control
+++ b/debian/control
@@ -117,6 +117,7 @@ Build-Depends: autopoint,
lua5.2,
oss4-dev [kfreebsd-any],
pkg-config,
+ python3,
qtbase5-dev (>= 5.1),
zlib1g-dev,
zsh
diff --git a/debian/filter-plugin.py b/debian/filter-plugin.py
new file mode 100644
index 0000000..f26c37e
--- /dev/null
+++ b/debian/filter-plugin.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python3
+
+# Inverse dh-exec-filter-profiles
+# Author: Sebastian Ramacher <sramacher at debian.org>
+
+import os
+import re
+import sys
+
+
+remove_plugins = os.getenv("removeplugins")
+if remove_plugins is not None:
+ remove_plugins = remove_plugins.split(" ")
+else:
+ remove_plugins = []
+
+plugin_re = re.compile(r"^(\S*) \[([a-zA-Z1-9._-]*)\]$")
+
+
+for line in sys.stdin.readlines():
+ line = line.rstrip("\n")
+ match = plugin_re.match(line)
+ if not match:
+ print(line)
+ continue
+
+ path = match.group(1)
+ plugin = match.group(2)
+ if plugin not in remove_plugins:
+ print(path)
diff --git a/debian/rules b/debian/rules
index eb2e3d8..9a8de77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,6 +234,7 @@ endif
export DEB_CFLAGS_MAINT_APPEND
export DEB_CXXFLAGS_MAINT_APPEND
+export removeplugins
%:
dh $@ --parallel --with autoreconf
@@ -241,10 +242,6 @@ export DEB_CXXFLAGS_MAINT_APPEND
override_dh_autoreconf:
dh_autoreconf --as-needed
-override_dh_auto_clean:
- rm -f debian/vlc.install debian/vlc-nox.install
- dh_auto_clean
-
override_dh_auto_configure:
dh_auto_configure -- $(confflags)
@@ -276,9 +273,6 @@ endif
override_dh_install:
# Remove plugin cache
rm debian/tmp/usr/lib/vlc/plugins/plugins.dat
- # Remove disabled plugins
- sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc.install.in > debian/vlc.install
- sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install.in > debian/vlc-nox.install
# Clean up libtool crap
find debian/tmp -name '*.la' -delete
# Remove useless stuff
diff --git a/debian/vlc-nox.install.in b/debian/vlc-nox.install
old mode 100644
new mode 100755
similarity index 87%
rename from debian/vlc-nox.install.in
rename to debian/vlc-nox.install
index 97a579a..ba5c4de
--- a/debian/vlc-nox.install.in
+++ b/debian/vlc-nox.install
@@ -1,22 +1,24 @@
+#!/bin/bash
+exec python3 $(dirname $0)/filter-plugin.py <<EOF
usr/bin/cvlc
usr/bin/nvlc
usr/bin/rvlc
usr/bin/vlc
usr/bin/vlc-wrapper
usr/lib/vlc/lua/
-usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
+usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so [alsa]
usr/lib/vlc/plugins/access/libaccess_bd_plugin.so
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
+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/libavio_plugin.so
-usr/lib/vlc/plugins/access/libcdda_plugin.so
-usr/lib/vlc/plugins/access/libdc1394_plugin.so
-usr/lib/vlc/plugins/access/libdtv_plugin.so
-usr/lib/vlc/plugins/access/libdv1394_plugin.so
-usr/lib/vlc/plugins/access/libdvb_plugin.so
+usr/lib/vlc/plugins/access/libcdda_plugin.so [cdda]
+usr/lib/vlc/plugins/access/libdc1394_plugin.so [libdc1394]
+usr/lib/vlc/plugins/access/libdtv_plugin.so [libdtv]
+usr/lib/vlc/plugins/access/libdv1394_plugin.so [libdv1394]
+usr/lib/vlc/plugins/access/libdvb_plugin.so [libdvb]
usr/lib/vlc/plugins/access/libdvdnav_plugin.so
usr/lib/vlc/plugins/access/libdvdread_plugin.so
usr/lib/vlc/plugins/access/libfilesystem_plugin.so
@@ -25,8 +27,8 @@ 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
-usr/lib/vlc/plugins/access/liblinsys_sdi_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/librar_plugin.so
usr/lib/vlc/plugins/access/librtp_plugin.so
@@ -36,22 +38,20 @@ 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
-usr/lib/vlc/plugins/access/libvcd_plugin.so
+usr/lib/vlc/plugins/access/libv4l2_plugin.so [libv4l2]
+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/libaudio_format_neon_plugin.so
-usr/lib/vlc/plugins/arm_neon/libchroma_yuv_neon_plugin.so
-usr/lib/vlc/plugins/arm_neon/libyuv_rgb_neon_plugin.so
+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
+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
+usr/lib/vlc/plugins/audio_output/liboss_plugin.so [oss]
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
@@ -60,7 +60,7 @@ 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
+usr/lib/vlc/plugins/codec/libcrystalhd_plugin.so [libcrystalhd]
usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
usr/lib/vlc/plugins/codec/libddummy_plugin.so
usr/lib/vlc/plugins/codec/libdts_plugin.so
@@ -76,7 +76,7 @@ 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
+usr/lib/vlc/plugins/codec/libomxil_plugin.so [libomxil]
usr/lib/vlc/plugins/codec/libopus_plugin.so
usr/lib/vlc/plugins/codec/libpng_plugin.so
usr/lib/vlc/plugins/codec/librawvideo_plugin.so
@@ -128,7 +128,7 @@ 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/libsap_plugin.so
-usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
+usr/lib/vlc/plugins/services_discovery/libudev_plugin.so [libudev]
usr/lib/vlc/plugins/services_discovery/libupnp_plugin.so
usr/lib/vlc/plugins/stream_filter
usr/lib/vlc/plugins/stream_out
@@ -139,7 +139,7 @@ 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
+usr/lib/vlc/plugins/video_filter/libatmo_plugin.so [libatmo]
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
@@ -185,9 +185,10 @@ 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
+usr/lib/vlc/plugins/video_output/libfb_plugin.so [libfb]
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/vlc-cache-gen
usr/share/man
+EOF
diff --git a/debian/vlc.install.in b/debian/vlc.install
old mode 100644
new mode 100755
similarity index 88%
rename from debian/vlc.install.in
rename to debian/vlc.install
index 8d30018..3c9cdc9
--- a/debian/vlc.install.in
+++ b/debian/vlc.install
@@ -1,3 +1,5 @@
+#!/bin/bash
+exec python3 $(dirname $0)/filter-plugin.py <<EOF
usr/bin/qvlc
usr/bin/svlc
usr/lib/vlc/libvlc_vdpau.so*
@@ -8,8 +10,8 @@ usr/lib/vlc/plugins/access/libxcb_screen_plugin.so
usr/lib/vlc/plugins/audio_output/libpulse_plugin.so
usr/lib/vlc/plugins/codec/libsdl_image_plugin.so
usr/lib/vlc/plugins/codec/libsvgdec_plugin.so
-usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so
-usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so
+usr/lib/vlc/plugins/codec/libvaapi_drm_plugin.so [vaapi]
+usr/lib/vlc/plugins/codec/libvaapi_x11_plugin.so [vaapi]
usr/lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
usr/lib/vlc/plugins/gui/libqt4_plugin.so
usr/lib/vlc/plugins/gui/libskins2_plugin.so
@@ -32,3 +34,4 @@ usr/lib/vlc/plugins/video_splitter
usr/lib/vlc/plugins/visualization
usr/share/applications
usr/share/kde4
+<<EOF
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list