[106529] trunk/dports/graphics/OpenSceneGraph-devel
devans at macports.org
devans at macports.org
Wed May 29 16:21:00 PDT 2013
Revision: 106529
https://trac.macports.org/changeset/106529
Author: devans at macports.org
Date: 2013-05-29 16:21:00 -0700 (Wed, 29 May 2013)
Log Message:
-----------
OpenSceneGraph-devel: update to version 3.1.6, dependencies, merge patch from r106522, closes #36303."
Revision Links:
--------------
https://trac.macports.org/changeset/106522
Modified Paths:
--------------
trunk/dports/graphics/OpenSceneGraph-devel/Portfile
Added Paths:
-----------
trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/graphics/OpenSceneGraph-devel/files/patch-disable-quicktime.diff
trunk/dports/graphics/OpenSceneGraph-devel/files/patch-src-osgDB-Registry.cpp.diff
Modified: trunk/dports/graphics/OpenSceneGraph-devel/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2013-05-29 22:43:37 UTC (rev 106528)
+++ trunk/dports/graphics/OpenSceneGraph-devel/Portfile 2013-05-29 23:21:00 UTC (rev 106529)
@@ -7,8 +7,7 @@
name OpenSceneGraph-devel
conflicts OpenSceneGraph
set my_name OpenSceneGraph
-version 2.9.7
-revision 7
+version 3.1.6
platforms darwin
categories graphics
maintainers nomaintainer
@@ -25,32 +24,35 @@
use_zip yes
-checksums md5 b5118ed07ec2945e23ad5e880f3f0f6d \
- sha1 5b374ef8459e95fc1b9eeebafedfb9d58a6b2290 \
- rmd160 d120307736cb56116266a899a7359b702fe69813
+checksums rmd160 3ab89102856f2d93afc3be9859cf8161246e3722 \
+ sha256 53069bef91441a0dcf73d9bc839b6b57af392822cb1287fb8886b641a605e179
-patchfiles patch-disable-quicktime.diff \
- patch-src-osgDB-Registry.cpp.diff
+patchfiles patch-CMakeLists.txt.diff
post-patch {
- reinplace s:@PREFIX@:${prefix}: ${worksrcpath}/src/osgDB/Registry.cpp
+ set sdk_name "macosx${macosx_deployment_target}"
+ reinplace "s|@@MP_SDK_NAME@@|${sdk_name}|" ${worksrcpath}/CMakeLists.txt
}
-depends_lib port:curl \
- path:lib/libavcodec.dylib:ffmpeg \
- port:freetype \
+depends_build-append port:pkgconfig
+
+depends_lib port:freetype \
+ port:jasper \
+ port:zlib \
port:gdal \
+ port:curl \
+ port:poppler \
+ port:librsvg \
port:giflib \
- port:jasper \
- port:jpeg \
- port:libpng \
port:tiff \
- port:zlib
+ port:qt4-mac \
+ port:boost
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
+ -DOSG_WINDOWING_SYSTEM=Cocoa \
+ -DDESIRED_QT_VERSION=4
livecheck.type regex
livecheck.url ${homepage}downloads/developer_releases/
Added: trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff 2013-05-29 23:21:00 UTC (rev 106529)
@@ -0,0 +1,91 @@
+--- CMakeLists.txt.orig 2013-05-29 14:21:52.000000000 -0700
++++ CMakeLists.txt 2013-05-29 14:34:13.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,14 +493,39 @@
+ 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(GTA)
+@@ -508,12 +533,25 @@
+ 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)
+ FIND_PACKAGE(Asio)
Deleted: trunk/dports/graphics/OpenSceneGraph-devel/files/patch-disable-quicktime.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/files/patch-disable-quicktime.diff 2013-05-29 22:43:37 UTC (rev 106528)
+++ trunk/dports/graphics/OpenSceneGraph-devel/files/patch-disable-quicktime.diff 2013-05-29 23:21:00 UTC (rev 106529)
@@ -1,41 +0,0 @@
---- CMakeLists.txt.orig 2009-12-20 23:45:08.000000000 +0100
-+++ CMakeLists.txt 2009-12-20 23:48:36.000000000 +0100
-@@ -464,34 +464,10 @@
- ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
- ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-
--# Platform specific:
--# (We can approach this one of two ways. We can try to FIND everything
--# and simply check if we found the packages before actually building
--# or we can hardcode the cases. The advantage of the former is that
--# packages that are installed on platforms that don't require them
--# will still get built (presuming no compatibility issues). But this
--# also means modules that are redundant may get built. For example,
--# OS X doesn't need GIF, JPEG, PNG, TIFF, etc because it uses QuickTime.
--# Also, it will clutter the CMake menu with "NOT_FOUND".
--# The downside to the latter is that it is harder to build those
--# potentially redundant modules.)
--
--# Image readers/writers depend on 3rd party libraries except for OS X which
--# can use Quicktime.
--IF(NOT APPLE)
-- FIND_PACKAGE(GIFLIB)
-- FIND_PACKAGE(JPEG)
-- FIND_PACKAGE(PNG)
-- FIND_PACKAGE(TIFF)
--
-- # QuickTime is required for OS X, but optional for Windows.
-- IF(WIN32)
-- FIND_PACKAGE(QuickTime)
-- ENDIF()
--
--ELSE()
-- FIND_PACKAGE(QuickTime)
--ENDIF()
-+FIND_PACKAGE(GIFLIB)
-+FIND_PACKAGE(JPEG)
-+FIND_PACKAGE(PNG)
-+FIND_PACKAGE(TIFF)
-
- ################################################################################
- # Create bin and lib directories if required
Deleted: trunk/dports/graphics/OpenSceneGraph-devel/files/patch-src-osgDB-Registry.cpp.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/files/patch-src-osgDB-Registry.cpp.diff 2013-05-29 22:43:37 UTC (rev 106528)
+++ trunk/dports/graphics/OpenSceneGraph-devel/files/patch-src-osgDB-Registry.cpp.diff 2013-05-29 23:21:00 UTC (rev 106529)
@@ -1,33 +0,0 @@
---- src/osgDB/Registry.cpp.orig 2009-12-21 03:42:08.000000000 +0100
-+++ src/osgDB/Registry.cpp 2009-12-21 03:46:42.000000000 +0100
-@@ -730,29 +730,7 @@
-
- std::string Registry::createLibraryNameForNodeKit(const std::string& name)
- {
--#if defined(__CYGWIN__)
-- return "cyg"+name+".dll";
--#elif defined(__MINGW32__)
-- return "lib"+name+".dll";
--#elif defined(WIN32)
-- #ifdef _DEBUG
-- return name+OSG_DEBUG_POSTFIX_WITH_QUOTES +".dll";
-- #else
-- return name+".dll";
-- #endif
--#elif macintosh
-- #ifdef _DEBUG
-- return name+OSGDEBUG_POSTFIX_WITH_QUOTES;
-- #else
-- return name;
-- #endif
--#else
-- #ifdef _DEBUG
-- return "lib"+name+OSG_DEBUG_POSTFIX_WITH_QUOTES + ADDQUOTES(OSG_PLUGIN_EXTENSION);
-- #else
-- return "lib"+name+ADDQUOTES(OSG_PLUGIN_EXTENSION);
-- #endif
--#endif
-+ return "@PREFIX@/lib/lib"+name+".dylib";
- }
-
- Registry::LoadStatus Registry::loadLibrary(const std::string& fileName)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130529/1338dadc/attachment.html>
More information about the macports-changes
mailing list