[oe-commits] Koen Kooi : gst-plugins-bad: add 0.10.21

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30-2011-01-16
Commit: 89f95da8c9a8b6f0c6501ff12d2a8aad69521d81
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=89f95da8c9a8b6f0c6501ff12d2a8aad69521d81

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Jan 26 19:22:07 2011 +0100

gst-plugins-bad: add 0.10.21

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 ...te-to-opencv-2.2-api-for-cvHaarDetectObje.patch |   57 ++++++++++++++++++++
 recipes/gstreamer/gst-plugins-bad_0.10.21.bb       |   18 ++++++
 2 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/recipes/gstreamer/gst-plugins-bad/0001-opencv-update-to-opencv-2.2-api-for-cvHaarDetectObje.patch b/recipes/gstreamer/gst-plugins-bad/0001-opencv-update-to-opencv-2.2-api-for-cvHaarDetectObje.patch
new file mode 100644
index 0000000..2b40ad8
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-bad/0001-opencv-update-to-opencv-2.2-api-for-cvHaarDetectObje.patch
@@ -0,0 +1,57 @@
+From 9355663d5d6328aa77fc43c0def9f56d4aab1386 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at dominion.thruhere.net>
+Date: Wed, 26 Jan 2011 19:14:01 +0100
+Subject: [PATCH] opencv: update to opencv 2.2 api for cvHaarDetectObjects
+
+From upstream: "We added another parameter to the function maxSize, which you may set to cvSize(0,0). It regulates the maximum size of the face that the function detects. When the parameter is cvSize(0,0), the maximum size is set to the image size."
+
+Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
+---
+ configure.ac               |    2 +-
+ ext/opencv/gstfaceblur.c   |    2 +-
+ ext/opencv/gstfacedetect.c |    3 ++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fa6193d..37a2f00 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1226,7 +1226,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [
+   dnl a new version and the no-backward-compatibility define. (There doesn't
+   dnl seem to be a switch to suppress the warnings the cvcompat.h header
+   dnl causes.)
+-  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv <= 2.1.0 , [
++  PKG_CHECK_MODULES(OPENCV, opencv >= 2.0.0 opencv <= 2.2.0 , [
+     AC_PROG_CXX
+     AC_LANG_CPLUSPLUS
+     OLD_CPPFLAGS=$CPPFLAGS
+diff --git a/ext/opencv/gstfaceblur.c b/ext/opencv/gstfaceblur.c
+index 3ac2af4..8625491 100644
+--- a/ext/opencv/gstfaceblur.c
++++ b/ext/opencv/gstfaceblur.c
+@@ -269,7 +269,7 @@ gst_faceblur_chain (GstPad * pad, GstBuffer * buf)
+   if (filter->cvCascade) {
+     faces =
+         cvHaarDetectObjects (filter->cvGray, filter->cvCascade,
+-        filter->cvStorage, 1.1, 2, 0, cvSize (30, 30));
++        filter->cvStorage, 1.1, 2, 0, cvSize (30, 30), cvSize(0,0));
+ 
+     if (faces && faces->total > 0) {
+       buf = gst_buffer_make_writable (buf);
+diff --git a/ext/opencv/gstfacedetect.c b/ext/opencv/gstfacedetect.c
+index 0254b74..ab4b5eb 100644
+--- a/ext/opencv/gstfacedetect.c
++++ b/ext/opencv/gstfacedetect.c
+@@ -409,7 +409,8 @@ gst_facedetect_transform_ip (GstOpencvVideoFilter * base, GstBuffer * buf,
+         cvHaarDetectObjects (filter->cvGray, filter->cvCascade,
+         filter->cvStorage, filter->scale_factor, filter->min_neighbors,
+         filter->flags,
+-        cvSize (filter->min_size_width, filter->min_size_height));
++        cvSize (filter->min_size_width, filter->min_size_height),
++		cvSize(0,0));
+ 
+     if (faces && faces->total > 0) {
+       msg = gst_facedetect_message_new (filter, buf);
+-- 
+1.6.6.1
+
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.21.bb b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
new file mode 100644
index 0000000..45e62b1
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
@@ -0,0 +1,18 @@
+require gst-plugins.inc
+
+SRC_URI += "file://0001-opencv-update-to-opencv-2.2-api-for-cvHaarDetectObje.patch"
+
+SRC_URI[archive.md5sum] = "f501336ab1d18d2565f47c36ce653a82"
+SRC_URI[archive.sha256sum] = "422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a34ded682fa47e3"
+
+DEPENDS += "opencv orc-native orc libcdaudio gst-plugins-base openssl directfb libmodplug librsvg"
+
+PR = "${INC_PR}.0"
+
+# We don't have vdpau headers in OE and it creates crosscompile badness.
+# Also, mpeg2enc and mplex from mjpegtools don't build, because of AC_TRY_RUN.
+EXTRA_OECONF += " \
+        --disable-mpeg2enc \
+        --disable-mplex \
+        --disable-vdpau \
+"