update to 1.1.0

3 files changed, 18 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ae967f149cf..eebbfef3c277 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = php-pdlib
 	pkgdesc = PDlib - A PHP extension for Dlib
-	pkgver = 1.0.2
-	pkgrel = 4
+	pkgver = 1.1.0
+	pkgrel = 1
 	url = https://github.com/goodspb/pdlib
 	arch = x86_64
 	license = MIT License
@@ -10,23 +10,23 @@ pkgbase = php-pdlib
 	depends = php
 	depends = libx11
 	depends = openblas
+	depends = openblas64
 	depends = cblas
+	depends = cblas64
 	depends = lapack
+	depends = lapack64
 	depends = libsm
 	depends = libice
 	depends = libxext
-	depends = giflib4
+	depends = giflib
 	depends = libpng
 	depends = zlib
 	depends = libjpeg-turbo
 	depends = sqlite
 	depends = fftw
-	source = https://github.com/goodspb/pdlib/archive/v1.0.2.tar.gz
+	source = https://github.com/goodspb/pdlib/archive/v1.1.0.tar.gz
 	source = pdlib.ini
-	source = php80.patch
-	sha256sums = e91a3c7396ee2027f957fa34fcc2567e614e4e1c1570ae7d5d16d4203541ba4a
+	sha256sums = 6c255c07dfb70d34019faecd99160d03846c83925452c9e93d5606edc8d55803
 	sha256sums = c325ddedc2e685f12119a0f4e8a1a45430a1ecb15368179f4c0c7153352b8a0e
-	sha256sums = d4ee8f30d0d056e0f538f54117d54d458404e47d7e5217e448e6bdc75aba1d38
 
 pkgname = php-pdlib
-
diff --git a/PKGBUILD b/PKGBUILD
index 4dea9aa3a25e..5b22ceb58984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=("php-pdlib")
 _pkgbase=("pdlib")
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="PDlib - A PHP extension for Dlib"
 arch=('x86_64')
 url="https://github.com/goodspb/pdlib"
@@ -12,12 +12,15 @@ depends=('dlib'
          'php'
          'libx11'
          'openblas'
+         'openblas64'
 	 'cblas'
+	 'cblas64'
          'lapack'
+         'lapack64'
 	 'libsm'
 	 'libice'
          'libxext'
-         'giflib4'
+         'giflib'
 	 'libpng'
 	 'zlib'
  	 'libjpeg-turbo'
@@ -27,24 +30,15 @@ depends=('dlib'
 
 makedepends=('cmake')
 source=("https://github.com/goodspb/pdlib/archive/v$pkgver.tar.gz"
-	"pdlib.ini"
-	"php80.patch")
-sha256sums=('e91a3c7396ee2027f957fa34fcc2567e614e4e1c1570ae7d5d16d4203541ba4a'
-            'c325ddedc2e685f12119a0f4e8a1a45430a1ecb15368179f4c0c7153352b8a0e'
-            'd4ee8f30d0d056e0f538f54117d54d458404e47d7e5217e448e6bdc75aba1d38')
-
-prepare() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    patch -p1 -i ../php80.patch
-}
+	"pdlib.ini")
+sha256sums=('6c255c07dfb70d34019faecd99160d03846c83925452c9e93d5606edc8d55803'
+            'c325ddedc2e685f12119a0f4e8a1a45430a1ecb15368179f4c0c7153352b8a0e')
 
 build() {
     unset LDFLAGS
-    export CXXFLAGS="-O2 -I/usr/include/giflib4" 
-    export LDFLAGS="-L/usr/lib/giflib4"
     cd "${srcdir}/${_pkgbase}-${pkgver}"
     phpize
-    ./configure --with-php-config=/usr/bin/php-config --with-libdir=/usr/lib/giflib4
+    ./configure --enable-debug --with-php-config=/usr/bin/php-config
     make
 }
 
diff --git a/php80.patch b/php80.patch
deleted file mode 100644
index dd2440d9d04a..000000000000
--- a/php80.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/tests/cnn_face_detection_ctor_error.phpt b/tests/cnn_face_detection_ctor_error.phpt
-index 3535448..385e307 100644
---- a/tests/cnn_face_detection_ctor_error.phpt
-+++ b/tests/cnn_face_detection_ctor_error.phpt
-@@ -11,5 +11,5 @@ try {
- }
- ?>
- --EXPECTF--
--string(68) "CnnFaceDetection::__construct() expects exactly 1 parameter, 0 given"
-+string(%d) "CnnFaceDetection::__construct() expects exactly 1 %s, 0 given"
- 
-diff --git a/tests/face_landmark_detection_ctor_error.phpt b/tests/face_landmark_detection_ctor_error.phpt
-index 2a717db..1f783f2 100644
---- a/tests/face_landmark_detection_ctor_error.phpt
-+++ b/tests/face_landmark_detection_ctor_error.phpt
-@@ -16,5 +16,5 @@ try {
- }
- ?>
- --EXPECTF--
--string(73) "FaceLandmarkDetection::__construct() expects exactly 1 parameter, 0 given"
-+string(%d) "FaceLandmarkDetection::__construct() expects exactly 1 %s, 0 given"
- string(45) "Unable to open non-existent file for reading."
-diff --git a/tests/face_recognition_ctor_error.phpt b/tests/face_recognition_ctor_error.phpt
-index c06ed39..237f2b0 100644
---- a/tests/face_recognition_ctor_error.phpt
-+++ b/tests/face_recognition_ctor_error.phpt
-@@ -11,4 +11,4 @@ try {
- }
- ?>
- --EXPECTF--
--string(67) "FaceRecognition::__construct() expects exactly 1 parameter, 0 given"
-+string(%d) "FaceRecognition::__construct() expects exactly 1 %s, 0 given"