[php-facedetect] Patch to build with new opencv
topdog
topdog at fedoraproject.org
Tue Jan 11 11:15:24 UTC 2011
commit d0c5424180367762c6711dbd6c48ec4e4a4c2d1b
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date: Tue Jan 11 13:06:26 2011 +0200
Patch to build with new opencv
facedetect-dso-link-workaround.patch | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/facedetect-dso-link-workaround.patch b/facedetect-dso-link-workaround.patch
index 4df1202..715c5ae 100644
--- a/facedetect-dso-link-workaround.patch
+++ b/facedetect-dso-link-workaround.patch
@@ -1,6 +1,6 @@
diff -ruN facedetect.orig/config.m4 facedetect/config.m4
--- facedetect.orig/config.m4 2010-03-15 02:07:12.000000000 +0200
-+++ facedetect/config.m4 2011-01-11 12:43:24.872761812 +0200
++++ facedetect/config.m4 2011-01-11 13:03:47.794020008 +0200
@@ -25,20 +25,12 @@
PHP_ADD_INCLUDE($FACEDETECT_DIR/include)
@@ -28,13 +28,20 @@ diff -ruN facedetect.orig/config.m4 facedetect/config.m4
AC_DEFINE(HAVE_FACEDETECT, 1, [ ])
diff -ruN facedetect.orig/facedetect.c facedetect/facedetect.c
--- facedetect.orig/facedetect.c 2010-03-15 02:07:12.000000000 +0200
-+++ facedetect/facedetect.c 2011-01-11 12:42:16.804761019 +0200
-@@ -21,7 +21,7 @@
++++ facedetect/facedetect.c 2011-01-11 13:03:09.466030640 +0200
+@@ -21,7 +21,6 @@
#include "php_facedetect.h"
#include <opencv/cv.h>
-#include <opencv/cvver.h>
-+#include <opencv2/core/version.hpp>
#include <opencv/highgui.h>
/* {{{ facedetect_functions[]
+@@ -66,7 +65,6 @@
+ php_info_print_table_start();
+ php_info_print_table_row(2, "facedetect support", "enabled");
+ php_info_print_table_row(2, "facedetect version", PHP_FACEDETECT_VERSION);
+- php_info_print_table_row(2, "OpenCV version", CV_VERSION);
+ php_info_print_table_end();
+ }
+ /* }}} */
More information about the scm-commits
mailing list