[SCM] vlc/master: Provide and depend on plugin ABI version

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Tue Dec 19 18:31:09 UTC 2017


The following commit has been merged in the master branch:
commit 93c63829a69c0ed743cfdf9f5f16975646943d73
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Sep 26 20:28:09 2017 +0200

    Provide and depend on plugin ABI version

diff --git a/debian/control b/debian/control
index 86be401..7794cc4 100644
--- a/debian/control
+++ b/debian/control
@@ -221,6 +221,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libproxy-tools
+Provides: ${vlc:PluginABI}
 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,
@@ -281,6 +282,7 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         ${vlc:PluginABI},
          vlc-data (= ${source:Version})
 Recommends: xdg-utils
 Suggests: libdvdcss2
@@ -296,7 +298,8 @@ Package: vlc-plugin-access-extra
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Enhances: vlc
 Description: multimedia player and streamer (extra access plugins)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -309,7 +312,8 @@ Package: vlc-plugin-video-output
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Enhances: vlc
 Description: multimedia player and streamer (video output plugins)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -322,7 +326,8 @@ Package: vlc-plugin-video-splitter
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Enhances: vlc
 Description: multimedia player and streamer (video splitter plugins)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -335,7 +340,8 @@ Package: vlc-plugin-visualization
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Enhances: vlc
 Description: multimedia player and streamer (visualization plugins)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -349,6 +355,7 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         ${vlc:PluginABI},
          fonts-freefont-ttf,
          vlc-plugin-qt (= ${binary:Version})
 Recommends: vlc-bin
@@ -364,7 +371,8 @@ Package: vlc-plugin-qt
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Recommends: vlc-bin
 Description: multimedia player and streamer (Qt plugin)
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -379,7 +387,8 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: fluid-soundfont-gm | timgm6mb-soundfont,
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${vlc:PluginABI}
 Enhances: vlc
 Description: FluidSynth plugin for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -393,7 +402,7 @@ Package: vlc-plugin-jack
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${vlc:PluginABI}
 Enhances: vlc
 Description: Jack audio plugins for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -409,7 +418,7 @@ Package: vlc-plugin-notify
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${vlc:PluginABI}
 Enhances: vlc
 Description: LibNotify plugin for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -423,7 +432,7 @@ Package: vlc-plugin-svg
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${vlc:PluginABI}
 Enhances: vlc
 Description: SVG plugin for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -439,7 +448,7 @@ Package: vlc-plugin-zvbi
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${vlc:PluginABI}
 Enhances: vlc
 Description: VBI teletext plugin for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@ -452,7 +461,7 @@ Package: vlc-plugin-samba
 Architecture: linux-any kfreebsd-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${vlc:PluginABI}
 Enhances: vlc
 Description: Samba plugin for VLC
  VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
diff --git a/debian/rules b/debian/rules
index d7353c9..9be8224 100755
--- a/debian/rules
+++ b/debian/rules
@@ -326,3 +326,7 @@ override_dh_installdeb:
 		debian/libvlc-bin.prerm.in > debian/libvlc-bin.prerm
 	echo 'interest-noawait /usr/lib/${DEB_HOST_MULTIARCH}/vlc/plugins' > debian/libvlc-bin.triggers
 	dh_installdeb
+
+override_dh_gencontrol-arch:
+	sed -n 's/^# define MODULE_SYMBOL \([0-9][_0-9a-z]*\)/-Vvlc:PluginABI=vlc-plugin-abi-\1/p' \
+		include/vlc_plugin.h | tr _ - | xargs dh_gencontrol -a --

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list