diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-physics/bullet/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-physics/bullet/files')
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-gcc46.patch | 47 | ||||
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-libdir.patch | 24 | ||||
-rw-r--r-- | sci-physics/bullet/files/bullet-2.77-soversion.patch | 36 | ||||
-rw-r--r-- | sci-physics/bullet/files/bullet-2.78-soversion.patch | 44 |
4 files changed, 151 insertions, 0 deletions
diff --git a/sci-physics/bullet/files/bullet-2.77-gcc46.patch b/sci-physics/bullet/files/bullet-2.77-gcc46.patch new file mode 100644 index 000000000000..9ef054836e33 --- /dev/null +++ b/sci-physics/bullet/files/bullet-2.77-gcc46.patch @@ -0,0 +1,47 @@ + src/BulletSoftBody/btSoftBody.h | 3 +++ + src/BulletSoftBody/btSoftBodyInternals.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h +index 4d975b7..f781598 100644 +--- a/src/BulletSoftBody/btSoftBody.h ++++ b/src/BulletSoftBody/btSoftBody.h +@@ -30,6 +30,7 @@ subject to the following restrictions: + class btBroadphaseInterface; + class btDispatcher; + ++class btSoftBodySolver; + + /* btSoftBodyWorldInfo */ + struct btSoftBodyWorldInfo +@@ -52,6 +53,8 @@ class btSoftBody : public btCollisionObject + public: + btAlignedObjectArray<class btCollisionObject*> m_collisionDisabledObjects; + ++ // The solver object that handles this soft body ++ btSoftBodySolver *m_softBodySolver; + // + // Enumerations + // +diff --git a/src/BulletSoftBody/btSoftBodyInternals.h b/src/BulletSoftBody/btSoftBodyInternals.h +index 2cb7744..296d97a 100644 +--- a/src/BulletSoftBody/btSoftBodyInternals.h ++++ b/src/BulletSoftBody/btSoftBodyInternals.h +@@ -26,6 +26,7 @@ subject to the following restrictions: + #include "BulletCollision/CollisionShapes/btConvexInternalShape.h" + #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" + ++#include <string.h> //for memset + // + // btSymMatrix + // +@@ -172,8 +173,7 @@ public: + template <typename T> + static inline void ZeroInitialize(T& value) + { +- static const T zerodummy; +- value=zerodummy; ++ memset(&value,0,sizeof(T)); + } + // + template <typename T> diff --git a/sci-physics/bullet/files/bullet-2.77-libdir.patch b/sci-physics/bullet/files/bullet-2.77-libdir.patch new file mode 100644 index 000000000000..9575addbb58c --- /dev/null +++ b/sci-physics/bullet/files/bullet-2.77-libdir.patch @@ -0,0 +1,24 @@ +diff -up bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt +--- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib 2010-10-08 12:45:59.000000000 +0200 ++++ bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-10-08 12:46:26.000000000 +0200 +@@ -84,7 +84,7 @@ IF (INSTALL_LIBS) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletMultiThreaded DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletMultiThreaded DESTINATION lib) ++ INSTALL(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING + PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) +diff -up bullet-2.77/src/MiniCL/CMakeLists.txt.lib bullet-2.77/src/MiniCL/CMakeLists.txt +--- bullet-2.77/src/MiniCL/CMakeLists.txt.lib 2010-10-08 12:44:50.000000000 +0200 ++++ bullet-2.77/src/MiniCL/CMakeLists.txt 2010-10-08 12:46:42.000000000 +0200 +@@ -32,7 +32,7 @@ IF (INSTALL_LIBS)
+ IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+ INSTALL(TARGETS MiniCL DESTINATION .)
+ ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+- INSTALL(TARGETS MiniCL DESTINATION lib)
++ INSTALL(TARGETS MiniCL DESTINATION lib${LIB_SUFFIX})
+ INSTALL(DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
+ PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
diff --git a/sci-physics/bullet/files/bullet-2.77-soversion.patch b/sci-physics/bullet/files/bullet-2.77-soversion.patch new file mode 100644 index 000000000000..6086640790ac --- /dev/null +++ b/sci-physics/bullet/files/bullet-2.77-soversion.patch @@ -0,0 +1,36 @@ +diff -up bullet-2.77/Extras/glui/CMakeLists.txt.extras-version bullet-2.77/Extras/glui/CMakeLists.txt +--- bullet-2.77/Extras/glui/CMakeLists.txt.extras-version 2010-03-06 16:23:36.000000000 +0100 ++++ bullet-2.77/Extras/glui/CMakeLists.txt 2010-07-26 12:09:01.000000000 +0200 +@@ -61,6 +61,8 @@ arcball.cpp glui_button.cpp glui_fil + + ) + ++SET_TARGET_PROPERTIES(GLUI PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(GLUI PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + ENDIF (BUILD_SHARED_LIBS) +diff -up bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt +--- bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version 2010-07-26 12:10:36.000000000 +0200 ++++ bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2010-07-26 12:10:57.000000000 +0200 +@@ -16,6 +16,8 @@ btBulletFile.cpp + btBulletFile.h + ) + ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) +diff -up bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +--- bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version 2010-07-26 12:11:08.000000000 +0200 ++++ bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2010-07-26 12:11:26.000000000 +0200 +@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp + btBulletWorldImporter.h + ) + ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) diff --git a/sci-physics/bullet/files/bullet-2.78-soversion.patch b/sci-physics/bullet/files/bullet-2.78-soversion.patch new file mode 100644 index 000000000000..b54ffa777ee3 --- /dev/null +++ b/sci-physics/bullet/files/bullet-2.78-soversion.patch @@ -0,0 +1,44 @@ + Extras/Serialize/BulletFileLoader/CMakeLists.txt | 2 ++ + .../Serialize/BulletWorldImporter/CMakeLists.txt | 2 ++ + Extras/glui/CMakeLists.txt | 2 ++ + 3 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +index 486cfdc..f1e0884 100644 +--- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt ++++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +@@ -16,6 +16,8 @@ btBulletFile.cpp + btBulletFile.h + ) + ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) +diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +index e620315..e04e8e9 100644 +--- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ++++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp + btBulletWorldImporter.h + ) + ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) +diff --git a/Extras/glui/CMakeLists.txt b/Extras/glui/CMakeLists.txt +index c2018a7..9a8d90f 100644 +--- a/Extras/glui/CMakeLists.txt ++++ b/Extras/glui/CMakeLists.txt +@@ -61,6 +61,8 @@ arcball.cpp glui_button.cpp glui_filebrowser.cpp glui_node.cpp glui_separ + + ) + ++SET_TARGET_PROPERTIES(GLUI PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(GLUI PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + ENDIF (BUILD_SHARED_LIBS) |