Fix building on Mac OS X (PR#46117)

4 files changed, 122 insertions, 23 deletions

diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index e344068bee1..0c37a1a4f24 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.20 2012/03/24 05:54:55 markd Exp $
-#
+# $NetBSD: Makefile,v 1.21 2012/04/03 18:57:22 adam Exp $
 
-DISTNAME=		OpenCV-2.2.0
-PKGNAME=		${DISTNAME:S/OpenCV/opencv/}
-PKGREVISION=		5
-CATEGORIES=		graphics devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	OpenCV-2.2.0
+PKGNAME=	${DISTNAME:S/OpenCV/opencv/}
+PKGREVISION=	5
+CATEGORIES=	graphics devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		anthony.mallet@laas.fr
-HOMEPAGE=		http://opencvlibrary.sourceforge.net/
-COMMENT=		Library for computer vision problems
+MAINTAINER=	anthony.mallet@laas.fr
+HOMEPAGE=	http://opencv.willowgarage.com/
+COMMENT=	Library for computer vision problems
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_CMAKE=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config
 INSTALLATION_DIRS+=	share/doc/opencv/papers share/doc/opencv/ref/pics \
 			share/opencv/haarcascades
 
@@ -35,11 +35,17 @@ CMAKE_ARGS+=	-D BUILD_NEW_PYTHON_SUPPORT=OFF
 CMAKE_ARGS+=	-D WITH_OPENEXR:BOOL=OFF
 CMAKE_ARGS+=	-D BUILD_DOXYGEN_DOCS=OFF
 
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/include/opencv2/core/*.orig
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
+.if ${OPSYS} != "Darwin"
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index ba160652c83..d675e0dce5a 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2011/12/14 18:27:22 marino Exp $
+$NetBSD: distinfo,v 1.9 2012/04/03 18:57:22 adam Exp $
 
 SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7
 RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01
 Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes
-SHA1 (patch-CMakeLists.txt) = 3c58828d9122105942820320a44f54e93effa33a
+SHA1 (patch-CMakeLists.txt) = f9954b7bf2972d0cfa0a653e62b7a65147441bb9
 SHA1 (patch-aa) = 3a95649075b2ca94d39ced3c00da6a90b5834881
 SHA1 (patch-ab) = 66936658e5ec12c479c29388916edd399c7feca6
+SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = 3936d23ad51f82536bb73428754d131259b8bf05
diff --git a/graphics/opencv/patches/patch-CMakeLists.txt b/graphics/opencv/patches/patch-CMakeLists.txt
index bfff3f7644e..553bd976430 100644
--- a/graphics/opencv/patches/patch-CMakeLists.txt
+++ b/graphics/opencv/patches/patch-CMakeLists.txt
@@ -1,13 +1,86 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2011/12/14 18:27:22 marino Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2012/04/03 18:57:22 adam Exp $
+
+Fix configuring on Mac OS X.
 
 --- CMakeLists.txt.orig	2010-12-05 03:35:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -464,7 +464,7 @@ if(UNIX)
-             endif()

+@@ -206,7 +206,7 @@ set(BUILD_TESTS ON CACHE BOOL "Build tes
+ 

+ # Build 3rdparty libraries under unix

+ # ===================================================

+-if(WIN32 OR APPLE)

++if(WIN32)

+     set(OPENCV_BUILD_3RDPARTY_LIBS TRUE  CACHE BOOL "Build 3rd party libraries")

+ else()

+     set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")

+@@ -437,34 +437,7 @@ if(UNIX)

+             set(HAVE_CAMV4L2 FALSE)

          endif()

  

+-        if(NOT OPENCV_BUILD_3RDPARTY_LIBS)

+-            if(WITH_PNG)

+-                include(FindPNG)

+-                if(PNG_FOUND)

+-                    CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)

+-                    CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)

+-                endif()

+-            else()

+-                set(PNG_FOUND FALSE)

+-            endif()

+-            if(WITH_TIFF)

+-                include(FindTIFF)

+-            else()

+-                set(TIFF_FOUND FALSE)

+-            endif()

+-            if(WITH_JASPER)

+-                include(FindJasper)

+-            else()

+-                set(JASPER_FOUND FALSE)

+-            endif()

+-            if(WITH_JPEG)

+-                include(FindJPEG)

+-            else()

+-                set(JPEG_FOUND FALSE)

+-            endif()

+-        endif()

+-

 -        if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")

 +        if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")

              set(OPENCV_LINKER_LIBS m pthread)

          else()

              set(OPENCV_LINKER_LIBS dl m pthread rt)

+@@ -472,6 +445,34 @@ if(UNIX)

+     else()

+         add_definitions(-DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_LIBPTHREAD -DHAVE_UNISTD_H)

+     endif()

++

++    if(NOT OPENCV_BUILD_3RDPARTY_LIBS)

++        if(WITH_PNG)

++            include(FindPNG)

++            if(PNG_FOUND)

++                CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)

++                CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)

++            endif()

++        else()

++            set(PNG_FOUND FALSE)

++        endif()

++        if(WITH_TIFF)

++            include(FindTIFF)

++        else()

++            set(TIFF_FOUND FALSE)

++        endif()

++        if(WITH_JASPER)

++            include(FindJasper)

++        else()

++            set(JASPER_FOUND FALSE)

++        endif()

++        if(WITH_JPEG)

++            include(FindJPEG)

++        else()

++            set(JPEG_FOUND FALSE)

++        endif()

++    endif()

++

+ endif()

+ 

+ if(WITH_PNG AND NOT PNG_FOUND)

diff --git a/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp b/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp
new file mode 100644
index 00000000000..c627cf6a4fb
--- /dev/null
+++ b/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-modules_core_include_opencv2_core_core.hpp,v 1.1 2012/04/03 18:57:22 adam Exp $
+
+Fix building on Mac OS X, where MIN and MAX got redefined by Obj-C headers.
+
+--- modules/core/include/opencv2/core/core.hpp.orig	2012-04-03 17:44:46.000000000 +0000
++++ modules/core/include/opencv2/core/core.hpp
+@@ -46,6 +46,12 @@
+ #ifndef __OPENCV_CORE_HPP__
+ #define __OPENCV_CORE_HPP__
+ 
++// make sure these are defined correctly
++#undef MIN
++#undef MAX
++#define MIN(a,b) (((a)<(b))?(a):(b))
++#define MAX(a,b) (((a)>(b))?(a):(b))
++
+ #include "opencv2/core/types_c.h"
+ #include "opencv2/core/version.hpp"
+