Date: Monday, April 23, 2018 @ 22:17:08 Author: arojas Revision: 322864
Build with IM7 Added: xine-lib/trunk/xine-lib-imagemagick7.patch Modified: xine-lib/trunk/PKGBUILD -----------------------------+ PKGBUILD | 18 ++++++++++++------ xine-lib-imagemagick7.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-23 20:02:49 UTC (rev 322863) +++ PKGBUILD 2018-04-23 22:17:08 UTC (rev 322864) @@ -3,16 +3,16 @@ pkgname=xine-lib pkgver=1.2.9 -pkgrel=4 +pkgrel=5 pkgdesc="A multimedia playback engine" arch=('x86_64') url="http://www.xine-project.org" license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama' 'libnsl') -makedepends=('wavpack' 'faad2' 'libmng' 'libmagick6' 'mesa' 'libmodplug' +makedepends=('wavpack' 'faad2' 'libmng' 'libmagick' 'mesa' 'libmodplug' 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libdvdnav' 'libmpcdec' 'libcaca' 'libbluray' 'libvdpau' 'glu' 'gdk-pixbuf2') -optdepends=('libmagick6: for using the imagemagick plugin' \ +optdepends=('libmagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ 'glu: for using the opengl plugin' \ @@ -31,12 +31,18 @@ 'libvdpau: for using the VDPAU plugin' \ 'smbclient: for using the samba plugin' \ 'gdk-pixbuf2: for using the gdk-pixbuf plugin') -source=(https://downloads.sourceforge.net/project/xine/xine-lib/$pkgver/xine-lib-$pkgver.tar.xz) -sha1sums=('ad6e72b7d8ff6172a8a170ab1bc38577ae321371') +source=(https://downloads.sourceforge.net/project/xine/xine-lib/$pkgver/xine-lib-$pkgver.tar.xz + xine-lib-imagemagick7.patch) +sha1sums=('ad6e72b7d8ff6172a8a170ab1bc38577ae321371' + '7604ce72297f5b123a0bb53ebf5f1606e2ec0bad') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../xine-lib-imagemagick7.patch # PLD linux patch +} + build() { cd ${pkgname}-${pkgver} - PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ ./configure --prefix=/usr --with-wavpack --enable-vdpau --with-external-dvdnav \ --disable-optimizations make Added: xine-lib-imagemagick7.patch =================================================================== --- xine-lib-imagemagick7.patch (rev 0) +++ xine-lib-imagemagick7.patch 2018-04-23 22:17:08 UTC (rev 322864) @@ -0,0 +1,13 @@ +http://git.pld-linux.org/?p=packages/xine-lib.git;a=blob;f=imagemagick7.patch;h=d050323cdf509c9bb5f8edbad90084e8ce5c1b38;hb=HEAD + +--- xine-lib-1.2.6/src/video_dec/image.c ++++ xine-lib-1.2.6/src/video_dec/image.c +@@ -39,7 +39,7 @@ + #define LOG + */ + +-#include <wand/magick_wand.h> ++#include <MagickWand/MagickWand.h> + #ifdef PACKAGE_NAME + #undef PACKAGE_BUGREPORT + #undef PACKAGE_NAME