[packages/php-facedetect] - fix building with opencv 3.x - rel 4

baggins baggins at pld-linux.org
Wed Mar 30 16:09:26 CEST 2016


commit dca761a292a34bd07004cff88c5459c882542f0d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 30 23:09:03 2016 +0900

    - fix building with opencv 3.x
    - rel 4

 opencv3.patch       | 10 ++++++++++
 php-facedetect.spec |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/php-facedetect.spec b/php-facedetect.spec
index dfe6873..46db3fc 100644
--- a/php-facedetect.spec
+++ b/php-facedetect.spec
@@ -7,11 +7,12 @@
 Summary:	PHP Facedetect Extension
 Name:		%{php_name}-%{modname}
 Version:	1.1.0
-Release:	3
+Release:	4
 License:	PHP 3.0
 Group:		Development/Languages/PHP
 Source0:	https://github.com/infusion/PHP-Facedetect/archive/v%{version}/%{modname}-%{version}.tar.gz
 # Source0-md5:	4ce5e01bf0933957b37f0d0c5735393a
+Patch0:		opencv3.patch
 URL:		http://www.xarg.org/project/php-facedetect/
 BuildRequires:	%{php_name}-devel
 BuildRequires:	opencv-devel
@@ -28,6 +29,7 @@ coordinates.
 
 %prep
 %setup -q -n PHP-Facedetect-%{version}
+%patch0 -p1
 
 %build
 export LIBS=%{_libdir}/libopencv_*.so.*
diff --git a/opencv3.patch b/opencv3.patch
new file mode 100644
index 0000000..7632a4c
--- /dev/null
+++ b/opencv3.patch
@@ -0,0 +1,10 @@
+--- PHP-Facedetect-1.1.0/facedetect.c~	2014-04-04 20:54:48.000000000 +0900
++++ PHP-Facedetect-1.1.0/facedetect.c	2016-03-30 23:07:44.412301147 +0900
+@@ -26,6 +26,7 @@
+ 
+ #include <opencv/cv.h>
+ #include <opencv/highgui.h>
++#include <opencv2/core/version.hpp>
+ 
+ /* {{{ facedetect_functions[]
+  *
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-facedetect.git/commitdiff/dca761a292a34bd07004cff88c5459c882542f0d



More information about the pld-cvs-commit mailing list