[SCM] vlc/experimental: wayland support only on linux-any

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Dec 10 15:42:41 UTC 2017


The following commit has been merged in the experimental branch:
commit 91b11708b8dd96ed368bcd29ac7d9be514c73d6f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 10 16:33:22 2017 +0100

    wayland support only on linux-any

diff --git a/debian/control b/debian/control
index 9c43ba5..8cf8d77 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,7 @@ Build-Depends: autopoint,
                python3,
                qtbase5-dev (>= 5.6),
                qtbase5-private-dev (>= 5.6),
-               wayland-protocols,
+               wayland-protocols [linux-any],
                zlib1g-dev,
                zsh
 Standards-Version: 4.1.2
diff --git a/debian/rules b/debian/rules
index a153794..411a542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,6 +160,7 @@ confflags += \
 	--enable-omxil \
 	--enable-udev \
 	--enable-v4l2 \
+	--enable-wayland \
 	$(NULL)
 else
 confflags += \
@@ -171,6 +172,7 @@ confflags += \
 	--disable-omxil \
 	--disable-udev \
 	--disable-v4l2 \
+	--disable-wayland \
 	$(NULL)
 removeplugins += \
 	alsa \
@@ -185,6 +187,7 @@ removeplugins += \
 	systemd \
 	udev \
 	v4l2 \
+	wayland \
 	$(NULL)
 endif
 
diff --git a/debian/vlc-plugin-access-extra.install b/debian/vlc-plugin-access-extra.install
old mode 100644
new mode 100755
index 945630d..1b6f30a
--- a/debian/vlc-plugin-access-extra.install
+++ b/debian/vlc-plugin-access-extra.install
@@ -1,4 +1,7 @@
+#!/bin/bash
+exec python3 $(dirname $0)/filter-plugin.py <<EOF
 usr/lib/*/vlc/plugins/access/librdp_plugin.so
 usr/lib/*/vlc/plugins/access/libvnc_plugin.so
-usr/lib/*/vlc/plugins/access/libwl_screenshooter_plugin.so
+usr/lib/*/vlc/plugins/access/libwl_screenshooter_plugin.so [wayland]
 usr/lib/*/vlc/plugins/access/libxcb_screen_plugin.so
+EOF
diff --git a/debian/vlc-plugin-video-output.install b/debian/vlc-plugin-video-output.install
index 5bf25a0..66a405c 100755
--- a/debian/vlc-plugin-video-output.install
+++ b/debian/vlc-plugin-video-output.install
@@ -16,10 +16,10 @@ usr/lib/*/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so [libva]
 usr/lib/*/vlc/plugins/video_output/libglconv_vdpau_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/libwl_shell_plugin.so
-usr/lib/*/vlc/plugins/video_output/libwl_shm_plugin.so
+usr/lib/*/vlc/plugins/video_output/libwl_shell_plugin.so [wayland]
+usr/lib/*/vlc/plugins/video_output/libwl_shm_plugin.so [wayland]
 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/libxdg_shell_plugin.so
+usr/lib/*/vlc/plugins/video_output/libxdg_shell_plugin.so [wayland]
 EOF

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list