Hello community,
here is the log from the commit of package opencv for openSUSE:Factory
checked in at Thu Aug 18 14:03:52 CEST 2011.
--------
--- opencv/opencv.changes 2011-08-17 22:19:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/opencv/opencv.changes 2011-08-18
01:58:12.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 17 23:50:39 UTC 2011 - reddw...@opensuse.org
+
+- Update and readd opencv-2.3-underlinking.patch since it is still
+ necessary.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
opencv-2.3-underlinking.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opencv.spec ++++++
--- /var/tmp/diff_new_pack.HDgwXw/_old 2011-08-18 14:03:26.000000000 +0200
+++ /var/tmp/diff_new_pack.HDgwXw/_new 2011-08-18 14:03:26.000000000 +0200
@@ -22,7 +22,7 @@
%define libname lib%{name}
%define soname 2_3
Version: 2.3.0
-Release: 1
+Release: 14
License: BSD3c
Summary: Collection of algorithms for computer vision
Url: http://%{name}.willowgarage.com/wiki/
@@ -30,7 +30,10 @@
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 reddw...@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 reddw...@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 @@
%setup -qn OpenCV-%{version}
%patch0 -p1
%patch1 -p1
+%patch3
%patch7 -p1
%if %{with ffmpeg}
%patch8
++++++ opencv-2.3-underlinking.patch ++++++
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()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
