[93984] trunk/dports/graphics/opencv/files/patch-highgui_CMakeLists.txt. diff
raphael at macports.org
raphael at macports.org
Wed Jun 6 06:02:11 PDT 2012
Revision: 93984
https://trac.macports.org/changeset/93984
Author: raphael at macports.org
Date: 2012-06-06 06:02:09 -0700 (Wed, 06 Jun 2012)
Log Message:
-----------
opencv: update patch for OpenCV 2.4.1 on Leopard or earlier
Modified Paths:
--------------
trunk/dports/graphics/opencv/files/patch-highgui_CMakeLists.txt.diff
Modified: trunk/dports/graphics/opencv/files/patch-highgui_CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/opencv/files/patch-highgui_CMakeLists.txt.diff 2012-06-06 09:47:45 UTC (rev 93983)
+++ trunk/dports/graphics/opencv/files/patch-highgui_CMakeLists.txt.diff 2012-06-06 13:02:09 UTC (rev 93984)
@@ -1,12 +1,12 @@
---- modules/highgui/CMakeLists.txt.orig 2012-05-11 14:32:43.000000000 +0200
-+++ modules/highgui/CMakeLists.txt 2012-05-11 14:33:45.000000000 +0200
-@@ -198,9 +198,6 @@
- endif()
+--- modules/highgui/CMakeLists.txt.orig 2012-06-06 13:05:19.000000000 +0200
++++ modules/highgui/CMakeLists.txt 2012-06-06 13:05:57.000000000 +0200
+@@ -149,9 +149,6 @@
+ if(UNIX AND BZIP2_LIBRARIES)
+ list(APPEND HIGHGUI_LIBRARIES ${BZIP2_LIBRARIES})
endif()
-
-- if(HAVE_FFMPEG)
-- set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} "-framework VideoDecodeAcceleration")
+- if(APPLE)
+- list(APPEND HIGHGUI_LIBRARIES "-framework VideoDecodeAcceleration")
- endif()
- endif(APPLE)
+ endif(HAVE_FFMPEG)
- if(HAVE_opencv_androidcamera)
+ if(HAVE_PVAPI)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120606/09da2366/attachment-0001.html>
More information about the macports-changes
mailing list