--- /dev/null
+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
--- /dev/null
+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 */,
--- /dev/null
+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
+++ /dev/null
-diff -ur opencv-1.1.0.orig/samples/c/Makefile.am opencv-1.1.0/samples/c/Makefile.am
---- opencv-1.1.0.orig/samples/c/Makefile.am 2009-07-02 16:29:14.088536975 +0200
-+++ opencv-1.1.0/samples/c/Makefile.am 2009-07-02 16:30:05.145362986 +0200
-@@ -7,8 +7,8 @@
- right01.jpg right02.jpg right03.jpg right04.jpg right05.jpg right06.jpg right07.jpg \
- right08.jpg right09.jpg right11.jpg right12.jpg right13.jpg right14.jpg \
- stereo_calib.txt build_all.sh cvsample.dsp makefile.ms makefile.gnu \
--agaricus-lepiota.data letter-recognition.data bgfg_codebook.cpp bgfg_segm.cpp blobtrack.cpp camshiftdemo.c \
--contours.c convexhull.c camshiftdemo.c contours.c convert_cascade.c convexhull.c \
-+agaricus-lepiota.data letter-recognition.data bgfg_codebook.cpp bgfg_segm.cpp blobtrack.cpp \
-+camshiftdemo.c contours.c convert_cascade.c convexhull.c \
- delaunay.c demhist.c dft.c distrans.c drawing.c edge.c facedetect.c \
- facedetect.cmd ffilldemo.c find_obj.cpp fitellipse.c houghlines.c kalman.c kmeans.c image.cpp \
- inpaint.cpp laplace.c letter_recog.cpp lkdemo.c minarea.c morphology.c motempl.c \
+++ /dev/null
---- opencv-1.1.0/cxcore/include/cxmisc.h~ 2008-07-29 21:05:04.000000000 +0200
-+++ opencv-1.1.0/cxcore/include/cxmisc.h 2009-07-14 13:27:44.962942767 +0200
-@@ -130,7 +130,7 @@
- #include <alloca.h>
- #elif defined HAVE_ALLOCA
- #include <stdlib.h>
--#elif
-+#else
- #error
- #endif
-
+++ /dev/null
---- configure.in.org 2009-03-18 23:03:33.397335774 +0100
-+++ configure.in 2009-03-18 23:04:10.016786290 +0100
-@@ -612,7 +612,7 @@
- with_ffmpeg=yes
- fi
- if test x"$with_ffmpeg" = "xyes"; then
-- AC_CHECK_HEADER(ffmpeg/avcodec.h,
-+ AC_CHECK_HEADER(libavcodec/avcodec.h,
- AC_SEARCH_LIBS([avcodec_decode_video],[avcodec_pic avcodec], [
- AC_SEARCH_LIBS([av_open_input_file], [avformat_pic avformat],
- [
-@@ -625,7 +625,7 @@
- ],
- [ have_ffmpeg=no ]),
- [ have_ffmpeg=no ])
-- AC_CHECK_HEADER([ffmpeg/swscale.h],
-+ AC_CHECK_HEADER([libswscale/swscale.h],
- AC_CHECK_LIB(swscale,sws_getContext,
- [
- AC_DEFINE(HAVE_FFMPEG_SWSCALE,,[ffmpeg's libswscale])
---- otherlibs/highgui/cvcap_ffmpeg.cpp~ 2008-09-29 22:49:15.000000000 +0200
-+++ otherlibs/highgui/cvcap_ffmpeg.cpp 2009-03-18 23:08:26.526923830 +0100
-@@ -53,10 +53,10 @@
- #include <errno.h>
- #endif
-
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavcodec/avcodec.h>
- #if defined(HAVE_FFMPEG_SWSCALE)
--#include <ffmpeg/swscale.h>
-+#include <libswscale/swscale.h>
- #endif
- }
-
%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
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
+ -DWITH_GSTREAMER=OFF \
+ -DWITH_1394=ON \
+ -DWITH_FFMPEG=ON \
+ -DWITH_GTK=ON \
+ -DWITH_V4L=PN \
+%if "%{_lib}" == "lib64"
+ -DLIB_SUFFIX=64 \
%endif
- --with-python \
- --with%{!?with_xine:out}-xine \
- --with-ffmpeg \
- --with-1394libs \
- --with-v4l \
- --with-gtk \
- --without-gstreamer \
- --without-quicktime
-%{__make}
+ ../
+%{__make} \
+ VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
%clean
projects / packages / opencv.git / commitdiff