![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2017-04-03 11:05:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-lib (Old)
and /work/SRC/openSUSE:Factory/.xine-lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib"
Mon Apr 3 11:05:12 2017 rev:65 rq:483107 version:1.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2016-08-05 18:16:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2017-04-03 11:05:15.338430752 +0200
@@ -1,0 +2,6 @@
+Tue Mar 28 07:52:49 UTC 2017 - pgajdos@suse.com
+
+- fix build with ImageMagick 7
+ + xine-lib-ImageMagick7.patch
+
+-------------------------------------------------------------------
New:
----
xine-lib-ImageMagick7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.HLBxTK/_old 2017-04-03 11:05:16.374284403 +0200
+++ /var/tmp/diff_new_pack.HLBxTK/_new 2017-04-03 11:05:16.378283838 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xine-lib
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -147,6 +147,12 @@
Patch4: xine-lib-theora.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
+# This should be fixed upstream, but this patch will not work for them.
+# wand/magick_wand.h is already deprecated even in ImageMagick-6; package should
+# include wand/MagickWand.h for ImageMagick-6 and MagickWand/MagickWand.h for
+# ImageMagick-7. Including wand/MagickWand.h will work for us also for
+# ImageMagick-7, because we package wand/ symlink to ./MagickWand/MagickWand.h
+Patch8: xine-lib-ImageMagick7.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>
@@ -534,6 +540,7 @@
%endif
%patch4
%patch6 -p1
+%patch8 -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-ImageMagick7.patch ++++++
Index: xine-lib-1.2.6/src/video_dec/image.c
===================================================================
--- xine-lib-1.2.6.orig/src/video_dec/image.c 2013-09-18 12:04:54.000000000 +0200
+++ xine-lib-1.2.6/src/video_dec/image.c 2017-03-28 09:22:17.137733960 +0200
@@ -39,7 +39,7 @@
#define LOG
*/
-#include
participants (1)
-
root@hilbert.suse.de