packages: opencv/opencv.spec, opencv/opencv-2.0.0-libpng14.patch (NEW), ope...

arekm arekm at pld-linux.org
Fri Aug 13 12:28:04 CEST 2010 

Author: arekm                        Date: Fri Aug 13 10:28:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start updating to 2.1.0

---- Files affected:
packages/opencv:
   opencv.spec (1.8 -> 1.9) , opencv-2.0.0-libpng14.patch (NONE -> 1.1)  (NEW), opencv-2.1.0-mmap.patch (NONE -> 1.1)  (NEW), opencv-2.1.0-multilib.patch (NONE -> 1.1)  (NEW), opencv-am.patch (1.1 -> NONE)  (REMOVED), opencv-build.patch (1.1 -> NONE)  (REMOVED), opencv-ffmpeg.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.8 packages/opencv/opencv.spec:1.9
--- packages/opencv/opencv.spec:1.8	Sat Jan 30 16:50:09 2010
+++ packages/opencv/opencv.spec	Fri Aug 13 12:27:58 2010
@@ -1,21 +1,19 @@
 # $Revision$, $Date$
 %bcond_with	xine
-%define	snap	pre1
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Name:		opencv
-Version:	1.1
-Release:	0.%{snap}.6
+Version:	2.1.0
+Release:	0.1
 Epoch:		1
 License:	BSD
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/opencvlibrary/%{name}-%{version}%{snap}.tar.gz
-# Source0-md5:	b147b7cd3c059831c415c5a2bcecdf95
-Patch0:		%{name}-ffmpeg.patch
-Patch1:		%{name}-am.patch
-Patch2:		%{name}-build.patch
+Source0:	http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2
+# Source0-md5:	1d71584fb4e04214c0085108f95e24c8
+Patch0:		%{name}-2.0.0-libpng14.patch
+Patch1:		%{name}-2.1.0-mmap.patch
+Patch2:		%{name}-2.1.0-multilib.patch
 URL:		http://opencv.willowgarage.com
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
+BuildRequires:	cmake
 BuildRequires:	ffmpeg-devel
 BuildRequires:	jasper-devel
 BuildRequires:	libdc1394-devel
@@ -69,40 +67,39 @@
 OpenCV Python bindings.
 
 %prep
-%setup -q -n %{name}-%{version}.0
+%setup -q -n OpenCV-%{version}
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 %patch2 -p1
 
-sed -i -e 's#ACLOCAL_AMFLAGS.*##g' Makefile.am
-sed -i -e 's#pkgpython#pkgpyexec#g' interfaces/swig/python/Makefile.am
-sed -i -e 's#-L$(SWIG_PYTHON_LIBS)#$(NOTING_NOT_EMPTY_LINE)#g' interfaces/swig/python/Makefile.am
-
 %build
-%{__libtoolize}
-%{__aclocal} -I autotools/aclocal
-%{__autoconf}
-%{__automake}
-%configure \
+install -d build
+cd build
+%cmake \
+	-DCXXFLAGS="-D__STDC_CONSTANT_MACROS" \
 %ifarch i686 pentium4 athlon %{x8664}
-	--enable-sse2 \
-%else
-	--disable-sse2 \
+	-DENABLE_SSE2=ON \
+%endif
+	-DBUILD_NEW_PYTHON_SUPPORT=ON \
+%if %{with xine}
+	-DWITH_XINE=ON \
 %endif
-	--with-python \
-	--with%{!?with_xine:out}-xine \
-	--with-ffmpeg \
-	--with-1394libs \
-	--with-v4l \
-	--with-gtk \
-	--without-gstreamer \
-	--without-quicktime
-%{__make}
+	-DWITH_GSTREAMER=OFF \
+	-DWITH_1394=ON \
+	-DWITH_FFMPEG=ON \
+	-DWITH_GTK=ON \
+	-DWITH_V4L=PN \
+%if "%{_lib}" == "lib64"
+		-DLIB_SUFFIX=64 \
+%endif
+	../
+%{__make} \
+	VERBOSE=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -142,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/08/13 10:27:58  arekm
+- start updating to 2.1.0
+
 Revision 1.8  2010/01/30 15:50:09  sparky
 - BR: pkgconfig
 

