Hello community, here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2016-07-20 09:29:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xine-lib (Old) and /work/SRC/openSUSE:Factory/.xine-lib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib" Changes: -------- --- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2016-04-28 16:57:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2016-07-20 09:29:40.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 18 13:47:07 UTC 2016 - dims...@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 + +------------------------------------------------------------------- New: ---- xine-lib-link-xcb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.P0L2Xs/_old 2016-07-20 09:29:41.000000000 +0200 +++ /var/tmp/diff_new_pack.P0L2Xs/_new 2016-07-20 09:29:41.000000000 +0200 @@ -137,6 +137,8 @@ # 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 dims...@opensuse.org -- Look for xcb, not xcb-shape +Patch6: xine-lib-link-xcb.patch %description <p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.</p> @@ -517,6 +519,7 @@ %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 ++++++ xine-lib-link-xcb.patch ++++++ # HG changeset patch # User Dominique Leuenberger <dims...@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)
