summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-09-30 09:50:33 +0200
committerRemi Collet <remi@remirepo.net>2020-09-30 09:50:33 +0200
commit23192a53300e11f674a392f856486971e7fbd1d0 (patch)
tree318a99725fdad74be387eb17d4deca462617c3aa
parent699dc2ad46bf95604b5ed32aba15b584db7d044d (diff)
rebuild for PHP 8.0.0RC1
add patch for PHP 8.0.0rc1 from https://github.com/goodspb/pdlib/pull/37
-rw-r--r--37.patch43
-rw-r--r--php-pdlib.spec13
2 files changed, 54 insertions, 2 deletions
diff --git a/37.patch b/37.patch
new file mode 100644
index 0000000..da45929
--- /dev/null
+++ b/37.patch
@@ -0,0 +1,43 @@
+From a31d3bc709321b784ecd93c983b476a0a298bfa0 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Sep 2020 09:46:18 +0200
+Subject: [PATCH] relax test for 8.0.0RC1
+
+---
+ tests/cnn_face_detection_ctor_error.phpt | 2 +-
+ tests/face_landmark_detection_ctor_error.phpt | 2 +-
+ tests/face_recognition_ctor_error.phpt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+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"
diff --git a/php-pdlib.spec b/php-pdlib.spec
index af21a69..5bbfd27 100644
--- a/php-pdlib.spec
+++ b/php-pdlib.spec
@@ -38,14 +38,16 @@ Summary: A PHP extension for Dlib
Name: %{?sub_prefix}php-%{pecl_name}
Version: 1.0.2
%if 0%{?gh_date:1}
-Release: 1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
-Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Patch0: https://patch-diff.githubusercontent.com/raw/goodspb/pdlib/pull/37.patch
+
BuildRequires: %{?scl_prefix}php-devel > 7
BuildRequires: dlib-devel >= 19.21
@@ -87,6 +89,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
mv %{gh_project}-%{gh_commit} NTS
cd NTS
+%patch0 -p1 -b .pr
+
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_PDLIB_VERSION/{s/.* "//;s/".*$//;p}' php_pdlib.h)
if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -189,6 +193,11 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
%changelog
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.2-5
+- rebuild for PHP 8.0.0RC1
+- add patch for PHP 8.0.0rc1 from
+ https://github.com/goodspb/pdlib/pull/37
+
* Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 1.0.2-4
- rebuild for PHP 8.0.0beta3