Accepting request 228884 from KDE:Extra

Attempt to get 13.2 gstreamer 0.10 free :) (forwarded request 228883 from tittiatcoke)

OBS-URL: https://build.opensuse.org/request/show/228884
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=50

opencv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 3 11:22:56 UTC 2014 - tittiatcoke@gmail.com
+
+- Add upstream patch (3.0 version) to support Gstreamer 1.x
+  * bomb_commit_gstreamer-1x-support.patch
+  
 -------------------------------------------------------------------
 Thu Mar 13 07:50:56 UTC 2014 - tchvatal@suse.com
 

opencv.spec

@@ -40,9 +40,15 @@ Patch3:         improve-sphinx-search.diff
 # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157
 Patch4:         opencv-pkgconfig.patch
 Patch5:         opencv-altivec-vector.patch
+# PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support
+Patch6:         bomb_commit_gstreamer-1x-support.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
+%if 0%{?suse_version} > 1310
+BuildRequires:  gstreamer-plugins-base-devel
+%else
 BuildRequires:  gstreamer-0_10-plugins-base-devel
+%endif
 BuildRequires:  libdc1394-devel
 %if 0%{?suse_version} > 1230
 BuildRequires:  libeigen3-devel
@@ -132,6 +138,7 @@ This package contains the documentation and examples for the OpenCV library.
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Remove Windows specific files
 rm -f doc/packaging.txt
@@ -155,6 +162,9 @@ cmake -DCMAKE_BUILD_TYPE=Release \
       -DWITH_OPENGL=ON \
       -DWITH_UNICAP=ON \
       -DWITH_XINE=ON \
+%if 0%{?suse_version} <= 1310
+      -DWITH_GSTREAMER_0_10=ON \
+%endif
 %ifnarch x86_64
       -DENABLE_SSE=0 \
       -DENABLE_SSE2=0 \