From c06d37019f1aace92dd8bc788aa32c69adb137542318c39e6e270a9a807fe498 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 19 Jul 2016 08:32:23 +0000 Subject: [PATCH] Accepting request 412085 from home:dimstar:Factory Resub: use patch as submitted to upstream (hg export) and add upstream bug ref to changelog OBS-URL: https://build.opensuse.org/request/show/412085 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=84 --- xine-lib-link-xcb.patch | 36 ++++++++++++++++++++++++++++++++++++ xine-lib.changes | 8 ++++++++ xine-lib.spec | 3 +++ 3 files changed, 47 insertions(+) create mode 100644 xine-lib-link-xcb.patch diff --git a/xine-lib-link-xcb.patch b/xine-lib-link-xcb.patch new file mode 100644 index 0000000..50662bf --- /dev/null +++ b/xine-lib-link-xcb.patch @@ -0,0 +1,36 @@ +# HG changeset patch +# User Dominique Leuenberger +# 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.changes b/xine-lib.changes index b522f8b..249e62d 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 18 13:47:07 UTC 2016 - dimstar@opensuse.org + +- Add xine-lib-link-xcb.patch: fix linking of libxcb. As our code + uses the functions, we must not rely on 3rd parties to hopefully + bring the right libraries to link. + https://bugs.xine-project.org/show_bug.cgi?id=573 + ------------------------------------------------------------------- Fri Apr 15 12:18:02 UTC 2016 - dimstar@opensuse.org diff --git a/xine-lib.spec b/xine-lib.spec index 724ca43..b900c21 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -137,6 +137,8 @@ Patch3: fix-non-x86-build.diff # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch Patch5: xine-lib-ffmpeg3.0.patch +# PATCH-FIX-UPSTREAM xine-lib-link-xcb.patch https://bugs.xine-project.org/show_bug.cgi?id=573 dimstar@opensuse.org -- Look for xcb, not xcb-shape +Patch6: xine-lib-link-xcb.patch %description

Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...

You need a frontend for xine-lib like xine-ui, gxine, kaffeine or totem.

Since 1-rc6 the package number is reduced, all you may miss, is in the base package

If you want to play css encrypted Video-DVD's, you need to install libdvdcss.

@@ -517,6 +519,7 @@ EOF %patch3 %endif %patch4 +%patch6 -p1 rm -f m4/libtool15.m4 sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c