Version Bump, backport fix for gcc46 problems, #363223

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 169 insertions, 10 deletions

diff --git a/sci-physics/bullet/ChangeLog b/sci-physics/bullet/ChangeLog
index 558784bb8e4b..4dc1466d5800 100644
--- a/sci-physics/bullet/ChangeLog
+++ b/sci-physics/bullet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-physics/bullet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/ChangeLog,v 1.22 2011/03/22 17:10:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/ChangeLog,v 1.23 2011/04/17 11:53:52 jlec Exp $
+
+*bullet-2.78 (17 Apr 2011)
+
+  17 Apr 2011; Justin Lecher <jlec@gentoo.org> bullet-2.77.ebuild,
+  +files/bullet-2.77-gcc46.patch, +bullet-2.78.ebuild,
+  +files/bullet-2.78-soversion.patch:
+  Version Bump, backport fix for gcc46 problems, #363223
 
   22 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -bullet-2.76-r1.ebuild,
   bullet-2.77.ebuild, metadata.xml:
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 75f8aedced48..a0b6bad2cdba 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bullet-2.77-gcc46.patch 1478 RMD160 478d251a8f2f0e11765fcba093a98f09c6f5f8bd SHA1 ea6f27dc3dab7c6205411bb06648a1d8ec2b4089 SHA256 f5dc49ec5002c07e6bb683448b299706add3dc21fcefa2e95c32b59a2964ae3d
 AUX bullet-2.77-libdir.patch 1520 RMD160 84e00a82930fd9e42ce13403ff1351e89d9e33ff SHA1 f5c4ef08107be869530fd4ffcce7986987183241 SHA256 a11a211df3da3c144dcd60ff57eefd8f2ba935431f6dddb5e2acd055f5d57fc8
 AUX bullet-2.77-soversion.patch 2087 RMD160 35e74e29bc1f38a1c19eaaa4d658ce0cb059f47a SHA1 6d646dee3f76c30c31659317b9715324eacb0553 SHA256 798777a91d8597d8e9605acabf9c2e32fa36bb7479e7227ba35186ecbdddd6bf
+AUX bullet-2.78-soversion.patch 2032 RMD160 24d7434d10c59290a1099ade609721d270ce251a SHA1 f4027090a7c9489e279ed878a508d56176c4cb77 SHA256 f642efb05bee6098b3f1a0a8a4259bdf71f5529e432c9cd1efd81ef5f52be080
 DIST bullet-2.77.tgz 6444239 RMD160 6fe822bf3150d33f0932fcb880d2d5a836d2cd88 SHA1 ff37c79efd8afd01b14c03154ad1c217e6ad3c09 SHA256 011b110f1d274496b6a340269b48ef1581ca0b4ca4365b28f154c236f4afcbaa
-EBUILD bullet-2.77.ebuild 1172 RMD160 990b78e76929a83c51733d6c895cc63b89f99f2a SHA1 fb1886db4ce24c06bd1ea709fdea80622795c6c0 SHA256 58498a80a2a0404b74f10b719339661d58b02b38b4b49563668594354c0d07c4
-MISC ChangeLog 3665 RMD160 3e2d33c7edfc54e0dff5d3b16e64f13edd26f199 SHA1 1f099b81d57b0a0af5fe494f91c83c0765538687 SHA256 2f4fe3c06cf26096349cbe7d1b0693362a6de28f6df0258bf6d994cc3d818b6e
+DIST bullet-2.78-r2387.tgz 8262266 RMD160 1c5958b2c2b99b956184a914a0c63be8f3dda8d7 SHA1 6a3554900a6a60b964dc0040537b57d09b3bde58 SHA256 bd294cc832c6b6d7a28e42806780b9a09f71f665a15dbf02023345f19d449d33
+EBUILD bullet-2.77.ebuild 1206 RMD160 53fee414f3f6bfb4d09e59df575bfcc374e7e32f SHA1 b6351362eef4b1999709516a2bda100943f6ecc9 SHA256 ad3954827ec4ff2c876aecebcbf1817b83b787cacb77a28aa1b6ff547126902e
+EBUILD bullet-2.78.ebuild 1173 RMD160 066fd669e7e244f3c699aa795a153a3d0d504753 SHA1 f1099ec877af35604b10852b42d8ed6afb4a5954 SHA256 fba8c474d962c58363cd533746aaa6d433b3fef3991036204a2469e59dd5123f
+MISC ChangeLog 3907 RMD160 1aa3e74ebb78d70c72d385999cf752b87987cc18 SHA1 ee2b4ed038138eb1b9c0056024050ca4cbe136f6 SHA256 1377d83ce741656fccd894b9cb70ea7691c9b3e7c6ba4572343ac2ffbdc6434f
 MISC metadata.xml 494 RMD160 38cbf7845c078cdaaba2c0c3de93da84473792b5 SHA1 248370364e38ae7c36aad78ffd4f90dd254d3949 SHA256 2eabcb39015b4d808158d047b19514fd9051dad05e320b00c73cc981c39343b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2I2H8ACgkQ1ycZbhPLE2C/iACfb8upU+n6ipPM5DRjdR4tsJUO
-cY8An0d7+YJHG6or7/K5mPATuVSl4qhh
-=0fn2
+iEYEARECAAYFAk2q1NYACgkQgAnW8HDreRau0ACcDId3sqqbMSJc9j0f2Fea/fNY
+jE0AoMxNreTVbVNHxydh5BXUWKILCa2D
+=l70n
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/bullet/bullet-2.77.ebuild b/sci-physics/bullet/bullet-2.77.ebuild
index 0a5b1a550773..04adc9e298f8 100644
--- a/sci-physics/bullet/bullet-2.77.ebuild
+++ b/sci-physics/bullet/bullet-2.77.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.77.ebuild,v 1.5 2011/03/22 17:10:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.77.ebuild,v 1.6 2011/04/17 11:53:52 jlec Exp $
 
 EAPI=2
+
 inherit eutils cmake-utils
 
 DESCRIPTION="Continuous Collision Detection and Physics Library"
@@ -14,10 +15,15 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="doc double-precision examples extras"
 
-RDEPEND="virtual/opengl
-	media-libs/freeglut"
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl"
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}"-{libdir,soversion}.patch )
+
+PATCHES=(
+	"${FILESDIR}/${P}"-{libdir,soversion}.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	)
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sci-physics/bullet/bullet-2.78.ebuild b/sci-physics/bullet/bullet-2.78.ebuild
new file mode 100644
index 000000000000..c7f369f51558
--- /dev/null
+++ b/sci-physics/bullet/bullet-2.78.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.78.ebuild,v 1.1 2011/04/17 11:53:52 jlec Exp $
+
+EAPI=2
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="http://www.bulletphysics.com/"
+SRC_URI="http://bullet.googlecode.com/files/${P}-r2387.tgz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc double-precision examples extras"
+
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-soversion.patch
+	)
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_CPU_DEMOS=OFF
+		-DBUILD_DEMOS=OFF
+		-DINSTALL_LIBS=ON
+		-DINSTALL_EXTRA_LIBS=ON
+		$(cmake-utils_use_build extras EXTRAS)
+		$(cmake-utils_use_use double-precision DOUBLE_PRECISION)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README ChangeLog AUTHORS
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins *.pdf || die
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r Extras Demos || die
+	fi
+}
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.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)