[gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/

[Tomas Chvatal]

commit:     b2894ad404a8e4d1a2f9a077e233e921280b3a82
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 20:58:00 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 20:58:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b2894ad4

[media-libs/opencv] Build with libpng1.5 enhance the system libs patch more.

---
 media-libs/opencv/files/2.2.0-libpng1.5.patch      |   39 ++++++++++++++++++++
 .../opencv/files/2.2.0-use_system_libs.patch       |   34 +++++++++++++++++
 media-libs/opencv/opencv-2.2.0.ebuild              |    5 ++-
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/files/2.2.0-libpng1.5.patch b/media-libs/opencv/files/2.2.0-libpng1.5.patch
new file mode 100644
index 0000000..1a99998
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-libpng1.5.patch
@@ -0,0 +1,39 @@
+Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp
+===================================================================
+--- /trunk/opencv/modules/highgui/src/grfmt_png.cpp	(revision 4337)
++++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp	(revision 4945)
+@@ -108,5 +108,5 @@
+ {
+     png_structp png_ptr = (png_structp)_png_ptr;
+-    PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
++    PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
+     CV_Assert( decoder );
+     const Mat& buf = decoder->m_buf;
+@@ -139,5 +139,5 @@
+         if( info_ptr && end_info )
+         {
+-            if( setjmp( png_ptr->jmpbuf ) == 0 )
++            if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
+             {
+                 if( !m_buf.empty() )
+@@ -201,5 +201,5 @@
+         png_infop end_info = (png_infop)m_end_info;
+ 
+-        if( setjmp(png_ptr->jmpbuf) == 0 )
++        if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+         {
+             int y;
+@@ -285,5 +285,5 @@
+         return;
+     png_structp png_ptr = (png_structp)_png_ptr;
+-    PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
++    PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
+     CV_Assert( encoder && encoder->m_buf );
+     size_t cursz = encoder->m_buf->size();
+@@ -327,5 +327,5 @@
+         if( info_ptr )
+         {
+-            if( setjmp( png_ptr->jmpbuf ) == 0 )
++            if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
+             {
+                 if( m_buf )

diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index 3a0fdde..3a9c10c 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -32,3 +32,37 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core
  #endif
  
  #undef abs
+diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt	2011-04-29 22:24:32.000000000 +0200
+@@ -219,8 +219,8 @@
+ set(the_target "opencv_highgui")
+ 
+ add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS)
+-
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
++include_directories("${ZLIB_INCLUDE_DIRS}"
++					"${CMAKE_CURRENT_SOURCE_DIR}/include"
+ 					"${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
+ 					"${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include"
+                     "${CMAKE_CURRENT_SOURCE_DIR}/src"
+@@ -285,7 +285,7 @@
+ 	#target_link_libraries(${the_target} libtiff)
+ endif()
+ 
+-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
++target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES})
+ 
+ if(APPLE)
+ 	target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
+diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp
+--- OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp	2011-04-29 22:25:25.000000000 +0200
+@@ -42,6 +42,7 @@
+ 
+ #include "precomp.hpp"
+ 
++#include <zlib.h>
+ #ifdef HAVE_PNG
+ 
+ /****************************************************************************************\

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 84875a0..0a30fdb 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -21,9 +21,10 @@ IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k open
 
 RDEPEND="
 	app-arch/bzip2
+	dev-libs/libf2c
 	sys-libs/zlib
 	sci-libs/clapack
-	virtual/lapack
+	sci-libs/flann
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
@@ -63,6 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PV}-ptrcvcapture.patch"
 	"${FILESDIR}/${PV}-v4l_2.6.38.patch"
 	"${FILESDIR}/${PV}-use_system_libs.patch"
+	"${FILESDIR}/${PV}-libpng1.5.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -142,7 +144,6 @@ src_configure() {
 	mycmakeargs+=(
 		"-DBUILD_SHARED_LIBS=ON"
 		"-DOPENCV_DOC_INSTALL_PATH=share/doc/${PF}"
-		"-DOPENCV_EXTRA_C_FLAGS=${CXXFLAGS}"
 	)
 
 	cmake-utils_src_configure