================================================================
Index: packages/opencv/opencv-2.0.0-libpng14.patch
diff -u /dev/null packages/opencv/opencv-2.0.0-libpng14.patch:1.1
--- /dev/null	Fri Aug 13 12:28:04 2010
+++ packages/opencv/opencv-2.0.0-libpng14.patch	Fri Aug 13 12:27:58 2010
@@ -0,0 +1,13 @@
+http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+
+--- src/highgui/grfmt_png.cpp
++++ src/highgui/grfmt_png.cpp
+@@ -223,7 +223,7 @@
+                 png_set_palette_to_rgb( png_ptr );
+ 
+             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
+-                png_set_gray_1_2_4_to_8( png_ptr );
++                png_set_expand_gray_1_2_4_to_8( png_ptr );
+ 
+             if( CV_MAT_CN(m_type) > 1 && color )
+                 png_set_bgr( png_ptr ); // convert RGB to BGR

================================================================
Index: packages/opencv/opencv-2.1.0-mmap.patch
diff -u /dev/null packages/opencv/opencv-2.1.0-mmap.patch:1.1
--- /dev/null	Fri Aug 13 12:28:04 2010
+++ packages/opencv/opencv-2.1.0-mmap.patch	Fri Aug 13 12:27:58 2010
@@ -0,0 +1,14 @@
+http://code.ros.org/trac/opencv/ticket/141
+http://bugs.gentoo.org/313649
+
+--- src/highgui/cvcap_libv4l.cpp
++++ src/highgui/cvcap_libv4l.cpp
+@@ -782,7 +782,7 @@
+ 
+        capture->buffers[n_buffers].length = buf.length;
+        capture->buffers[n_buffers].start =
+-         mmap (NULL /* start anywhere */,
++         v4l2_mmap (NULL /* start anywhere */,
+                buf.length,
+                PROT_READ | PROT_WRITE /* required */,
+                MAP_SHARED /* recommended */,

================================================================
Index: packages/opencv/opencv-2.1.0-multilib.patch
diff -u /dev/null packages/opencv/opencv-2.1.0-multilib.patch:1.1
--- /dev/null	Fri Aug 13 12:28:04 2010
+++ packages/opencv/opencv-2.1.0-multilib.patch	Fri Aug 13 12:27:58 2010
@@ -0,0 +1,110 @@
+diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-06 04:24:34.000000000 +0300
++++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-07-27 21:41:18.000000000 +0300
+@@ -89,8 +89,8 @@
+ INSTALL (
+     TARGETS flann  # flann_s
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
++    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+ 
+ # INSTALL (
+diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-06 04:24:37.000000000 +0300
++++ OpenCV-2.1.0/CMakeLists.txt	2010-07-27 21:56:58.000000000 +0300
+@@ -467,8 +467,8 @@
+ 
+     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
+     if(UNIX)
+-        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
++        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+     endif()
+     if(WIN32)
+         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
+diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-06 04:24:40.000000000 +0300
++++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-07-27 21:42:00.000000000 +0300
+@@ -40,6 +40,6 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+     )
+diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
++++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-07-27 21:44:32.000000000 +0300
+@@ -71,8 +71,8 @@
+ 
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-    LIBRARY DESTINATION lib COMPONENT main
+-    ARCHIVE DESTINATION lib COMPONENT main)
++    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${lib_hdrs}
+     DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-06 04:24:43.000000000 +0300
++++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-07-27 21:43:22.000000000 +0300
+@@ -76,8 +76,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${aux_hdrs_ext}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-07-27 21:44:51.000000000 +0300
+@@ -71,8 +71,8 @@
+ 
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-    LIBRARY DESTINATION lib COMPONENT main
+-    ARCHIVE DESTINATION lib COMPONENT main)
++    LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ # install each module headers separately
+ install(FILES ${lib_hdrs}
+diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-07-27 21:43:00.000000000 +0300
+@@ -282,8 +282,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${highgui_ext_hdrs}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-06 04:24:45.000000000 +0300
++++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-07-27 21:43:42.000000000 +0300
+@@ -61,8 +61,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${lib_hdrs}
+         DESTINATION include/opencv
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list