[42288] trunk/dports/graphics/OpenSceneGraph
ryandesign at macports.org
ryandesign at macports.org
Tue Nov 18 02:40:43 PST 2008
Revision: 42288
http://trac.macports.org/changeset/42288
Author: ryandesign at macports.org
Date: 2008-11-18 02:40:41 -0800 (Tue, 18 Nov 2008)
Log Message:
-----------
OpenSceneGraph: Update to 2.6.1 and make sure we can build on both Tiger and Leopard; see #17294.
Modified Paths:
--------------
trunk/dports/graphics/OpenSceneGraph/Portfile
trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/graphics/OpenSceneGraph/files/patch-pthreads-CMakeLists.txt.diff
Modified: trunk/dports/graphics/OpenSceneGraph/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/Portfile 2008-11-18 07:51:32 UTC (rev 42287)
+++ trunk/dports/graphics/OpenSceneGraph/Portfile 2008-11-18 10:40:41 UTC (rev 42288)
@@ -3,15 +3,14 @@
PortSystem 1.0
name OpenSceneGraph
-version 2.4.0
+version 2.6.1
maintainers ryandesign openmaintainer
platforms darwin
categories graphics
homepage http://www.openscenegraph.org/
-master_sites ${homepage}files/${distname}
+master_sites ${homepage}downloads/developer_releases/
use_zip yes
use_parallel_build yes
-worksrcdir ${name}
description high-performance 3D graphics toolkit
@@ -19,12 +18,11 @@
useful in fields such as visual simulation, games, \
virtual reality, scientific visualization and modelling
-checksums md5 4d57fe285a1c6601893b1e0b99ca0bd3 \
- sha1 93e44719dcb46494560a19af6e1fee1cd030282c \
- rmd160 0b13d06a72799ca2625ba0244473444f87b9a0cb
+checksums md5 0955d92af64e48d2bdda464103962f92 \
+ sha1 1162f2253fddb2e2ee4d11698adf80ad30ff66f4 \
+ rmd160 f85469a682b35b7b3e94ace6ae9a33d4d37581f4
-patchfiles patch-pthreads-CMakeLists.txt.diff \
- patch-CMakeLists.txt.diff
+patchfiles patch-CMakeLists.txt.diff
depends_build port:cmake
@@ -35,6 +33,12 @@
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
configure.args -DCMAKE_BUILD_TYPE=Release
+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.
@@ -44,5 +48,5 @@
#}
livecheck.check regex
-livecheck.url ${homepage}downloads/developer_releases/?C=M&O=D
+livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex ${name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)\\.zip
Modified: trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff 2008-11-18 07:51:32 UTC (rev 42287)
+++ trunk/dports/graphics/OpenSceneGraph/files/patch-CMakeLists.txt.diff 2008-11-18 10:40:41 UTC (rev 42288)
@@ -1,27 +1,31 @@
---- CMakeLists.txt 2008-04-25 04:46:25.000000000 -0500
-+++ CMakeLists.txt 2008-07-26 04:20:57.000000000 -0500
-@@ -434,39 +434,6 @@
+--- CMakeLists.txt 2008-09-23 11:27:39.000000000 -0500
++++ CMakeLists.txt 2008-11-17 23:27:01.000000000 -0600
+@@ -587,43 +587,6 @@
ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
--# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
+-# 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.
-IF(APPLE)
- # 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
+- # 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
+- # 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/10.5.sdk)
-- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+- 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)
-- ELSE(EXISTS /Developer/SDKs/10.5.sdk)
+- ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
- IF(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)
@@ -30,13 +34,13 @@
- # Should break down further to set the -mmacosx-version-min,
- # but the SDK detection is too unreliable here.
- ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-- ENDIF(EXISTS /Developer/SDKs/10.5.sdk)
+- ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
- 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(APPLE)
-
- OPTION(BUILD_REF_DOCS "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
- IF(BUILD_REF_DOCS)
+ #
+ # Provide target for generating wrappers
Deleted: trunk/dports/graphics/OpenSceneGraph/files/patch-pthreads-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph/files/patch-pthreads-CMakeLists.txt.diff 2008-11-18 07:51:32 UTC (rev 42287)
+++ trunk/dports/graphics/OpenSceneGraph/files/patch-pthreads-CMakeLists.txt.diff 2008-11-18 10:40:41 UTC (rev 42288)
@@ -1,11 +0,0 @@
---- src/OpenThreads/pthreads/CMakeLists.txt (revision 8357)
-+++ src/OpenThreads/pthreads/CMakeLists.txt (revision 8358)
-@@ -27,7 +27,7 @@
- ENDIF(OPENTHREADS_SONAMES)
-
- SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
--SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
-+SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-
- CHECK_FUNCTION_EXISTS(pthread_yield HAVE_PTHREAD_YIELD)
- IF(HAVE_PTHREAD_YIELD)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081118/3ff8ddbb/attachment.html>
More information about the macports-changes
mailing list