* [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/
@ 2020-08-23 13:10 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-08-23 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 8ed83f1faba38e8fdaa3b8261bbba964c7a5c336
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Sun Aug 23 13:10:35 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 13:10:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed83f1f
sci-physics/bullet: migrate to EAPI 7
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Closes: https://github.com/gentoo/gentoo/pull/17226
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/bullet/bullet-2.86.ebuild | 29 ++++++++++------------
.../bullet/files/bullet-2.85-soversion.patch | 25 ++++++-------------
2 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
index b0238f5c9d4..f983c772bb6 100644
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ b/sci-physics/bullet/bullet-2.86.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Continuous Collision Detection and Physics Library"
HOMEPAGE="http://www.bulletphysics.com/"
@@ -17,10 +17,8 @@ IUSE="+bullet3 doc double-precision examples extras test"
RDEPEND="
virtual/opengl
media-libs/freeglut"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
@@ -32,7 +30,7 @@ RESTRICT="test"
S="${WORKDIR}/${PN}3-${PV}"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# allow to generate docs
sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
@@ -40,7 +38,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
-DBUILD_CPU_DEMOS=OFF
-DBUILD_OPENGL3_DEMOS=OFF
-DBUILD_BULLET2_DEMOS=OFF
@@ -52,21 +49,21 @@ src_configure() {
-DUSE_DOUBLE_PRECISION=$(usex double-precision)
-DBUILD_UNIT_TESTS=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
if use doc; then
doxygen || die
HTML_DOCS+=( html/. )
DOCS+=( docs/*.pdf )
fi
-}
-src_install() {
- cmake-utils_src_install
- use examples && DOCS+=( examples )
- einstalldocs
+ if use examples; then
+ # throws QA warnings
+ rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
+ DOCS+=( examples )
+ fi
}
diff --git a/sci-physics/bullet/files/bullet-2.85-soversion.patch b/sci-physics/bullet/files/bullet-2.85-soversion.patch
index 74cfe4e8f8a..342569355d8 100644
--- a/sci-physics/bullet/files/bullet-2.85-soversion.patch
+++ b/sci-physics/bullet/files/bullet-2.85-soversion.patch
@@ -1,31 +1,22 @@
- 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
- )
+@@ -20,6 +20,8 @@
+
+ ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
+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)
+ 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
- )
+@@ -14,6 +14,8 @@
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
+ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
+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)
+ TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
ENDIF (BUILD_SHARED_LIBS)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/
@ 2021-01-20 10:16 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 762b3c6697feae7c846a9636e7af82be9e59aafa
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762b3c66
sci-physics/bullet: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/bullet/Manifest | 3 -
sci-physics/bullet/bullet-2.86.ebuild | 69 -----------------
sci-physics/bullet/bullet-2.89.ebuild | 90 ----------------------
sci-physics/bullet/bullet-3.05.ebuild | 86 ---------------------
.../files/bullet-2.89-no-dangling-pointer.patch | 26 -------
sci-physics/bullet/metadata.xml | 2 -
6 files changed, 276 deletions(-)
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 89ee08092cf..a5d77918fa0 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1 @@
-DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
-DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
-DIST bullet-3.05.tar.gz 142858358 BLAKE2B d7ef2e68c0740e5bd2a728c576bcd3f07fff3680d8f604d7fd89bb6d7eb8c38f6205aea3bae300d70c2ec4e362c14e0567e3af3aabc893f8e33d979ffe8b3521 SHA512 4cb67547b466e01f6c2258b1f350fdfac0f2dc73a7962b6e196491e6722e1cd22cdfe80d7b2f4e1e92a90f91e277bff5cabfd0f55ef55010f9a4d7286843cecd
DIST bullet-3.07.tar.gz 148413637 BLAKE2B 776cd7651d11d865095ea000d353860bea09c6ff4ec8dd8e43282a78373e2830f6ce1ce2b87ed25a67be7bded297b3a6320b2872a71dfd3849e7b197c6d2c936 SHA512 31fc7cb4ed8b939abc9eeb0a8f6fff3a454ea4ebcffd797fd35a2320fe3ab222fcd315569809ea148d0efff47267f5eec9f4bf7aaf07730a06aa9babd2abc9a6
diff --git a/sci-physics/bullet/bullet-2.86.ebuild b/sci-physics/bullet/bullet-2.86.ebuild
deleted file mode 100644
index f983c772bb6..00000000000
--- a/sci-physics/bullet/bullet-2.86.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras test"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
-
-DOCS=( AUTHORS.txt LICENSE.txt README.md )
-
-# Building / linking of third Party library BussIK does not work out of the box
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_prepare() {
- cmake_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DINSTALL_EXTRA_LIBS=ON
- -DBUILD_BULLET3=$(usex bullet3)
- -DBUILD_EXTRAS=$(usex extras)
- -DUSE_DOUBLE_PRECISION=$(usex double-precision)
- -DBUILD_UNIT_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- doxygen || die
- HTML_DOCS+=( html/. )
- DOCS+=( docs/*.pdf )
- fi
-
- if use examples; then
- # throws QA warnings
- rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
- DOCS+=( examples )
- fi
-}
diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild
deleted file mode 100644
index 93b7355b91d..00000000000
--- a/sci-physics/bullet/bullet-2.89.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads"
-
-REQUIRED_USE="
- openmp? ( threads )
- tbb? ( threads )
-"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut
- tbb? ( dev-cpp/tbb )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.85-soversion.patch
- "${FILESDIR}"/${PN}-2.89-no-dangling-pointer.patch
-)
-
-DOCS=( AUTHORS.txt LICENSE.txt README.md )
-
-# Building / linking of third Party library BussIK does not work out of the box
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DINSTALL_EXTRA_LIBS=ON
- -DBUILD_BULLET3=$(usex bullet3)
- -DBUILD_EXTRAS=$(usex extras)
- -DUSE_DOUBLE_PRECISION=$(usex double-precision)
- -DBUILD_UNIT_TESTS=$(usex test)
- -DBULLET2_MULTITHREADING=$(usex threads)
- -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
- -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- doxygen || die
- HTML_DOCS+=( html/. )
- DOCS+=( docs/*.pdf )
- fi
-
- if use examples; then
- # throws QA warnings
- rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
- DOCS+=( examples )
- fi
-}
diff --git a/sci-physics/bullet/bullet-3.05.ebuild b/sci-physics/bullet/bullet-3.05.ebuild
deleted file mode 100644
index 0ba0a2d387c..00000000000
--- a/sci-physics/bullet/bullet-3.05.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="https://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc double-precision examples openmp tbb test threads"
-
-REQUIRED_USE="
- openmp? ( threads )
- tbb? ( threads )
-"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut
- tbb? ( dev-cpp/tbb )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
-
-DOCS=( AUTHORS.txt LICENSE.txt README.md )
-
-# Building / linking of third Party library BussIK does not work out of the box
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DBUILD_BULLET3=ON
- -DBUILD_EXTRAS=OFF
- -DUSE_DOUBLE_PRECISION=$(usex double-precision)
- -DBUILD_UNIT_TESTS=$(usex test)
- -DBULLET2_MULTITHREADING=$(usex threads)
- -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
- -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- doxygen || die
- HTML_DOCS+=( html/. )
- DOCS+=( docs/*.pdf )
- fi
-
- if use examples; then
- # throws QA warnings
- rm examples/ThirdPartyLibs/openvr/*/linux*/libopenvr_api.so || die
- DOCS+=( examples )
- fi
-}
diff --git a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
deleted file mode 100644
index 8eee0016ae2..00000000000
--- a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1c64add35ed4918222ceb4fe93b7bef0e2b4e41c Mon Sep 17 00:00:00 2001
-From: stolk <b.stolk@gmail.com>
-Date: Wed, 1 Apr 2020 10:59:16 -0700
-Subject: [PATCH] Do not return a dangling pointer!
-
-Signed-off-by: Ross Charles Campbell <rossbridger.cc@gmail.com>
----
- Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp
-index b33080964..53b5784df 100644
---- a/Extras/ConvexDecomposition/cd_wavefront.cpp
-+++ b/Extras/ConvexDecomposition/cd_wavefront.cpp
-@@ -437,7 +437,7 @@ const char **InPlaceParser::GetArglist(char *line, int &count) // convert sourc
- {
- const char **ret = 0;
-
-- const char *argv[MAXARGS];
-+ static const char *argv[MAXARGS];
- int argc = 0;
-
- char *foo = line;
---
-2.28.0
-
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 3eb822b267c..f7e1c944a87 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -19,9 +19,7 @@
for games and animation.
</longdescription>
<use>
- <flag restrict="<=sci-physics/bullet-2.89" name="bullet3">Build Bullet 3</flag>
<flag restrict="<=sci-physics/bullet-2.89" name="double-precision">Build libraries in double precision</flag>
- <flag restrict="<=sci-physics/bullet-2.89" name="extras">Build additional libraries</flag>
<flag restrict="=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/
@ 2020-09-16 14:28 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-09-16 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 0835ccb1949dd9931fd761dd521bc56cf513233b
Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 16:52:40 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 14:28:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0835ccb1
sci-physics/bullet: version bump to 2.89
Closes: https://github.com/gentoo/gentoo/pull/17235
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/bullet/Manifest | 1 +
sci-physics/bullet/bullet-2.89.ebuild | 90 ++++++++++++++++++++++
.../files/bullet-2.89-no-dangling-pointer.patch | 26 +++++++
sci-physics/bullet/metadata.xml | 1 +
4 files changed, 118 insertions(+)
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index e83d7e958cb..56f16cbaf73 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1 +1,2 @@
DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
+DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild
new file mode 100644
index 00000000000..24626f66775
--- /dev/null
+++ b/sci-physics/bullet/bullet-2.89.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Continuous Collision Detection and Physics Library"
+HOMEPAGE="http://www.bulletphysics.com/"
+SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads"
+
+REQUIRED_USE="
+ openmp? ( threads )
+ tbb? ( threads )
+"
+
+RDEPEND="
+ virtual/opengl
+ media-libs/freeglut
+ tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.85-soversion.patch
+ "${FILESDIR}"/${PN}-2.89-no-dangling-pointer.patch
+)
+
+DOCS=( AUTHORS.txt LICENSE.txt README.md )
+
+# Building / linking of third Party library BussIK does not work out of the box
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # allow to generate docs
+ sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CPU_DEMOS=OFF
+ -DBUILD_OPENGL3_DEMOS=OFF
+ -DBUILD_BULLET2_DEMOS=OFF
+ -DUSE_GRAPHICAL_BENCHMARK=OFF
+ -DINSTALL_LIBS=ON
+ -DINSTALL_EXTRA_LIBS=ON
+ -DBUILD_BULLET3=$(usex bullet3)
+ -DBUILD_EXTRAS=$(usex extras)
+ -DUSE_DOUBLE_PRECISION=$(usex double-precision)
+ -DBUILD_UNIT_TESTS=$(usex test)
+ -DBULLET2_MULTITHREADING=$(usex threads)
+ -DBULLET2_USE_OPEN_MP_MULTITHREADING=$(usex openmp)
+ -DBULLET2_USE_TBB_MULTITHREADING=$(usex tbb)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ doxygen || die
+ HTML_DOCS+=( html/. )
+ DOCS+=( docs/*.pdf )
+ fi
+
+ if use examples; then
+ # throws QA warnings
+ rm examples/ThirdPartyLibs/openvr/*/linux64/libopenvr_api.so || die
+ DOCS+=( examples )
+ fi
+}
diff --git a/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
new file mode 100644
index 00000000000..8eee0016ae2
--- /dev/null
+++ b/sci-physics/bullet/files/bullet-2.89-no-dangling-pointer.patch
@@ -0,0 +1,26 @@
+From 1c64add35ed4918222ceb4fe93b7bef0e2b4e41c Mon Sep 17 00:00:00 2001
+From: stolk <b.stolk@gmail.com>
+Date: Wed, 1 Apr 2020 10:59:16 -0700
+Subject: [PATCH] Do not return a dangling pointer!
+
+Signed-off-by: Ross Charles Campbell <rossbridger.cc@gmail.com>
+---
+ Extras/ConvexDecomposition/cd_wavefront.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Extras/ConvexDecomposition/cd_wavefront.cpp b/Extras/ConvexDecomposition/cd_wavefront.cpp
+index b33080964..53b5784df 100644
+--- a/Extras/ConvexDecomposition/cd_wavefront.cpp
++++ b/Extras/ConvexDecomposition/cd_wavefront.cpp
+@@ -437,7 +437,7 @@ const char **InPlaceParser::GetArglist(char *line, int &count) // convert sourc
+ {
+ const char **ret = 0;
+
+- const char *argv[MAXARGS];
++ static const char *argv[MAXARGS];
+ int argc = 0;
+
+ char *foo = line;
+--
+2.28.0
+
diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml
index 3304e14d402..8dc1b6e634b 100644
--- a/sci-physics/bullet/metadata.xml
+++ b/sci-physics/bullet/metadata.xml
@@ -22,6 +22,7 @@
<flag name="bullet3">Build Bullet 3</flag>
<flag name="double-precision">Build libraries in double precision</flag>
<flag name="extras">Build additional libraries</flag>
+ <flag restrict=">=sci-physics/bullet-2.89" name="tbb">Enable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
</use>
<upstream>
<remote-id type="google-code">bullet</remote-id>
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/
@ 2018-06-12 16:29 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-06-12 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 174c77ef60d6bd9315b4f9fda414d225a72bb65a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 16:15:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 16:29:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=174c77ef
sci-physics/bullet: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-physics/bullet/Manifest | 3 -
sci-physics/bullet/bullet-2.83.4.ebuild | 64 -------------------
sci-physics/bullet/bullet-2.83.5.ebuild | 64 -------------------
sci-physics/bullet/bullet-2.85.ebuild | 73 ----------------------
.../bullet/files/bullet-2.78-soversion.patch | 44 -------------
5 files changed, 248 deletions(-)
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index 6772b90ffea..e83d7e958cb 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1 @@
-DIST bullet-2.83.4.tar.gz 17529283 BLAKE2B 0666bbcea656d1033bfe10b3acf9dc7692512510595e7e525c192c58e565c146246b9089cec863f161e6968a1d3ceeb4a9d390856feb746d78efdcd256a06324 SHA512 1a10a11671bd152835a45d44a1b3214e29c255338405705f2aaa41adfbdb545ec02f09b94003b836fafcc2b59b836e5b749696a5bb3489ec7050af0d02d9b2e1
-DIST bullet-2.83.5.tar.gz 17759627 BLAKE2B e461c2fc266b97d84908fba7bc49a3d6ecb64b951162d4029fddfb0b27a83d56b65313d2078a099ffed6eda113aee27fcd738d38b3495ccf4aa4274c2a229bd6 SHA512 9e1ca7b3afb700bfafc2d39d8ec8b004b5bae7788385e763c15a63a7754c50bfd79e1a6ab501569b613eb5a9c132688c747aa70db0b80099cfe40b6146c32290
-DIST bullet-2.85.tar.gz 24020355 BLAKE2B 658970bf33b78e27733ec5862a94bbe8873da7794b1f95ddbcbc3a9094d0c9de1bf5c212194a487938ed7448dc22d5cee1fb0306b0efdb204a016807cec0e8f2 SHA512 f13abb85864202161d1c19596e290735848a7de53ffe09aa8f656d80a523f6382c0f7864a104ee8c437cf88e0f593c4682ecbb87d74adfe1cc868c1a36d3ecea
DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
diff --git a/sci-physics/bullet/bullet-2.83.4.ebuild b/sci-physics/bullet/bullet-2.83.4.ebuild
deleted file mode 100644
index 9eefee74682..00000000000
--- a/sci-physics/bullet/bullet-2.83.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.78-soversion.patch )
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DINSTALL_EXTRA_LIBS=ON
- $(cmake-utils_use_build bullet3 BULLET3)
- $(cmake-utils_use_build extras EXTRAS)
- $(cmake-utils_use_use double-precision DOUBLE_PRECISION)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc docs/*.pdf && dohtml -r html/*
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r Extras examples
- fi
-}
diff --git a/sci-physics/bullet/bullet-2.83.5.ebuild b/sci-physics/bullet/bullet-2.83.5.ebuild
deleted file mode 100644
index 4f4153fd1cc..00000000000
--- a/sci-physics/bullet/bullet-2.83.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.78-soversion.patch )
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DINSTALL_EXTRA_LIBS=ON
- $(cmake-utils_use_build bullet3 BULLET3)
- $(cmake-utils_use_build extras EXTRAS)
- $(cmake-utils_use_use double-precision DOUBLE_PRECISION)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc docs/*.pdf && dohtml -r html/*
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r Extras examples
- fi
-}
diff --git a/sci-physics/bullet/bullet-2.85.ebuild b/sci-physics/bullet/bullet-2.85.ebuild
deleted file mode 100644
index 724386f2a95..00000000000
--- a/sci-physics/bullet/bullet-2.85.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bullet3 doc double-precision examples extras test"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.85-soversion.patch )
-
-DOCS=( AUTHORS.txt LICENSE.txt README.md )
-
-# Building / linking of third Party library BussIK does not work out of the box
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_OPENGL3_DEMOS=OFF
- -DBUILD_BULLET2_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=OFF
- -DINSTALL_LIBS=ON
- -DINSTALL_EXTRA_LIBS=ON
- -DBUILD_BULLET3=$(usex bullet3)
- -DBUILD_EXTRAS=$(usex extras)
- -DUSE_DOUBLE_PRECISION=$(usex double-precision)
- -DBUILD_UNIT_TESTS=$(usex test)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- doxygen || die
- HTML_DOCS+=( html/. )
- DOCS+=( docs/*.pdf )
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/sci-physics/bullet/files/bullet-2.78-soversion.patch b/sci-physics/bullet/files/bullet-2.78-soversion.patch
deleted file mode 100644
index b54ffa777ee..00000000000
--- a/sci-physics/bullet/files/bullet-2.78-soversion.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- 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)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/
@ 2016-01-12 1:18 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2016-01-12 1:18 UTC (permalink / raw
To: gentoo-commits
commit: e6357366d1bd57078834f36208940a489890d904
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 01:17:27 2016 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 01:17:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6357366
sci-physics/bullet: drop old versions and patches
Package-Manager: portage-2.2.26
sci-physics/bullet/Manifest | 2 -
sci-physics/bullet/bullet-2.81.ebuild | 64 ----------------------
sci-physics/bullet/bullet-2.82.ebuild | 64 ----------------------
sci-physics/bullet/files/bullet-2.77-gcc46.patch | 47 ----------------
sci-physics/bullet/files/bullet-2.77-libdir.patch | 24 --------
.../bullet/files/bullet-2.77-soversion.patch | 36 ------------
6 files changed, 237 deletions(-)
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index d674f78..424ca80 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -1,4 +1,2 @@
-DIST bullet-2.81-rev2613.tgz 8297547 SHA256 8ac9079803a6f793801727ccddb0b98becea3efe92fd6590cf38b9cb8bbc1eed SHA512 5f77d4ea123bca06a390e27f5028d67b1f328c65d16711448cca885bc66de37bdef3024397603140e28e8fe68679cc596aa9a4ee617fc2a913f23d4c5c0f52a3 WHIRLPOOL 91894b76cb3cd4239f91305860cf78152c323df05c4b1d77bb8564cd2badb8a7e811f8dcf7e10f9b04db5345787b3c2cb0163d0ef9c77aa716e69307a235873a
-DIST bullet-2.82-r2704.tgz 7937108 SHA256 67e4c9eb76f7adf99501d726d8ad5e9b525dfd0843fbce9ca73aaca4ba9eced2 SHA512 44bec0bd74e6d9cd8c75a41d0faa068dc05f0cdad92ff001cc53ff29912db245606827a9e763ce2cf1b551b545668a779fdc4455f73c1901b57aaa4eee31901f WHIRLPOOL 181c6bf35ba28333f66fba52faff2e7bfc634a702df4c9925123160d89058602e354e9c21a82c86fc166fab55254a70739e37220d28968a989ed94a52a6f7e39
DIST bullet-2.83.4.tar.gz 17529283 SHA256 2cf287cead9a116c56f6d6f15f73dc8b3ed1fe407ef2ca894027d585fab07341 SHA512 1a10a11671bd152835a45d44a1b3214e29c255338405705f2aaa41adfbdb545ec02f09b94003b836fafcc2b59b836e5b749696a5bb3489ec7050af0d02d9b2e1 WHIRLPOOL 7a472291128888fdd1c96e232b91d734ff10c2b6cf6ff0563bd3e6fa4c113112fe3f169dc0e42fee56aacf66b6717a10901f0c61c618a6c691bf1eb3cbcefbf2
DIST bullet-2.83.5.tar.gz 17759627 SHA256 df6d58898d3d3bf117854dd64467dbd09625e048624c797649b46bf1c595b152 SHA512 9e1ca7b3afb700bfafc2d39d8ec8b004b5bae7788385e763c15a63a7754c50bfd79e1a6ab501569b613eb5a9c132688c747aa70db0b80099cfe40b6146c32290 WHIRLPOOL 6c304902dd6bc9e800befe5c214adcec48e068e6db288ddf211ce17af74abd8ebc44a34ee1349a17bd22e1f9c316782d7680bb55566b4100b2f788377921be29
diff --git a/sci-physics/bullet/bullet-2.81.ebuild b/sci-physics/bullet/bullet-2.81.ebuild
deleted file mode 100644
index a708eb4..0000000
--- a/sci-physics/bullet/bullet-2.81.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-# version release, check https://code.google.com/p/bullet/downloads/list
-MYP=${P}-rev2613
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://bullet.googlecode.com/files/${MYP}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc double-precision examples extras"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.78-soversion.patch )
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=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_compile() {
- cmake-utils_src_compile
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc *.pdf && dohtml -r html/*
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r Extras Demos
- fi
-}
diff --git a/sci-physics/bullet/bullet-2.82.ebuild b/sci-physics/bullet/bullet-2.82.ebuild
deleted file mode 100644
index dd3acde..0000000
--- a/sci-physics/bullet/bullet-2.82.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-# version release, check https://code.google.com/p/bullet/downloads/list
-MYP=${P}-r2704
-
-DESCRIPTION="Continuous Collision Detection and Physics Library"
-HOMEPAGE="http://www.bulletphysics.com/"
-SRC_URI="https://bullet.googlecode.com/files/${MYP}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc double-precision examples extras"
-
-RDEPEND="
- virtual/opengl
- media-libs/freeglut"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.78-soversion.patch )
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
- # allow to generate docs
- sed -i -e 's/GENERATE_HTMLHELP.*//g' Doxyfile || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_CPU_DEMOS=OFF
- -DBUILD_DEMOS=OFF
- -DUSE_GRAPHICAL_BENCHMARK=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_compile() {
- cmake-utils_src_compile
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc *.pdf && dohtml -r html/*
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r Extras Demos
- fi
-}
diff --git a/sci-physics/bullet/files/bullet-2.77-gcc46.patch b/sci-physics/bullet/files/bullet-2.77-gcc46.patch
deleted file mode 100644
index 9ef0548..0000000
--- a/sci-physics/bullet/files/bullet-2.77-gcc46.patch
+++ /dev/null
@@ -1,47 +0,0 @@
- 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
deleted file mode 100644
index 9575add..0000000
--- a/sci-physics/bullet/files/bullet-2.77-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6086640..0000000
--- a/sci-physics/bullet/files/bullet-2.77-soversion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-20 10:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-23 13:10 [gentoo-commits] repo/gentoo:master commit in: sci-physics/bullet/files/, sci-physics/bullet/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-20 10:16 David Seifert
2020-09-16 14:28 David Seifert
2018-06-12 16:29 Andreas Sturmlechner
2016-01-12 1:18 Guilherme Amadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox