Accepting request 79208 from KDE:Distro:Factory

- Update and readd opencv-2.3-underlinking.patch since it is still
  necessary.
(no bug number for -underlinking.patch because there seems to be a problem with the registration in the OpenCV's bug tracker) (forwarded request 79188 from RedDwarf)

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

opencv-2.3-underlinking.patch

@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -544,6 +544,7 @@ if(UNIX)
+         endif()
+         if(WITH_V4L)
+             CHECK_MODULE(libv4l1 HAVE_LIBV4L)
++            CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
+             CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
+             CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
+         else()

opencv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 17 23:50:39 UTC 2011 - reddwarf@opensuse.org
+
+- Update and readd opencv-2.3-underlinking.patch since it is still
+  necessary.
+
 -------------------------------------------------------------------
 Wed Aug 17 20:19:05 UTC 2011 - reddwarf@opensuse.org
 

opencv.spec

@@ -30,7 +30,10 @@ Group:          Development/Libraries
 Source0:        http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.3/OpenCV-%{version}.tar.bz2
 Patch0:         %{name}-2.3-libdir.patch
 Patch1:         %{name}-2.3-samples.patch
+# PATCH-FIX-UPSTREAM %{name}-2.3-underlinking.patch reddwarf@opensuse.org -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
+Patch3:         %{name}-2.3-underlinking.patch
 Patch7:         %{name}-2.3-cmake.patch
+# PATCH-FIX-UPSTREAM %{name}-2.3-ffmpeg.patch reddwarf@opensuse.org -- Allows to compile with latest ffmpeg. Took from upstream SVN.
 Patch8:         %{name}-2.3-ffmpeg.patch
 %if 0%{?suse_version} >= 1120
 BuildRequires:  gstreamer-0_10-plugins-base-devel
@@ -122,6 +125,7 @@ This package contains the documentation and examples for the OpenCV library.
 %setup -qn OpenCV-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch3
 %patch7 -p1
 %if %{with ffmpeg}
 %patch8