* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2019-12-03 15:42 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2019-12-03 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 4fdeac4cfeef9247f9b9df389659fc519fe907dd
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 15:40:36 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 15:40:50 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4fdeac4c
sci-physics/opticks: depend on sci-physics/opticks-okconf.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 2553f571c..c5fa6efeb 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -25,7 +25,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glfw
media-libs/glew:0
media-libs/glm"
-DEPEND="dev-libs/boost
+DEPEND="sci-physics/opticks-okconf
+ dev-libs/boost
dev-util/bcm
dev-util/plog
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2019-12-03 15:55 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2019-12-03 15:55 UTC (permalink / raw
To: gentoo-commits
commit: e6f4c0f069a9e3c38db9ca8b996ac1fce68ed82b
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 15:55:28 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 15:55:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6f4c0f0
sci-physics/opticks: depend on media-libs/{yocto-gl,imgui}.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index c5fa6efeb..54ed0e2cf 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -24,7 +24,9 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/assimp
media-libs/glfw
media-libs/glew:0
- media-libs/glm"
+ media-libs/glm
+ media-libs/yocto-gl
+ media-libs/imgui"
DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2019-12-05 14:44 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2019-12-05 14:44 UTC (permalink / raw
To: gentoo-commits
commit: 26064f9eeac998ceee6a0b2f794fdc6788725aa3
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 5 14:43:49 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 14:43:49 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=26064f9e
sci-physics/opticks: depend on sci-physics/geant[gdml].
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 54ed0e2cf..33fe5c4f2 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -26,7 +26,8 @@ RDEPEND="dev-util/nvidia-cuda-sdk
media-libs/glew:0
media-libs/glm
media-libs/yocto-gl
- media-libs/imgui"
+ media-libs/imgui
+ sci-physics/geant[gdml]"
DEPEND="sci-physics/opticks-okconf
dev-libs/boost
dev-util/bcm
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2019-12-07 12:01 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2019-12-07 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 594bcf521a43878ca3b7f959341c0596a3784c5f
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 12:01:00 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 12:01:00 2019 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=594bcf52
sci-physics/opticks: do not look for boost cmake.
In Gentoo, boost is built by bjam and no BoostConfig.cmake is
provided.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 33fe5c4f2..ef177964f 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
done
}
-# om-make-one
src_configure() {
local mycmakeargs=(
-DCMAKE_MODULE_PATH="${S}"/cmake/Modules
@@ -96,6 +95,7 @@ src_configure() {
-DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
-DCOMPUTE_CAPABILITY=61
-DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
+ -DBoost_NO_BOOST_CMAKE=ON
--target all
)
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2020-03-16 1:38 Benda XU
0 siblings, 0 replies; 8+ messages in thread
From: Benda XU @ 2020-03-16 1:38 UTC (permalink / raw
To: gentoo-commits
commit: bcd71d86e97d62fd866b0dd42d41d64dfc3ff163
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 01:38:33 2020 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 01:38:33 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=bcd71d86
sci-physics/opticks: correct headers directory.
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ef177964f..3eabc4848 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -86,6 +86,12 @@ src_prepare() {
sed '/OpticksBuildOptions/d' -i ${f}
eend $?
done
+
+ # include/Opticks instead of OpticksCore
+ sed -e 's,include/OpticksCore,include/Opticks,' -i optickscore/OpticksFlags.cc \
+ -i npy/Types.cpp \
+ -i ana/base.py \
+ -i ana/enum.py
}
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2021-01-30 14:49 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-01-30 14:49 UTC (permalink / raw
To: gentoo-commits
commit: f8a6bd0748def334c560e7bb4b2940812c7f55a4
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 14:47:31 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 14:47:31 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a6bd07
sci-physics/opticks: cmake-utils --> cmake
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index 3eabc4848..ce78c4f08 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake-utils cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda flag-o-matic python-any-r1
EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}"
EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
@@ -49,7 +49,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# do not add the default '-O2' that results in nvcc error of
# nvcc fatal : redefinition of argument 'optimize'
@@ -104,5 +104,5 @@ src_configure() {
-DBoost_NO_BOOST_CMAKE=ON
--target all
)
- cmake-utils_src_configure
+ cmake_src_configure
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2021-12-16 10:57 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2021-12-16 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 1b0be9fca4a8f0a79bf2000b3bb5dd5fef76e7ba
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 10:55:15 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 10:55:15 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0be9fc
sci-physics/opticks: drop UnusedInherits
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-physics/opticks/opticks-0.0.1_p20191110.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
index ce78c4f08..d89bf2a82 100644
--- a/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
+++ b/sci-physics/opticks/opticks-0.0.1_p20191110.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit mercurial cmake cuda flag-o-matic python-any-r1
+inherit mercurial cmake cuda python-any-r1
EHG_REPO_URI="https://bitbucket.org/simoncblyth/${PN}"
EHG_REVISION="a580e704afe9d2c138072835e986542c835c29fc"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/
@ 2022-01-23 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2022-01-23 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 62aa262b721a1fd4059bd652e5e86a44de6d8e86
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 12:48:47 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 12:48:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=62aa262b
sci-physics/opticks: remove package (2)
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-physics/opticks/opticks-0.1.6.ebuild | 106 -------------------------------
1 file changed, 106 deletions(-)
diff --git a/sci-physics/opticks/opticks-0.1.6.ebuild b/sci-physics/opticks/opticks-0.1.6.ebuild
deleted file mode 100644
index bb2abc665..000000000
--- a/sci-physics/opticks/opticks-0.1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake cuda python-any-r1
-
-DESCRIPTION="GPU Optical Photon Simulation for Particle Physics"
-HOMEPAGE="https://simoncblyth.bitbucket.io"
-SRC_URI="https://bitbucket.org/simoncblyth/opticks/get/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/simoncblyth-${PN}-b75b5929b6cf"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-util/nvidia-cuda-toolkit
- dev-libs/optix
- media-libs/assimp
- media-libs/glfw
- media-libs/glew:0
- media-libs/glm
- media-libs/imgui
- sci-physics/geant[gdml]
-"
-DEPEND="
- dev-libs/boost:=
- dev-util/bcm
- dev-util/plog
- ${PYTHON_DEPS}
- ${RDEPEND}
-"
-# PATCHES=(
-# "${FILESDIR}"/opticks-0.0.1_split-cmake.patch
-# "${FILESDIR}"/opticks-0.0.1_okconf.patch
-# "${FILESDIR}"/opticks-0.0.1_cuda-helper.patch
-# "${FILESDIR}"/opticks-0.0.1_extG4-CLHEP.patch
-# "${FILESDIR}"/opticks-0.0.1_python-helper.patch
-# )
-# CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindBoost"
-
-pkg_setup() {
- # opticks combined build is not parallel.
- #export MAKEOPTS="-j1"
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # do not add the default '-O2' that results in nvcc error of
- # nvcc fatal : redefinition of argument 'optimize'
- export NVCCFLAGS=
- cuda_src_prepare
-
- # do not install the tests
- for f in $(find -path '*/tests/CMakeLists.txt'); do
- ebegin "Removing installation phrase from ${f}"
- sed '/install(TARGETS/d' -i ${f} || die
- eend $?
- done
- # do not install test scripts
- ebegin "Removing test scripts installation from optixrap/{,tests/}CMakeLists.txt"
- sed -e '/install(PROGRAMS/d' \
- -e '/installcache/d' \
- -i optixrap/CMakeLists.txt \
- -i optixrap/tests/CMakeLists.txt || die
- eend $?
- ebegin "Removing test scripts installation from ggeo/tests/CMakeLists.txt"
- sed -e '/install(FILES/,/)/d' -i ggeo/tests/CMakeLists.txt || die
- eend $?
- ebegin "Moving glsl into share in oglrap/CMakeLists.txt"
- sed -e "s,gl),share/${PN}/gl)," -i oglrap/CMakeLists.txt || die
- eend $?
-
- ebegin "Removing python bindings from sysrap/CMakeLists.txt"
- sed -e "/py\/opticks\/sysrap/d" -i sysrap/CMakeLists.txt || die
- eend $?
-
- # integrated build OpticksBuildOptions is included at the top
- for f in */CMakeLists.txt; do
- ebegin "Removing OpticksBuildOptions include from ${f}"
- sed '/OpticksBuildOptions/d' -i ${f} || die
- eend $?
- done
-
- # include/Opticks instead of OpticksCore
- sed -e 's,include/OpticksCore,include/Opticks,' -i optickscore/OpticksFlags.cc \
- -i npy/Types.cpp \
- -i ana/base.py || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_MODULE_PATH="${S}"/cmake/Modules
- -DOptiX_INSTALL_DIR="${EPREFIX}/opt/optix"
- -DCUDA_SDK_ROOT_DIR="${EPREFIX}/opt/cuda/sdk"
- -DCOMPUTE_CAPABILITY=61
- -DCUDA_NVCC_FLAGS="${NVCCFLAGS}"
- -DBoost_NO_BOOST_CMAKE=ON
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-01-23 13:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-03 15:55 [gentoo-commits] proj/sci:master commit in: sci-physics/opticks/ Benda XU
-- strict thread matches above, loose matches on Subject: below --
2022-01-23 13:02 Andrew Ammerlaan
2021-12-16 10:57 Andrew Ammerlaan
2021-01-30 14:49 Andrew Ammerlaan
2020-03-16 1:38 Benda XU
2019-12-07 12:01 Benda XU
2019-12-05 14:44 Benda XU
2019-12-03 15:42 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox