[61844] trunk/dports/devel
nox at macports.org
nox at macports.org
Mon Dec 21 15:55:38 PST 2009
Revision: 61844
http://trac.macports.org/changeset/61844
Author: nox at macports.org
Date: 2009-12-21 15:55:38 -0800 (Mon, 21 Dec 2009)
Log Message:
-----------
Fix osgswig-devel directory name
Added Paths:
-----------
trunk/dports/devel/osgswig-devel/
trunk/dports/devel/osgswig-devel/Portfile
trunk/dports/devel/osgswig-devel/files/
trunk/dports/devel/osgswig-devel/files/patch-src-osg.i.diff
trunk/dports/devel/osgswig-devel/files/patch-src-osgAnimation.i.diff
trunk/dports/devel/osgswig-devel/files/patch-src-python-CMakeLists.txt.diff
Removed Paths:
-------------
trunk/dports/devel/osgswig/Portfile
trunk/dports/devel/osgswig/files/patch-src-osg.i.diff
trunk/dports/devel/osgswig/files/patch-src-osgAnimation.i.diff
trunk/dports/devel/osgswig/files/patch-src-python-CMakeLists.txt.diff
Deleted: trunk/dports/devel/osgswig/Portfile
===================================================================
--- trunk/dports/devel/osgswig/Portfile 2009-12-21 23:54:26 UTC (rev 61843)
+++ trunk/dports/devel/osgswig/Portfile 2009-12-21 23:55:38 UTC (rev 61844)
@@ -1,49 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-PortGroup cmake 1.0
-
-name osgswig-devel
-version 222
-platforms darwin
-categories graphics
-license OpenSceneGraphv0.0/wxWindowsv3/LGPLv2.1
-maintainers nox openmaintainer
-description SWIG based bindings for OpenSceneGraph
-
-long_description \
- The osgSWIG project utilises SWIG to generate bindings for this C++-based \
- scene graph for various higher-level languages. Our main target is \
- currently Python, but others of interest are Java, Ruby, and Lua.
-
-homepage http://code.google.com/p/osgswig/
-fetch.type svn
-svn.url http://osgswig.googlecode.com/svn/trunk/
-svn.tag ${version}
-
-worksrcdir trunk
-
-patchfiles \
- patch-src-osg.i.diff \
- patch-src-osgAnimation.i.diff \
- patch-src-python-CMakeLists.txt.diff
-
-post-patch {
- reinplace s:@FRAMEWORKS_DIR@:${frameworks_dir}: \
- ${worksrcpath}/src/python/CMakeLists.txt
-}
-
-depends_lib \
- path:lib/pkgconfig/openscenegraph.pc:OpenSceneGraph \
- port:python26 \
- port:swig \
- port:swig-python
-
-destroot {
- set site_packages \
- ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages
- xinstall -d ${destroot}${site_packages}
- copy ${worksrcpath}/lib/python/osgswig-0.9.1 \
- ${destroot}${site_packages}/OpenSceneGraph
- touch ${destroot}${site_packages}/OpenSceneGraph/__init__.py
-}
\ No newline at end of file
Deleted: trunk/dports/devel/osgswig/files/patch-src-osg.i.diff
===================================================================
--- trunk/dports/devel/osgswig/files/patch-src-osg.i.diff 2009-12-21 23:54:26 UTC (rev 61843)
+++ trunk/dports/devel/osgswig/files/patch-src-osg.i.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -1,73 +0,0 @@
---- src/osg.i.orig 2009-12-21 18:16:02.000000000 +0100
-+++ src/osg.i 2009-12-21 22:01:15.000000000 +0100
-@@ -462,8 +463,12 @@
- %ignore osg::GraphicsContext::getCurrentOperation;
-
-
-+%ignore osg::Texture::getTextureObjectManager;
- %ignore osg::Texture::getExtensions;
- %ignore osg::Texture::setExtensions;
-+%ignore osg::Texture::s_numberTextureReusedLastInLastFrame;
-+%ignore osg::Texture::s_numberNewTextureInLastFrame;
-+%ignore osg::Texture::s_numberDeletedTextureInLastFrame;
-
- %ignore osg::Texture1D::setSubloadCallback;
- %ignore osg::Texture1D::getSubloadCallback;
-@@ -500,8 +505,11 @@
- %ignore osg::BlendEquation::setExtensions;
- %ignore osg::BlendColor::getExtensions;
- %ignore osg::BlendColor::setExtensions;
--%ignore osg::BufferObject::getExtensions;
--%ignore osg::BufferObject::setExtensions;
-+
-+%ignore osg::GLBufferObject::_extensions;
-+%ignore osg::GLBufferObject::Extensions;
-+%ignore osg::GLBufferObject::getExtensions;
-+%ignore osg::GLBufferObject::setExtensions;
-
- %ignore osg::Point::Extensions;
- %ignore osg::Point::getExtensions;
-@@ -679,7 +687,7 @@
- if (PyString_Check($input)) {
- int len;
- char *buf;
-- PyString_AsStringAndSize($input, &buf, &len);
-+ PyString_AsStringAndSize($input, &buf, (Py_ssize_t *)&len);
- $1 = (unsigned char *)malloc(len);
- memcpy($1, buf, len);
- } else {
-@@ -733,7 +742,14 @@
- %extend osg::Viewport { value_type getHeight() {return $self->height();}};
- %include osg/Viewport
-
-+%ignore osg::Shader::Extensions;
-+%ignore osg::Shader::getExtensions;
-+%ignore osg::Shader::setExtensions;
- %include osg/Shader
-+
-+%ignore osg::Program::Extensions;
-+%ignore osg::Program::getExtensions;
-+%ignore osg::Program::setExtensions;
- %include osg/Program
-
- %extend osg::Program {
-@@ -940,6 +956,9 @@
- %include osg/ArgumentParser
- %include osg/Array
-
-+%ignore osg::PrimitiveSet::Extensions;
-+%ignore osg::PrimitiveSet::getExtensions;
-+%ignore osg::PrimitiveSet::setExtensions;
- %include osg/PrimitiveSet
-
-
-@@ -1020,6 +1038,9 @@
- %ignore osg::Uniform::getUpdateCallback;
- %ignore osg::Uniform::setEventCallback;
- %ignore osg::Uniform::getEventCallback;
-+%ignore osg::Uniform::Extensions;
-+%ignore osg::Uniform::getExtensions;
-+%ignore osg::Uniform::setExtensions;
-
-
- %include osg/Uniform
Deleted: trunk/dports/devel/osgswig/files/patch-src-osgAnimation.i.diff
===================================================================
--- trunk/dports/devel/osgswig/files/patch-src-osgAnimation.i.diff 2009-12-21 23:54:26 UTC (rev 61843)
+++ trunk/dports/devel/osgswig/files/patch-src-osgAnimation.i.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -1,16 +0,0 @@
---- src/osgAnimation.i.orig 2009-12-21 20:28:00.000000000 +0100
-+++ src/osgAnimation.i 2009-12-21 20:32:48.000000000 +0100
-@@ -54,6 +54,13 @@
-
- // ignore nested stuff
-
-+%ignore osgAnimation::RigGeometry::getInfluenceMap;
-+%ignore osgAnimation::RigGeometry::setInfluenceMap;
-+%ignore osgAnimation::RigGeometry::getVertexInfluenceSet;
-+%ignore osgAnimation::RigGeometry::setVertexInfluenceSet;
-+%ignore osgAnimation::RigGeometry::getRigTransformImplementation;
-+%ignore osgAnimation::RigGeometry::setRigTransformImplementation;
-+
- // not sure why this needs ignoring but it generates an undefined symbol if it isn't ignored
- %ignore osgAnimation::Bone::needLink;
-
Deleted: trunk/dports/devel/osgswig/files/patch-src-python-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/osgswig/files/patch-src-python-CMakeLists.txt.diff 2009-12-21 23:54:26 UTC (rev 61843)
+++ trunk/dports/devel/osgswig/files/patch-src-python-CMakeLists.txt.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -1,37 +0,0 @@
---- src/python/CMakeLists.txt.orig 2009-12-21 23:05:15.000000000 +0100
-+++ src/python/CMakeLists.txt 2009-12-21 23:07:02.000000000 +0100
-@@ -19,29 +19,13 @@
- EXEC_PROGRAM("ln -s ${FRAME_WORK_ROOT}/Headers ${TARGET_ROOT}/${FRAMEWORK_NAME}" )
- ENDMACRO(FAKE_INCLUDE_FROM_FRAMEWORK FRAMEWORK_NAME FRAME_WORK_ROOT TARGET_ROOT)
-
--## additional include directories
--IF(NOT APPLE)
-- INCLUDE_DIRECTORIES(
-- ${OSG_INCLUDE_DIR}
-- )
--# dealing with frameworks on Mac OS X
--ELSE(NOT APPLE)
-- SET(FAKE_INCLUDE_PATH ${CMAKE_BINARY_DIR}/include)
-- FILE(MAKE_DIRECTORY ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osg ${OSG_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgUtil ${OSGUTIL_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgDB ${OSGDB_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgGA ${OSGGA_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgManipulator ${OSGMANIPULATOR_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgFX ${OSGFX_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgText ${OSGTEXT_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgViewer ${OSGVIEWER_LIBRARY} ${FAKE_INCLUDE_PATH})
-- FAKE_INCLUDE_FROM_FRAMEWORK(osgAnimation ${OSGANIMATION_LIBRARY} ${FAKE_INCLUDE_PATH})
-- INCLUDE_DIRECTORIES(${FAKE_INCLUDE_PATH})
--ENDIF(NOT APPLE)
-+INCLUDE_DIRECTORIES(
-+ ${OSG_INCLUDE_DIR}
-+)
-
-
--FIND_PACKAGE(PythonLibs)
-+SET(PYTHON_INCLUDE_PATH @FRAMEWORKS_DIR@/Python.framework/Versions/2.6/Headers)
-+SET(PYTHON_LIBRARIES @FRAMEWORKS_DIR@/Python.framework/Versions/2.6/Python)
- INCLUDE_DIRECTORIES(
- ${PYTHON_INCLUDE_PATH}
- )
Copied: trunk/dports/devel/osgswig-devel/Portfile (from rev 61842, trunk/dports/devel/osgswig/Portfile)
===================================================================
--- trunk/dports/devel/osgswig-devel/Portfile (rev 0)
+++ trunk/dports/devel/osgswig-devel/Portfile 2009-12-21 23:55:38 UTC (rev 61844)
@@ -0,0 +1,49 @@
+# $Id$
+
+PortSystem 1.0
+PortGroup cmake 1.0
+
+name osgswig-devel
+version 222
+platforms darwin
+categories graphics
+license OpenSceneGraphv0.0/wxWindowsv3/LGPLv2.1
+maintainers nox openmaintainer
+description SWIG based bindings for OpenSceneGraph
+
+long_description \
+ The osgSWIG project utilises SWIG to generate bindings for this C++-based \
+ scene graph for various higher-level languages. Our main target is \
+ currently Python, but others of interest are Java, Ruby, and Lua.
+
+homepage http://code.google.com/p/osgswig/
+fetch.type svn
+svn.url http://osgswig.googlecode.com/svn/trunk/
+svn.tag ${version}
+
+worksrcdir trunk
+
+patchfiles \
+ patch-src-osg.i.diff \
+ patch-src-osgAnimation.i.diff \
+ patch-src-python-CMakeLists.txt.diff
+
+post-patch {
+ reinplace s:@FRAMEWORKS_DIR@:${frameworks_dir}: \
+ ${worksrcpath}/src/python/CMakeLists.txt
+}
+
+depends_lib \
+ path:lib/pkgconfig/openscenegraph.pc:OpenSceneGraph \
+ port:python26 \
+ port:swig \
+ port:swig-python
+
+destroot {
+ set site_packages \
+ ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages
+ xinstall -d ${destroot}${site_packages}
+ copy ${worksrcpath}/lib/python/osgswig-0.9.1 \
+ ${destroot}${site_packages}/OpenSceneGraph
+ touch ${destroot}${site_packages}/OpenSceneGraph/__init__.py
+}
\ No newline at end of file
Property changes on: trunk/dports/devel/osgswig-devel/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Copied: trunk/dports/devel/osgswig-devel/files/patch-src-osg.i.diff (from rev 61842, trunk/dports/devel/osgswig/files/patch-src-osg.i.diff)
===================================================================
--- trunk/dports/devel/osgswig-devel/files/patch-src-osg.i.diff (rev 0)
+++ trunk/dports/devel/osgswig-devel/files/patch-src-osg.i.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -0,0 +1,73 @@
+--- src/osg.i.orig 2009-12-21 18:16:02.000000000 +0100
++++ src/osg.i 2009-12-21 22:01:15.000000000 +0100
+@@ -462,8 +463,12 @@
+ %ignore osg::GraphicsContext::getCurrentOperation;
+
+
++%ignore osg::Texture::getTextureObjectManager;
+ %ignore osg::Texture::getExtensions;
+ %ignore osg::Texture::setExtensions;
++%ignore osg::Texture::s_numberTextureReusedLastInLastFrame;
++%ignore osg::Texture::s_numberNewTextureInLastFrame;
++%ignore osg::Texture::s_numberDeletedTextureInLastFrame;
+
+ %ignore osg::Texture1D::setSubloadCallback;
+ %ignore osg::Texture1D::getSubloadCallback;
+@@ -500,8 +505,11 @@
+ %ignore osg::BlendEquation::setExtensions;
+ %ignore osg::BlendColor::getExtensions;
+ %ignore osg::BlendColor::setExtensions;
+-%ignore osg::BufferObject::getExtensions;
+-%ignore osg::BufferObject::setExtensions;
++
++%ignore osg::GLBufferObject::_extensions;
++%ignore osg::GLBufferObject::Extensions;
++%ignore osg::GLBufferObject::getExtensions;
++%ignore osg::GLBufferObject::setExtensions;
+
+ %ignore osg::Point::Extensions;
+ %ignore osg::Point::getExtensions;
+@@ -679,7 +687,7 @@
+ if (PyString_Check($input)) {
+ int len;
+ char *buf;
+- PyString_AsStringAndSize($input, &buf, &len);
++ PyString_AsStringAndSize($input, &buf, (Py_ssize_t *)&len);
+ $1 = (unsigned char *)malloc(len);
+ memcpy($1, buf, len);
+ } else {
+@@ -733,7 +742,14 @@
+ %extend osg::Viewport { value_type getHeight() {return $self->height();}};
+ %include osg/Viewport
+
++%ignore osg::Shader::Extensions;
++%ignore osg::Shader::getExtensions;
++%ignore osg::Shader::setExtensions;
+ %include osg/Shader
++
++%ignore osg::Program::Extensions;
++%ignore osg::Program::getExtensions;
++%ignore osg::Program::setExtensions;
+ %include osg/Program
+
+ %extend osg::Program {
+@@ -940,6 +956,9 @@
+ %include osg/ArgumentParser
+ %include osg/Array
+
++%ignore osg::PrimitiveSet::Extensions;
++%ignore osg::PrimitiveSet::getExtensions;
++%ignore osg::PrimitiveSet::setExtensions;
+ %include osg/PrimitiveSet
+
+
+@@ -1020,6 +1038,9 @@
+ %ignore osg::Uniform::getUpdateCallback;
+ %ignore osg::Uniform::setEventCallback;
+ %ignore osg::Uniform::getEventCallback;
++%ignore osg::Uniform::Extensions;
++%ignore osg::Uniform::getExtensions;
++%ignore osg::Uniform::setExtensions;
+
+
+ %include osg/Uniform
Copied: trunk/dports/devel/osgswig-devel/files/patch-src-osgAnimation.i.diff (from rev 61842, trunk/dports/devel/osgswig/files/patch-src-osgAnimation.i.diff)
===================================================================
--- trunk/dports/devel/osgswig-devel/files/patch-src-osgAnimation.i.diff (rev 0)
+++ trunk/dports/devel/osgswig-devel/files/patch-src-osgAnimation.i.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -0,0 +1,16 @@
+--- src/osgAnimation.i.orig 2009-12-21 20:28:00.000000000 +0100
++++ src/osgAnimation.i 2009-12-21 20:32:48.000000000 +0100
+@@ -54,6 +54,13 @@
+
+ // ignore nested stuff
+
++%ignore osgAnimation::RigGeometry::getInfluenceMap;
++%ignore osgAnimation::RigGeometry::setInfluenceMap;
++%ignore osgAnimation::RigGeometry::getVertexInfluenceSet;
++%ignore osgAnimation::RigGeometry::setVertexInfluenceSet;
++%ignore osgAnimation::RigGeometry::getRigTransformImplementation;
++%ignore osgAnimation::RigGeometry::setRigTransformImplementation;
++
+ // not sure why this needs ignoring but it generates an undefined symbol if it isn't ignored
+ %ignore osgAnimation::Bone::needLink;
+
Copied: trunk/dports/devel/osgswig-devel/files/patch-src-python-CMakeLists.txt.diff (from rev 61842, trunk/dports/devel/osgswig/files/patch-src-python-CMakeLists.txt.diff)
===================================================================
--- trunk/dports/devel/osgswig-devel/files/patch-src-python-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/devel/osgswig-devel/files/patch-src-python-CMakeLists.txt.diff 2009-12-21 23:55:38 UTC (rev 61844)
@@ -0,0 +1,37 @@
+--- src/python/CMakeLists.txt.orig 2009-12-21 23:05:15.000000000 +0100
++++ src/python/CMakeLists.txt 2009-12-21 23:07:02.000000000 +0100
+@@ -19,29 +19,13 @@
+ EXEC_PROGRAM("ln -s ${FRAME_WORK_ROOT}/Headers ${TARGET_ROOT}/${FRAMEWORK_NAME}" )
+ ENDMACRO(FAKE_INCLUDE_FROM_FRAMEWORK FRAMEWORK_NAME FRAME_WORK_ROOT TARGET_ROOT)
+
+-## additional include directories
+-IF(NOT APPLE)
+- INCLUDE_DIRECTORIES(
+- ${OSG_INCLUDE_DIR}
+- )
+-# dealing with frameworks on Mac OS X
+-ELSE(NOT APPLE)
+- SET(FAKE_INCLUDE_PATH ${CMAKE_BINARY_DIR}/include)
+- FILE(MAKE_DIRECTORY ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osg ${OSG_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgUtil ${OSGUTIL_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgDB ${OSGDB_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgGA ${OSGGA_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgManipulator ${OSGMANIPULATOR_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgFX ${OSGFX_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgText ${OSGTEXT_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgViewer ${OSGVIEWER_LIBRARY} ${FAKE_INCLUDE_PATH})
+- FAKE_INCLUDE_FROM_FRAMEWORK(osgAnimation ${OSGANIMATION_LIBRARY} ${FAKE_INCLUDE_PATH})
+- INCLUDE_DIRECTORIES(${FAKE_INCLUDE_PATH})
+-ENDIF(NOT APPLE)
++INCLUDE_DIRECTORIES(
++ ${OSG_INCLUDE_DIR}
++)
+
+
+-FIND_PACKAGE(PythonLibs)
++SET(PYTHON_INCLUDE_PATH @FRAMEWORKS_DIR@/Python.framework/Versions/2.6/Headers)
++SET(PYTHON_LIBRARIES @FRAMEWORKS_DIR@/Python.framework/Versions/2.6/Python)
+ INCLUDE_DIRECTORIES(
+ ${PYTHON_INCLUDE_PATH}
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091221/d6cdfb4d/attachment-0001.html>
More information about the macports-changes
mailing list