summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--imagemagick-underlink.patch13
3 files changed, 23 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ad1b7cfc1f6..fa3d8edd2e9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jul 23 17:21:35 UTC 2017
+# Mon Jul 24 09:20:36 UTC 2017
pkgbase = imagemagick-fftw
pkgver = 6.9.9.2
- pkgrel = 1
+ pkgrel = 2
url = http://www.imagemagick.org/
arch = i686
arch = x86_64
@@ -30,9 +30,11 @@ pkgbase = imagemagick-fftw
source = http://www.imagemagick.org/download/ImageMagick-6.9.9-2.tar.xz
source = http://www.imagemagick.org/download/ImageMagick-6.9.9-2.tar.xz.asc
source = perlmagick.rpath.patch
+ source = imagemagick-underlink.patch
sha1sums = e23ee6a54063c0ac36882fc71f54b660316f542d
sha1sums = SKIP
sha1sums = e143cf9d530fabf3b58023899b5cc544ba93daec
+ sha1sums = e0cb8d32952d9e1636d03b1b4c03d8c9206192c4
pkgname = imagemagick-fftw
pkgdesc = An image viewing/manipulation program
diff --git a/PKGBUILD b/PKGBUILD
index bd1c3c9f1094..40422efce9b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=imagemagick-fftw
pkgver=6.9.9.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
license=('custom')
@@ -11,17 +11,19 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' 'libraw'
'opencl-headers' 'opencl-icd-loader' 'libwebp' 'subversion' 'glu' 'git' 'fftw')
source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
- perlmagick.rpath.patch)
+ perlmagick.rpath.patch imagemagick-underlink.patch)
sha1sums=('e23ee6a54063c0ac36882fc71f54b660316f542d'
'SKIP'
- 'e143cf9d530fabf3b58023899b5cc544ba93daec')
+ 'e143cf9d530fabf3b58023899b5cc544ba93daec'
+ 'e0cb8d32952d9e1636d03b1b4c03d8c9206192c4')
validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
prepare() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
sed '/AC_PATH_XTRA/d' -i configure.ac
- autoreconf --force --install
patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+ patch -p1 -i ../imagemagick-underlink.patch # Fix underlinking
+ autoreconf --force --install
}
build() {
diff --git a/imagemagick-underlink.patch b/imagemagick-underlink.patch
new file mode 100644
index 000000000000..be732ac34d36
--- /dev/null
+++ b/imagemagick-underlink.patch
@@ -0,0 +1,13 @@
+diff --git a/coders/Makefile.am b/coders/Makefile.am
+index e39ed031f..689728353 100644
+--- a/coders/Makefile.am
++++ b/coders/Makefile.am
+@@ -469,7 +469,7 @@ coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA
+ coders_dng_la_SOURCES = coders/dng.c
+ coders_dng_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+ coders_dng_la_LDFLAGS = $(MODULECOMMONFLAGS)
+-coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_LIBS)
++coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_R_LIBS)
+
+ # DPS coder module
+ coders_dps_la_SOURCES = coders/dps.c