[SCM] vlc/master: Do not build chromecast plugin on Ubuntu

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Dec 31 11:39:59 UTC 2017


The following commit has been merged in the master branch:
commit f5e735c69a37e3dd47bc024a948e1375116e5e70
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 31 12:38:57 2017 +0100

    Do not build chromecast plugin on Ubuntu

diff --git a/debian/rules b/debian/rules
index 42f2839..cefcb22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,9 @@
 DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/vendor.mk
 
 pluginpackages += access-extra
 pluginpackages += base
@@ -39,7 +40,6 @@ confflags += \
 	--enable-avahi \
 	--enable-caca \
 	--enable-chromaprint \
-	--enable-chromecast \
 	--enable-dbus \
 	--enable-dca \
 	--enable-dvbpsi \
@@ -209,6 +209,15 @@ confflags += --disable-oss
 removeplugins += oss
 endif
 
+# Ubuntu specific flags
+ifeq (Ubuntu,$(DEB_VENDOR))
+# protobuf related issues
+confflags += --disable-chromecast
+removeplugins += chromecast
+else
+confflags += --enable-chromecast
+endif
+
 # Linux amd64 and i386 specific flags
 ifeq (,$(filter-out amd64 i386,$(DEB_HOST_ARCH)))
 confflags += --enable-crystalhd
diff --git a/debian/vlc-plugin-base.install b/debian/vlc-plugin-base.install
index 2d932b0..3c3f58e 100755
--- a/debian/vlc-plugin-base.install
+++ b/debian/vlc-plugin-base.install
@@ -162,7 +162,26 @@ usr/lib/*/vlc/plugins/spu/librss_plugin.so
 usr/lib/*/vlc/plugins/spu/libsubsdelay_plugin.so
 usr/lib/*/vlc/plugins/stream_extractor/libarchive_plugin.so
 usr/lib/*/vlc/plugins/stream_filter
-usr/lib/*/vlc/plugins/stream_out
+usr/lib/*/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so [chromecast]
+usr/lib/*/vlc/plugins/stream_out/libstream_out_cycle_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_delay_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_description_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_display_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_dummy_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_es_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_gather_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_record_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_setid_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_smem_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_standard_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_stats_plugin.so
+usr/lib/*/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
 usr/lib/*/vlc/plugins/text_renderer/libfreetype_plugin.so
 usr/lib/*/vlc/plugins/text_renderer/libtdummy_plugin.so
 usr/lib/*/vlc/plugins/video_chroma

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list