ensure the ImageMagick 7 is not picked inadvertently

3 files changed, 19 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09fcdc7a8904..4b5882ca7718 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -37,8 +37,10 @@ pkgbase = pfstools
 	options = !libtool
 	source = http://downloads.sourceforge.net/pfstools/pfstools-2.1.0.tgz
 	source = opencv3.patch
+	source = force_imagemagick6.patch
 	sha256sums = 3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413
 	sha256sums = 41f74339b7cc1dbfa2c7e1de62e81c7f423bc22cba9e27ee57b1d0b2ce15ce82
+	sha256sums = ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674
 
 pkgname = pfstools
 
diff --git a/PKGBUILD b/PKGBUILD
index 48258b21b806..4d2e9c89a54b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,15 +25,17 @@ makedepends=('cmake' \
              'gsl' 'fftw' 'libexif' 'opencv'
              'freeglut' 'glu' 'qt4' 'gtkglext')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz \
-        opencv3.patch)
+source=("http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz"
+        "opencv3.patch" "force_imagemagick6.patch")
 sha256sums=('3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413'
-            '41f74339b7cc1dbfa2c7e1de62e81c7f423bc22cba9e27ee57b1d0b2ce15ce82')
+            '41f74339b7cc1dbfa2c7e1de62e81c7f423bc22cba9e27ee57b1d0b2ce15ce82'
+            'ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 < "$srcdir/opencv3.patch"
+  patch -Np1 < "$srcdir/force_imagemagick6.patch"
 }
 
 build() {
diff --git a/force_imagemagick6.patch b/force_imagemagick6.patch
new file mode 100644
index 000000000000..429ed267ca4a
--- /dev/null
+++ b/force_imagemagick6.patch
@@ -0,0 +1,12 @@
+diff -rup pfstools-2.1.0/CMakeLists.txt pfstools-2.1.0.new/CMakeLists.txt
+--- pfstools-2.1.0/CMakeLists.txt	2017-11-13 18:38:18.000000000 +0100
++++ pfstools-2.1.0.new/CMakeLists.txt	2018-04-01 20:11:54.324233991 +0200
+@@ -114,7 +114,7 @@ OPTION(WITH_ImageMagick "Use ImageMagick
+ 
+ if( WITH_ImageMagick )
+ 
+-find_package(ImageMagick COMPONENTS Magick++ MagickCore)
++find_package(ImageMagick 6 EXACT COMPONENTS Magick++ MagickCore)
+ if( NOT ImageMagick_FOUND )
+ MESSAGE( STATUS "ImageMagick not found. The following commands will not be
+ compiled: pfsinimgmagick pfsoutimgmagick pfsouthdrhtml. " )