Author: qboosh Date: Wed Mar 9 18:10:19 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added opencv patch (update for opencv 2.2.0), package opencv plugin
---- Files affected:
packages/gstreamer-plugins-bad:
gstreamer-plugins-bad.spec (1.91 -> 1.92) ,
gstreamer-plugins-bad-opencv.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
diff -u packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.91
packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.92
--- packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.91 Sun Feb
27 20:48:00 2011
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec Wed Mar 9
19:10:14 2011
@@ -16,6 +16,7 @@
%bcond_without musepack # don't build musepack plugin
%bcond_without neon # don't build neonhttpsrc plugin
%bcond_without ofa # don't build OFA plugin
+%bcond_without opencv # don't build OpenCV plugin
%bcond_without sdl # don't build sdl plugin
%bcond_with swfdec # swfdec plugin
%bcond_without spc # don't build spc plugin
@@ -45,6 +46,7 @@
Patch4: %{name}-timidity.patch
Patch5: %{name}-nas.patch
Patch6: %{name}-celt.patch
+Patch7: %{name}-opencv.patch
URL: http://gstreamer.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
@@ -112,12 +114,10 @@
BuildRequires: libtimidity-devel
BuildRequires: libvpx-devel
BuildRequires: libx264-devel >= 0.1.2
-BuildRequires: lv2core-devel
%{?with_mjpegtools:BuildRequires: mjpegtools-devel >= 1.9.0}
BuildRequires: nas-devel
%{?with_neon:BuildRequires: neon-devel >= 0.27.0}
-# TODO
-#BuildRequires: opencv-devel >= 2.0.0
+%{?with_opencv:BuildRequires: opencv-devel >= 2.2.0}
BuildRequires: openssl-devel >= 0.9.5
BuildRequires: schroedinger-devel >= 1.0.7
BuildRequires: slv2-devel >= 0.6.6
@@ -505,6 +505,25 @@
Wtyczka OFA do GStreamera służąca do obliczania odcisków MusicIP
plików dźwiękowych.
+%package -n gstreamer-opencv
+Summary: GStreamer OpenCV plugin
+Summary(pl.UTF-8): Wtyczka OpenCV do GStreamera
+Group: Libraries
+Requires: gstreamer >= %{gst_req_ver}
+Requires: opencv >= 2.2.0
+
+%description -n gstreamer-opencv
+GStreamer OpenCV plugin. It contains the following elements:
+facedetect, faceblur, edgedetect, cvsobel, cvsmooth, cvlaplace,
+cverode, cvequalizehist, cvdilate, textwrite, templatematch,
+pyramidsegment.
+
+%description -n gstreamer-opencv -l pl.UTF-8
+Wtyczka OpenCV do GStreamera. Zawiera następujące elementy:
+facedetect, faceblur, edgedetect, cvsobel, cvsmooth, cvlaplace,
+cverode, cvequalizehist, cvdilate, textwrite, templatematch,
+pyramidsegment.
+
%package -n gstreamer-resindvd
Summary: GStreamer Resin DVD playback plugin
Summary(pl.UTF-8): Wtyczka odtwarzania Resin DVD do GStreamera
@@ -683,6 +702,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
%{__libtoolize}
@@ -998,6 +1018,12 @@
%attr(755,root,root) %{gstlibdir}/libgstofa.so
%endif
+%if %{with opencv}
+%files -n gstreamer-opencv
+%defattr(644,root,root,755)
+%attr(755,root,root) %{gstlibdir}/libgstopencv.so
+%endif
+
%files -n gstreamer-resindvd
%defattr(644,root,root,755)
%attr(755,root,root) %{gstlibdir}/libresindvd.so
@@ -1066,6 +1092,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.92 2011/03/09 18:10:14 qboosh
+- added opencv patch (update for opencv 2.2.0), package opencv plugin
+
Revision 1.91 2011/02/27 19:48:00 arekm
- rel 5; fix build for new celt; BR lv2core-devel
================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch
diff -u /dev/null
packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch:1.1
--- /dev/null Wed Mar 9 19:10:20 2011
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad-opencv.patch Wed Mar
9 19:10:14 2011
@@ -0,0 +1,33 @@
+--- gst-plugins-bad-0.10.21/configure.ac.orig 2011-01-22 18:42:03.006361617
+0100
++++ gst-plugins-bad-0.10.21/configure.ac 2011-01-29 13:24:36.352691389
+0100
+@@ -1226,7 +1226,7 @@
+ 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.2.0 opencv < 2.3.0 , [
+ AC_PROG_CXX
+ AC_LANG_CPLUSPLUS
+ OLD_CPPFLAGS=$CPPFLAGS
+--- gst-plugins-bad-0.10.21/ext/opencv/gstfaceblur.c.orig 2010-12-07
17:22:30.000000000 +0100
++++ gst-plugins-bad-0.10.21/ext/opencv/gstfaceblur.c 2011-03-09
16:42:20.807412942 +0100
+@@ -269,7 +269,7 @@ gst_faceblur_chain (GstPad * pad, GstBuf
+ 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);
+--- gst-plugins-bad-0.10.21/ext/opencv/gstfacedetect.c.orig 2010-12-07
17:22:30.000000000 +0100
++++ gst-plugins-bad-0.10.21/ext/opencv/gstfacedetect.c 2011-03-09
16:45:47.607417132 +0100
+@@ -409,7 +409,7 @@ gst_facedetect_transform_ip (GstOpencvVi
+ 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);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec?r1=1.91&r2=1.92&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
