[128132] trunk/dports/graphics/opencv

[ryandesign at macports.org]

Revision: 128132
          https://trac.macports.org/changeset/128132
Author:   ryandesign at macports.org
Date:     2014-11-13 21:29:56 -0800 (Thu, 13 Nov 2014)
Log Message:
-----------
opencv: use patchfile instead of reinplace

Modified Paths:
--------------
    trunk/dports/graphics/opencv/Portfile

Added Paths:
-----------
    trunk/dports/graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff

Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile	2014-11-14 05:22:00 UTC (rev 128131)
+++ trunk/dports/graphics/opencv/Portfile	2014-11-14 05:29:56 UTC (rev 128132)
@@ -58,7 +58,8 @@
                     patch-cmake_OpenCVFindLibsPerf.cmake.diff \
                     patch-modules_java_CMakeLists.txt.diff \
                     patch-modules_python_CMakeLists.txt.diff \
-                    patch-modules_core_src_parallel.cpp.diff
+                    patch-modules_core_src_parallel.cpp.diff \
+                    patch-modules-highgui-src-window_cocoa.mm.diff
 
 configure.args-append ../${distname}/ \
                     -DWITH_1394=OFF \
@@ -140,11 +141,6 @@
     }
 }
 
-post-patch {
-    reinplace "s:MAC_OS_X_VERSION_10_6:1060:" \
-        ${worksrcpath}/../${distname}/modules/highgui/src/window_cocoa.mm
-}
-
 # PCH broken when universal
 if {[variant_isset universal]} {
     configure.args-delete   -DENABLE_PRECOMPILED_HEADERS=ON

Added: trunk/dports/graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff	                        (rev 0)
+++ trunk/dports/graphics/opencv/files/patch-modules-highgui-src-window_cocoa.mm.diff	2014-11-14 05:29:56 UTC (rev 128132)
@@ -0,0 +1,12 @@
+Build fix for Leopard and older
+--- modules/highgui/src/window_cocoa.mm.orig	2014-10-01 02:33:36.000000000 -0500
++++ modules/highgui/src/window_cocoa.mm	2014-11-13 23:27:53.000000000 -0600
+@@ -145,7 +145,7 @@
+     application = [NSApplication sharedApplication];
+     windows = [[NSMutableDictionary alloc] init];
+ 
+-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+ 
+ #ifndef NSAppKitVersionNumber10_5
+ #define NSAppKitVersionNumber10_5 949
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141113/0b744f46/attachment.html>