diff options
| author | wiz <wiz@pkgsrc.org> | 2012-06-02 11:56:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-06-02 11:56:35 +0000 |
| commit | d196090b50fe4dad5ab6022ce74df0ab6038a1ca (patch) | |
| tree | fd745f821f369407896fee21fef1f9510ca48532 /graphics/opencv | |
| parent | f805a1a1b047b4971bb65db707c1513d5263db09 (diff) | |
| download | pkgsrc-d196090b50fe4dad5ab6022ce74df0ab6038a1ca.tar.gz | |
adam reports that OS X 10.6 patch is not needed any longer, remove it.
Diffstat (limited to 'graphics/opencv')
| -rw-r--r-- | graphics/opencv/distinfo | 3 | ||||
| -rw-r--r-- | graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp | 20 |
2 files changed, 1 insertions, 22 deletions
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index 1e96fd15272..0635b9df411 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.12 2012/06/01 21:24:57 wiz Exp $ +$NetBSD: distinfo,v 1.13 2012/06/02 11:56:35 wiz Exp $ SHA1 (OpenCV-2.4.1.tar.bz2) = bc6f23c62c8e3e0746f6f95067d54340d12aed56 RMD160 (OpenCV-2.4.1.tar.bz2) = c28fec73cc9fcf2a7ca38990a315babc0310f501 Size (OpenCV-2.4.1.tar.bz2) = 47211018 bytes SHA1 (patch-CMakeLists.txt) = 67660c0ed98db2c24b3348a47b5ea2d18903ed11 -SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = ca4a861d0a1ac0c9416001ae9ed40cb0e924895a 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 deleted file mode 100644 index 24b42751785..00000000000 --- a/graphics/opencv/patches/patch-modules_core_include_opencv2_core_core.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-modules_core_include_opencv2_core_core.hpp,v 1.2 2012/06/01 21:24:57 wiz Exp $ - -Fix building on Mac OS X, where MIN and MAX got redefined by Obj-C headers. -http://code.opencv.org/issues/2011 - ---- 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" - |