[SCM] vlc/master: Add upstream patch to fix underlinking

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Oct 12 22:40:08 UTC 2016


The following commit has been merged in the master branch:
commit 0f89a5673d0e5c7d2215f594606e70893846d314
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Oct 12 23:02:14 2016 +0200

    Add upstream patch to fix underlinking

diff --git a/debian/patches/series b/debian/patches/series
index b278588..d08ca3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ generated-mimetypes.patch
 vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch
 vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch
 Fix-build-using-old-GCC-intrinsics.patch
+video_splliter-Add-XCB-flags-for-panoramix.patch
diff --git a/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch b/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch
new file mode 100644
index 0000000..ba26788
--- /dev/null
+++ b/debian/patches/video_splliter-Add-XCB-flags-for-panoramix.patch
@@ -0,0 +1,41 @@
+From a854dc7108cdb70b5f58a1232868c74ad3620c99 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee at freedesktop.org>
+Date: Sat, 20 Aug 2016 06:02:27 +0000
+Subject: [PATCH] video_splliter: Add XCB flags for panoramix.
+
+This patch fixes this build error.
+
+video_splitter/.libs/libpanoramix_plugin_la-panoramix.o: In function `CountMonitors':
+modules/video_splitter/panoramix.c:352: undefined reference to `xcb_connect'
+modules/video_splitter/panoramix.c:354: undefined reference to `xcb_connection_has_error'
+modules/video_splitter/panoramix.c:357: undefined reference to `xcb_get_setup'
+modules/video_splitter/panoramix.c:359: undefined reference to `xcb_setup_roots_iterator'
+modules/video_splitter/panoramix.c:360: undefined reference to `xcb_screen_next'
+modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
+modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
+modules/video_splitter/panoramix.c:407: undefined reference to `xcb_disconnect'
+
+Signed-off-by: Vinson Lee <vlee at freedesktop.org>
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/video_splitter/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
+index da32c52..ffeb94e 100644
+--- a/modules/video_splitter/Makefile.am
++++ b/modules/video_splitter/Makefile.am
+@@ -15,8 +15,8 @@ if HAVE_WIN32_DESKTOP
+ splitter_LTLIBRARIES += libpanoramix_plugin.la
+ else
+ if HAVE_XCB_RANDR
+-libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
+-libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS)
++libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS)
++libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) $(XCB_LIBS)
+ splitter_LTLIBRARIES += libpanoramix_plugin.la
+ endif
+ endif
+-- 
+2.9.3
+

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list