diff --git a/facedetect-1.0.1-opencv-2.2.0.patch b/facedetect-1.0.1-opencv-2.2.0.patch new file mode 100644 index 0000000..44b279b --- /dev/null +++ b/facedetect-1.0.1-opencv-2.2.0.patch @@ -0,0 +1,35 @@ +diff -up facedetect/config.m4.BAD facedetect/config.m4 +--- facedetect/config.m4.BAD 2011-05-10 15:20:16.295313177 -0400 ++++ facedetect/config.m4 2011-05-10 15:20:36.292054317 -0400 +@@ -27,10 +27,7 @@ if test "$PHP_FACEDETECT" != "no"; then + AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/cv.h], [], AC_MSG_ERROR('opencv/cv.h' header not found)) + AC_CHECK_HEADER([$FACEDETECT_DIR/include/opencv/highgui.h], [], AC_MSG_ERROR('opencv/highgui.h' header not found)) + +- PHP_ADD_LIBRARY_WITH_PATH(cv, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(cvaux, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(highgui, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(cxcore, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(opencv_objdetect, $FACEDETECT_DIR/lib, FACEDETECT_SHARED_LIBADD) + + PHP_SUBST(FACEDETECT_SHARED_LIBADD) + AC_DEFINE(HAVE_FACEDETECT, 1, [ ]) +diff -up facedetect/facedetect.c.BAD facedetect/facedetect.c +--- facedetect/facedetect.c.BAD 2011-05-10 15:15:04.603349547 -0400 ++++ facedetect/facedetect.c 2011-05-10 15:19:31.982886849 -0400 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + #include "php.h" ++#include + #include "php_facedetect.h" + + #include +@@ -102,7 +103,7 @@ static void php_facedetect(INTERNAL_FUNC + + storage = cvCreateMemStorage(0); + +- faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0)); ++ faces = cvHaarDetectObjects(gray, cascade, storage, 1.1, 2, CV_HAAR_DO_CANNY_PRUNING, cvSize(0, 0), cvSize(0, 0)); + + if(return_type) { + diff --git a/php-facedetect.spec b/php-facedetect.spec index f3dab62..288540f 100644 --- a/php-facedetect.spec +++ b/php-facedetect.spec @@ -3,7 +3,7 @@ Name: php-facedetect Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP extension to access the OpenCV library Group: Development/Languages License: PHP @@ -11,17 +11,12 @@ URL: http://www.xarg.org/project/php-facedetect/ Source0: http://www.xarg.org/download/facedetect-%{version}.tar.gz # patch to work around DSOlinkage issues introduced in F-13 Patch1: facedetect-dso-link-workaround.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: php-devel opencv-devel +# Fix code to work with opencv 2.2.0 +Patch2: facedetect-1.0.1-opencv-2.2.0.patch +BuildRequires: php-devel opencv-devel >= 2.2.0 Requires: opencv - -%if %{?php_zend_api}0 Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} -%else -Requires: php-api = %{php_apiver} -%endif - %description This extension provides a PHP implementation of the OpenCV library. @@ -34,6 +29,7 @@ of their coordinates. %prep %setup -q -n facedetect %patch1 -p1 +%patch2 -p1 %{__cat} <<'EOF' >facedetect.ini extension=facedetect.so EOF @@ -44,24 +40,20 @@ phpize %configure make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="install -p" +%install +make install INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="install -p" install -p -D -m0644 facedetect.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.d/facedetect.ini - -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc CREDITS %config(noreplace) %{_sysconfdir}/php.d/facedetect.ini %{php_extdir}/facedetect.so %changelog +* Tue May 10 2011 Tom Callaway - 1.0.1-3 +- Clean up spec +- Fix code to work with OpenCV 2.2.0 + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild