pool/xine-lib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 482983 from home:pgajdos

Browse Source 
If I should participate on upstream bug, please let me know.

OBS-URL: https://build.opensuse.org/request/show/482983
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=93
This commit is contained in:
Dave Plater 2017-03-28 13:27:56 +00:00 committed by Git OBS Bridge
parent d8544a9807
commit a01dfce95f
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xine-lib-ImageMagick7.patch Normal file
View File

@ -0,0 +1,13 @@
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 <wand/magick_wand.h>
+#include <wand/MagickWand.h>
#ifdef PACKAGE_NAME
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME

6
xine-lib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 28 07:52:49 UTC 2017 - pgajdos@suse.com
- fix build with ImageMagick 7
+ xine-lib-ImageMagick7.patch
-------------------------------------------------------------------
Mon Aug 1 12:58:27 UTC 2016 - davejplater@gmail.com

9
xine-lib.spec
View File

@ -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 @@ Patch3: fix-non-x86-build.diff
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 @@ rm -rf src/combined/ffmpeg configure
%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