[106522] trunk/dports/graphics/OpenSceneGraph

[devans at macports.org]

Revision: 106522
          https://trac.macports.org/changeset/106522
Author:   devans at macports.org
Date:     2013-05-29 13:02:46 -0700 (Wed, 29 May 2013)
Log Message:
-----------
OpenSceneGraph: prevent opportunitistic linking, see #36306.
  * add missing build dependency
  * add common optional dependencies
  * patch to conditionally disable less common or broken options
  * explicitly request Qt4 to avoid linking with Qt3

Modified Paths:
--------------
    trunk/dports/graphics/OpenSceneGraph/Portfile
    trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/graphics/OpenSceneGraph/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/Portfile	2013-05-29 18:52:23 UTC (rev 106521)
+++ trunk/dports/graphics/OpenSceneGraph/Portfile	2013-05-29 20:02:46 UTC (rev 106522)
@@ -4,8 +4,9 @@
 PortSystem              1.0
 
 name                    OpenSceneGraph
+conflicts               OpenSceneGraph-devel
 version                 3.0.1
-revision                2
+revision                3
 set inconvenient_version    [strsed ${version} {/\.0$//}]
 maintainers             nomaintainer
 license                 wxWidgets-3
@@ -14,7 +15,6 @@
 homepage                http://www.openscenegraph.org/
 master_sites            ${homepage}downloads/stable_releases/${name}-${inconvenient_version}/source
 use_zip                 yes
-use_parallel_build      yes
 
 description             high-performance 3D graphics toolkit
 
@@ -29,10 +29,19 @@
                         patch-src-osgViewer-DarwinUtils.mm.diff \
                         patch-include-osg-Math.diff
 
-depends_build           port:cmake
+depends_build           port:cmake \
+                        port:pkgconfig
 
 depends_lib             port:freetype \
-                        port:gdal
+                        port:jasper \
+                        port:zlib \
+                        port:gdal \
+                        port:curl \
+                        port:poppler \
+                        port:librsvg \
+                        port:giflib \
+                        port:tiff \
+                        port:qt4-mac
 
 # error: cannot initialize a parameter of type 'void *' with an lvalue of type 'const void *const'
 compiler.blacklist      clang
@@ -41,7 +50,8 @@
 configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}
 configure.args          -DCMAKE_BUILD_TYPE=Release \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
-                        -DOSG_WINDOWING_SYSTEM=Cocoa
+                        -DOSG_WINDOWING_SYSTEM=Cocoa \
+                        -DDESIRED_QT_VERSION=4
 
 platform darwin {
     if {${os.major} < 9} {

Modified: trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff	2013-05-29 18:52:23 UTC (rev 106521)
+++ trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff	2013-05-29 20:02:46 UTC (rev 106522)
@@ -1,6 +1,84 @@
---- CMakeLists.txt.orig	2011-07-31 02:50:34.000000000 -0500
-+++ CMakeLists.txt	2012-09-03 05:58:31.000000000 -0500
-@@ -794,40 +794,6 @@
+--- CMakeLists.txt.orig	2011-07-31 00:50:34.000000000 -0700
++++ CMakeLists.txt	2013-05-28 15:18:15.000000000 -0700
+@@ -451,27 +451,68 @@
+ ELSE()
+ # Common to all platforms except android:
+     FIND_PACKAGE(FreeType)
+-    FIND_PACKAGE(Inventor)
++    OPTION(OSG_ENABLE_INVENTOR "Enable Inventor (Coin) support" OFF)
++    IF(OSG_ENABLE_INVENTOR)
++        FIND_PACKAGE(Inventor)
++    ELSE()
++        SET(INVENTOR_FOUND NO)
++    ENDIF()
+     FIND_PACKAGE(Jasper)
+-    FIND_PACKAGE(OpenEXR)
+-    FIND_PACKAGE(COLLADA)
++    OPTION(OSG_ENABLE_OPENEXR "Enable OpenEXR support" OFF)
++    IF(OSG_ENABLE_OPENEXR)
++    	FIND_PACKAGE(OpenEXR)
++    ELSE()
++        SET(OPENEXR_FOUND NO)
++    ENDIF()
++    OPTION(OSG_ENABLE_COLLADA "Enable Collada support" OFF)
++    IF(OSG_ENABLE_COLLADA)
++        FIND_PACKAGE(COLLADA)
++    ELSE()
++        SET(COLLADA_FOUND NO)
++    ENDIF()
+     FIND_PACKAGE(FBX)
+     FIND_PACKAGE(ZLIB)
+-    FIND_PACKAGE(Xine)
+-    FIND_PACKAGE(OpenVRML)
++    OPTION(OSG_ENABLE_XINE "Enable xine-lib support" OFF)
++    IF(OSG_ENABLE_XINE)
++        FIND_PACKAGE(Xine)
++    ELSE()
++        SET(XINE_FOUND NO)
++    ENDIF()
++    OPTION(OSG_ENABLE_OPENVRML "Enable OpenVRML support" OFF)
++    IF(OSG_ENABLE_OPENVRML)
++    	FIND_PACKAGE(OpenVRML)
++    ELSE()
++        SET(OPENVRML_FOUND NO)
++    ENDIF()
+     FIND_PACKAGE(Performer)
+     FIND_PACKAGE(GDAL)
+     FIND_PACKAGE(CURL)
+-    FIND_PACKAGE(ITK)
++    OPTION(OSG_ENABLE_ITK "Enable ITK support" OFF)
++    IF(OSG_ENABLE_ITK)
++    	FIND_PACKAGE(ITK)
++    ENDIF()
+     FIND_PACKAGE(LibVNCServer)
+     FIND_PACKAGE(OurDCMTK)
+     FIND_PACKAGE(OpenAL)
+-    FIND_PACKAGE(FFmpeg)
++    OPTION(OSG_ENABLE_FFMPEG "Enable FFmpeg support" OFF)
++    IF(OSG_ENABLE_FFMPEG)
++    	FIND_PACKAGE(FFmpeg)
++    ELSE()
++        SET(FFMPEG_FOUND NO)
++    ENDIF()
+     FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL)
++    OPTION(OSG_ENABLE_SDL "Enable SDL support" OFF)
++    IF(OSG_ENABLE_SDL)
++    	FIND_PACKAGE(SDL)
++    ELSE()
++        SET(SDL_FOUND NO)
++    ENDIF()
+     FIND_PACKAGE(Poppler-glib)
+     FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
++    OPTION(OSG_ENABLE_GTKGL "Enable GTK GL widget support" OFF)
++    IF(OSG_ENABLE_GTKGL)
++    	FIND_PACKAGE(GtkGl)
++    ENDIF()
+     FIND_PACKAGE(DirectInput)
+     FIND_PACKAGE(NVTT)
+ ENDIF()
+@@ -794,40 +835,6 @@
          #I think this or similar will be required for IPhone apps
          OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" ON)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130529/00cd89d9/attachment.html>