3:41 a.m.
commit 48b3b7fa99b117c0d146cd64066387c3ce29c401
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 25 04:41:16 2016 +0100
Fix build with libxcb-1.12, https://bugs.xine-project.org/show_bug.cgi?id=573
xine-lib-link-xcb.patch | 36 ++++++++++++++++++++++++++++++++++++
xine-lib.spec | 9 ++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/xine-lib-link-xcb.patch b/xine-lib-link-xcb.patch
new file mode 100644
index 0000000..af6d058
--- /dev/null
+++ b/xine-lib-link-xcb.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Dominique Leuenberger <dimstar(a)opensuse.org>
+# Date 1468914700 -7200
+# Tue Jul 19 09:51:40 2016 +0200
+# Node ID 434e1ff5323789560c210b0b417844b8ab232ab0
+# Parent 24fc93301077a2317d1d6deda3b7d895e6754e26
+build: Fix linking with new xcb versions
+
+As we make use of specific xcb and xcb_shm functions, it is our sole responsibility
+to ensure we link against the right libs. Expecting xcb-shape to bring in all the
+dependencies for us is wrong (and no longer works in all cases)
+
+diff -r 24fc93301077 -r 434e1ff53237 m4/video_out.m4
+--- a/m4/video_out.m4 Tue Jun 07 19:33:35 2016 +0200
++++ b/m4/video_out.m4 Tue Jul 19 09:51:40 2016 +0200
+@@ -305,7 +305,7 @@
+ dnl xcb
+ XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
+ if test x"$with_xcb" != x"no"; then
+- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
++ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes],
[have_xcb=no])
+ if test x"$hard_enable_xcb" = x"yes" && test
x"$have_xcb" != x"yes"; then
+ AC_MSG_ERROR([XCB support requested, but XCB not found])
+ elif test x"$have_xcb" = x"yes"; then
+diff -r 24fc93301077 -r 434e1ff53237 src/video_out/Makefile.am
+--- a/src/video_out/Makefile.am Tue Jun 07 19:33:35 2016 +0200
++++ b/src/video_out/Makefile.am Tue Jul 19 09:51:40 2016 +0200
+@@ -147,7 +147,7 @@
+ xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS)
$(AVUTIL_CFLAGS)
+
+ xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
+-xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS)
$(XCB_LIBS)
++xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS)
$(XCB_LIBS) $(XCBSHM_LIBS)
+ xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
+
+ xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
diff --git a/xine-lib.spec b/xine-lib.spec
index 59fe82f..db2d495 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -10,7 +10,7 @@
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.6
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
@@ -18,6 +18,7 @@ Source0:
http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
# http://bugzilla.redhat.com/477226
Patch1: xine-lib-1.1.16.2-multilib.patch
Patch2: ffmpeg_2.9.patch
+Patch3: xine-lib-link-xcb.patch
Provides: xine-lib(plugin-abi) = %{plugin_abi}
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
@@ -76,6 +77,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libpulse)
BuildRequires: gtk2-devel
BuildRequires: libsmbclient-devel
+BuildRequires: libtool
%description
@@ -109,6 +111,8 @@ This package contains extra plugins for %{name}:
%setup -q
%patch1 -p1 -b .multilib
%patch2 -p1 -b .ffmpeg_2.9
+%patch3 -p1 -b .xcb
+autoreconf -i
%build
@@ -330,6 +334,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
%changelog
+* Mon Jul 25 2016 Sérgio Basto <sergio(a)serjux.com> - 1.2.6-12
+- Fix build with libxcb-1.12, https://bugs.xine-project.org/show_bug.cgi?id=573
+
* Fri Jul 08 2016 Sérgio Basto <sergio(a)serjux.com> - 1.2.6-11
- Build again with vcd support