Revision: 111840 https://trac.macports.org/changeset/111840 Author: devans@macports.org Date: 2013-10-03 09:10:09 -0700 (Thu, 03 Oct 2013) Log Message: ----------- OpenSceneGraph, OpenSceneGraph-devel: update to version 3.2.0, dependencies, configuration, master_sites, livecheck. Modified Paths: -------------- trunk/dports/graphics/OpenSceneGraph/Portfile trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff trunk/dports/graphics/OpenSceneGraph-devel/Portfile trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff Modified: trunk/dports/graphics/OpenSceneGraph/Portfile =================================================================== --- trunk/dports/graphics/OpenSceneGraph/Portfile 2013-10-03 16:07:49 UTC (rev 111839) +++ trunk/dports/graphics/OpenSceneGraph/Portfile 2013-10-03 16:10:09 UTC (rev 111840) @@ -2,71 +2,53 @@ # $Id$ PortSystem 1.0 +PortGroup cmake 1.0 name OpenSceneGraph conflicts OpenSceneGraph-devel -version 3.0.1 -revision 4 -maintainers nomaintainer -license wxWidgets-3 +version 3.2.0 platforms darwin categories graphics +maintainers nomaintainer +license wxWidgets-3 +description high-performance 3D graphics toolkit + +long_description ${name} is a high-performance 3D graphics toolkit useful in fields such as \ + visual simulation, games, virtual reality, scientific visualization and \ + modelling. + homepage http://www.openscenegraph.org/ -master_sites ${homepage}downloads/stable_releases/${name}-${version}/source +master_sites ${homepage}downloads/developer_releases/ use_zip yes -description high-performance 3D graphics toolkit +checksums rmd160 cba6679cec2a9a6639f5758239b5af5b2df5208a \ + sha256 ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e -long_description ${name} is a high-performance 3D graphics toolkit \ - useful in fields such as visual simulation, games, \ - virtual reality, scientific visualization and modelling +patchfiles patch-CMakeLists.txt.diff -checksums rmd160 54b315c318b7ade2bcc65703cea5f41377e93a71 \ - sha256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 +depends_build-append port:pkgconfig -patchfiles patch-CMakeLists.txt.diff \ - patch-src-osgViewer-DarwinUtils.mm.diff \ - patch-include-osg-Math.diff - -depends_build port:cmake \ - port:pkgconfig - depends_lib port:freetype \ port:jasper \ + port:openexr \ port:zlib \ port:gdal \ port:curl \ + path:lib/libavcodec.dylib:ffmpeg \ port:poppler \ port:librsvg \ port:giflib \ port:tiff \ - port:qt4-mac + port:qt4-mac \ + port:boost -# error: cannot initialize a parameter of type 'void *' with an lvalue of type 'const void *const' -compiler.blacklist clang - -configure.cmd cmake -configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix} -configure.args -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \ +configure.args-append -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \ + -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \ + -DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \ -DOSG_WINDOWING_SYSTEM=Cocoa \ -DDESIRED_QT_VERSION=4 -platform darwin { - if {${os.major} < 9} { - configure.args-append -DDEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT=ON - } -} - -universal_variant no -# patch-CMakeLists.txt.diff removes the built-in universal support. We need a -# MacPorts-controlled universal build, but this universal variant is untested. -#variant universal { -# configure.args-append -DCMAKE_OSX_ARCHITECTURES="${configure.universal_archs}" \ -# -DCMAKE_CXX_FLAGS="${configure.universal_cxxflags}" -#} - livecheck.type regex -livecheck.url ${homepage}downloads/stable_releases/ -livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) +livecheck.url ${homepage}downloads/developer_releases/ +livecheck.regex "${name}-(\\d+\\.\\d*\[02468\](?:\\.\\d+)*)${extract.suffix}" Modified: trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff 2013-10-03 16:07:49 UTC (rev 111839) +++ trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff 2013-10-03 16:10:09 UTC (rev 111840) @@ -1,131 +1,48 @@ ---- CMakeLists.txt.orig 2011-07-31 00:50:34.000000000 -0700 -+++ CMakeLists.txt 2013-05-31 16:31:45.000000000 -0700 -@@ -451,31 +451,77 @@ +--- CMakeLists.txt.orig 2013-10-02 22:29:59.000000000 -0700 ++++ CMakeLists.txt 2013-10-02 22:30:42.000000000 -0700 +@@ -513,32 +513,32 @@ 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(Inventor) FIND_PACKAGE(Jasper) -- FIND_PACKAGE(OpenEXR) + 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(COLLADA) 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(Performer) ++# FIND_PACKAGE(Xine) ++# FIND_PACKAGE(OpenVRML) ++# FIND_PACKAGE(Performer) FIND_PACKAGE(GDAL) +- FIND_PACKAGE(GTA) ++# FIND_PACKAGE(GTA) FIND_PACKAGE(CURL) -- FIND_PACKAGE(ITK) - FIND_PACKAGE(LibVNCServer) -+ OPTION(OSG_ENABLE_LIBVNCSERVER "Enable LibVNCServer support" OFF) -+ IF(OSG_ENABLE_LIBVNCSERVER) -+ FIND_PACKAGE(LibVNCServer) -+ ELSE() -+ SET(LIBVNCSERVER_FOUND NO) -+ ENDIF() - 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(OurDCMTK) ++# FIND_PACKAGE(LibVNCServer) ++# FIND_PACKAGE(OurDCMTK) + FIND_PACKAGE(FFmpeg) +- 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(DirectShow) ++# FIND_PACKAGE(SDL) 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(DirectInput) ++# FIND_PACKAGE(GtkGl) ++# FIND_PACKAGE(DirectInput) FIND_PACKAGE(NVTT) + IF (NOT WIN32) + FIND_PACKAGE(Asio) + ENDIF() +- FIND_PACKAGE(ZeroConf) ++# FIND_PACKAGE(ZeroConf) ENDIF() -+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) -+ FIND_PACKAGE(ITK) -+ENDIF() -+ - # Include macro utilities here - INCLUDE(OsgMacroUtils) - -@@ -794,40 +840,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) - -- ELSE() -- -- # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 -- # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support. -- -- # These are just defaults/recommendations, but how we want to build -- # out of the box. But the user needs to be able to change these options. -- # So we must only set the values the first time CMake is run, or we -- # will overwrite any changes the user sets. -- # FORCE is used because the options are not reflected in the UI otherwise. -- # Seems like a good place to add version specific compiler flags too. -- IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE) -- # This is really fragile, but CMake doesn't provide the OS system -- # version information we need. (Darwin versions can be changed -- # independently of OS X versions.) -- # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically. -- IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk) -- # 64-bit compiles are not supported with Carbon. We should enable -- # 64-bit compilation by default once osgviewer has been -- # rewritten with Cocoa. -- #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) -- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) -- ELSEIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) -- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) -- ELSE() -- # No Universal Binary support -- # Should break down further to set the -mmacosx-version-min, -- # but the SDK detection is too unreliable here. -- ENDIF() -- ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE) -- -- OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF) - - ENDIF() - + IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) Modified: trunk/dports/graphics/OpenSceneGraph-devel/Portfile =================================================================== --- trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2013-10-03 16:07:49 UTC (rev 111839) +++ trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2013-10-03 16:10:09 UTC (rev 111840) @@ -7,8 +7,7 @@ name OpenSceneGraph-devel conflicts OpenSceneGraph set my_name OpenSceneGraph -version 3.1.7 -revision 1 +version 3.2.0 platforms darwin categories graphics maintainers nomaintainer @@ -25,23 +24,20 @@ use_zip yes -checksums rmd160 04141b4b6791d39ac72dca8034f8d62ec4e2f8cc \ - sha256 3d859b496a6b7a6c165388c8a1d503e175a79e90993bc15f4a8a35898c796241 +checksums rmd160 cba6679cec2a9a6639f5758239b5af5b2df5208a \ + sha256 ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e patchfiles patch-CMakeLists.txt.diff -post-patch { - set sdk_name "macosx${macosx_deployment_target}" - reinplace "s|@@MP_SDK_NAME@@|${sdk_name}|" ${worksrcpath}/CMakeLists.txt -} - depends_build-append port:pkgconfig depends_lib port:freetype \ port:jasper \ + port:openexr \ port:zlib \ port:gdal \ port:curl \ + path:lib/libavcodec.dylib:ffmpeg \ port:poppler \ port:librsvg \ port:giflib \ @@ -55,16 +51,6 @@ -DOSG_WINDOWING_SYSTEM=Cocoa \ -DDESIRED_QT_VERSION=4 -variant ffmpeg description {Enable FFmpeg audio/video file format support} { - depends_lib-append path:lib/libavcodec.dylib:ffmpeg - configure.args-append -DOSG_ENABLE_FFMPEG=YES -} - -variant openexr description {Enable OpenEXR stream support} { - depends_lib-append port:openexr - configure.args-append -DOSG_ENABLE_OPENEXR=YES -} - livecheck.type regex livecheck.url ${homepage}downloads/developer_releases/ -livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*) +livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" Modified: trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff 2013-10-03 16:07:49 UTC (rev 111839) +++ trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff 2013-10-03 16:10:09 UTC (rev 111840) @@ -1,103 +1,48 @@ ---- CMakeLists.txt.orig 2013-05-23 07:14:51.000000000 -0700 -+++ CMakeLists.txt 2013-05-31 17:30:14.000000000 -0700 -@@ -220,10 +220,10 @@ - IF(NOT ANDROID) - IF(APPLE) - # Determine the canonical name of the selected Platform SDK -- EXECUTE_PROCESS(COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "CanonicalName" -- OUTPUT_VARIABLE OSG_OSX_SDK_NAME -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- -+ #EXECUTE_PROCESS(COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "CanonicalName" -+ # OUTPUT_VARIABLE OSG_OSX_SDK_NAME -+ # OUTPUT_STRIP_TRAILING_WHITESPACE) -+ SET (OSG_OSX_SDK_NAME "@@MP_SDK_NAME@@") - # Trying to get CMake to generate an XCode IPhone project, current efforts are to get iphoneos sdk 3.1 working - # Added option which needs manually setting to select the IPhone SDK for building. We can only have one of the below - # set to true. Should realy have an OSG_BUILD_PLATFORM variable that we set to our desired platform -@@ -493,27 +493,75 @@ +--- CMakeLists.txt.orig 2013-10-02 22:29:59.000000000 -0700 ++++ CMakeLists.txt 2013-10-02 22:30:42.000000000 -0700 +@@ -513,32 +513,32 @@ 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(Inventor) FIND_PACKAGE(Jasper) -- FIND_PACKAGE(OpenEXR) + 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(COLLADA) 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(Performer) ++# FIND_PACKAGE(Xine) ++# FIND_PACKAGE(OpenVRML) ++# FIND_PACKAGE(Performer) FIND_PACKAGE(GDAL) - FIND_PACKAGE(GTA) -+ OPTION(OSG_ENABLE_GTA "Enable libgta support" OFF) -+ IF(OSG_ENABLE_GTA) -+ FIND_PACKAGE(GTA) -+ ELSE() -+ SET(GTA_FOUND NO) -+ ENDIF() ++# FIND_PACKAGE(GTA) FIND_PACKAGE(CURL) - FIND_PACKAGE(LibVNCServer) -+ OPTION(OSG_ENABLE_LIBVNCSERVER "Enable LibVNCServer support" OFF) -+ IF(OSG_ENABLE_LIBVNCSERVER) -+ FIND_PACKAGE(LibVNCServer) -+ ELSE() -+ SET(LIBVNCSERVER_FOUND NO) -+ ENDIF() - 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(OurDCMTK) ++# FIND_PACKAGE(LibVNCServer) ++# FIND_PACKAGE(OurDCMTK) + FIND_PACKAGE(FFmpeg) +- 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(DirectShow) ++# FIND_PACKAGE(SDL) 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(DirectInput) ++# FIND_PACKAGE(GtkGl) ++# FIND_PACKAGE(DirectInput) FIND_PACKAGE(NVTT) - FIND_PACKAGE(Asio) + IF (NOT WIN32) + FIND_PACKAGE(Asio) + ENDIF() +- FIND_PACKAGE(ZeroConf) ++# FIND_PACKAGE(ZeroConf) + ENDIF() + + IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)