moved ImageMagick->GraphicMagick

4 files changed, 30 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ec6358446af..312f5043d5a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = python-gdl
 	pkgdesc = Python interface for the GNU Data Language(GDL)
 	pkgver = 0.9.9
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gnudatalanguage.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
+	makedepends = python
 	depends = gnudatalanguage=0.9.9
 	conflicts = python2-gdl
 	source = https://github.com/gnudatalanguage/gdl/archive/v0.9.9.tar.gz
 	source = gdl-python3.patch
+	source = gdl-graphicsmagick.patch
 	source = gdl.profile
 	md5sums = 749dc9b6dd0b9a5385ffe83e7b1a6f46
 	md5sums = f757aec04c3149e5cd003990d50c8fa4
+	md5sums = 366bb65898facb4112dd213fe20c69e3
 	md5sums = 40aa5fd8278cd8e80425c62a577563cc
 
 pkgname = python-gdl
diff --git a/.gitignore b/.gitignore
index 6f43977ac472..26b182d2191f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *
 !.gitignore
 !gdl.profile
-!gdl-python3.patch 
+!gdl-python3.patch
+!gdl-graphicsmagick.patch
 !PKGBUILD
 !.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 10fd67bd4307..43f356dbdebe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,24 +6,25 @@
 
 pkgname=python-gdl
 pkgver=0.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Python interface for the GNU Data Language(GDL)"
 arch=('i686' 'x86_64')
 url="http://gnudatalanguage.sourceforge.net/"
 license=('GPL')
 depends=("gnudatalanguage=${pkgver}")
-makedepends=('cmake')
+makedepends=('cmake' 'python')
 #options=('!makeflags')
 conflicts=('python2-gdl')
 source=("https://github.com/gnudatalanguage/gdl/archive/v${pkgver}.tar.gz"
 #       'gdl-tirpc.patch'
 #       'gdl-updates.patch'
         'gdl-python3.patch'
+        'gdl-graphicsmagick.patch'
         'gdl.profile')
 md5sums=('749dc9b6dd0b9a5385ffe83e7b1a6f46'
          'f757aec04c3149e5cd003990d50c8fa4'
+         '366bb65898facb4112dd213fe20c69e3'
          '40aa5fd8278cd8e80425c62a577563cc')
-_pyver=$(python -V | cut -c 8-10)
 
 prepare() {
     cd ${srcdir}/gdl-${pkgver}
@@ -31,6 +32,8 @@ prepare() {
 #   patch -p1 < ../gdl-tirpc.patch
 #   patch -p1 < ../gdl-updates.patch
     patch -Np1 -l -i "${srcdir}/gdl-python3.patch"
+    patch -Np1 -i "${srcdir}/gdl-graphicsmagick.patch"
+    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 }
 
 build() {
@@ -40,10 +43,11 @@ build() {
     fi
     mkdir build
     cd build
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON=YES -DPYTHONVERSION=3 \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON=ON -DPYTHONVERSION=3 \
         -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYTHON_MODULE=ON \
-        -DGRAPHICSMAGICK=OFF -DMAGICK=ON -DFFTW=ON -DHDF=ON -DHDFDIR=/opt/hdf4 \
-        -DHDF5=ON -DGRIB=ON -DUDUNITS=ON ..
+        -DGRAPHICSMAGICK=ON -DMAGICK=OFF -DFFTW=ON -DHDF=ON -DHDFDIR=/opt/hdf4 \
+        -DHDF5=ON -DGRIB=ON -DUDUNITS=ON -DEIGEN3=ON \
+        -DNETCDF=ON -DREADLINE=ON -DEDITLINE=OFF ..
 
     make
 }
diff --git a/gdl-graphicsmagick.patch b/gdl-graphicsmagick.patch
new file mode 100644
index 000000000000..1c305e63974e
--- /dev/null
+++ b/gdl-graphicsmagick.patch
@@ -0,0 +1,14 @@
+diff -ru gdl-0.9.9_old/src/magick_cl.cpp gdl-0.9.9/src/magick_cl.cpp
+--- gdl-0.9.9_old/src/magick_cl.cpp	2018-12-01 15:19:52.000000000 +0100
++++ gdl-0.9.9/src/magick_cl.cpp	2021-02-15 07:54:39.271235632 +0100
+@@ -65,6 +65,10 @@
+   unsigned int gValid[40];
+   unsigned int gCount = 0;
+   static bool notInitialized = true;
++  
++   __attribute__((constructor)) static void init(void) {
++    START_MAGICK;
++  }
+ 
+   void magick_setup() {
+     int i;