* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/, sci-physics/vgm/files/
@ 2021-01-20 10:16 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 7a6e4cc929ad66caace9ee9e15dd563a03aca877
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:10 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6e4cc9
sci-physics/vgm: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 -
sci-physics/vgm/files/vgm-fix-FindCLHEP.patch | 64 --------------------
sci-physics/vgm/vgm-4.5.ebuild | 86 ---------------------------
3 files changed, 151 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 6e9c7ee47e1..717f6f9163e 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1 @@
-DIST vgm-4.5.tar.gz 3474063 BLAKE2B 70c4fe0bd5eb9bc94607553ad30ffb625e66ef4e6f8a965b1289c1c7ad6f71d7eba035d2825ba8cd94705a0c223aa56408d3285748b068045eee3a29f556e3b2 SHA512 541fde12e12cc51ba065900788dbceb8e5b9a4e4615a4e4e0bbd2ba199b8a203b6927dbe23ead7bc183bd61f6b641e3e954fe7b78451c2d423d3a2b737f00572
DIST vgm-4.8.tar.gz 3661965 BLAKE2B 29f878fb6716e261c27d60b2c9081d66313591a053d80f78501973f131aff88bbcee743ff9767836883dcb28d3ce5aeee3759a5890d7c8811a6a61503417284f SHA512 8b7cabc5796649c4014ccbdf1c6d209d2e7c2b4b06258716a72cadd997a9f6f51c4f9cb5870fd10abfd1ee133766876523c84441a69c7242bc2002687ca0ce58
diff --git a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch b/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
deleted file mode 100644
index d3bf3d0d4f3..00000000000
--- a/sci-physics/vgm/files/vgm-fix-FindCLHEP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake
---- vgm/cmake/FindCLHEP.cmake 2019-01-25 18:46:25.000000000 +0100
-+++ vgm.patched/cmake/FindCLHEP.cmake 2019-06-29 19:50:18.092076913 +0200
-@@ -4,13 +4,13 @@
- # The configuration file for CMake build for Virtual Geometry Model
- # Copyright (C) 2012, Ivana Hrivnacova
- # All rights reserved.
--#
-+#
- # For the licensing terms see vgm/LICENSE.
- # Contact: ivana@ipno.in2p3.fr
- # ------------------------------------------------------------------------------
-
--# The CMake build for Virtual Geometry Model is a result of a merge
--# of the CMake configuration files kindly provided
-+# The CMake build for Virtual Geometry Model is a result of a merge
-+# of the CMake configuration files kindly provided
- # by Florian Uhlig, GSI and Pere Mato, CERN.
-
- # - Try to find CLHEP
-@@ -36,28 +36,29 @@
- $ENV{CLHEP_BASE_DIR}/include
- )
-
--# CLHEP library external to Geant4
--find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS
-+# CLHEP library external to Geant4
-+find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS
- ${CLHEP_LIB_DIR}
- ${CLHEP_DIR}/lib
- $ENV{CLHEP_BASE_DIR}/lib
- )
--if (EXTERNAL_CLHEP_LIBRARY_DIR)
-- set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR})
-- set(CLHEP_LIBRARY_NAME CLHEP)
--endif()
--
--# CLHEP library within Geant4
--if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
-- find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
-+if (EXTERNAL_CLHEP_LIBRARY)
-+ get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY)
-+ set(CLHEP_LIBRARY_NAME CLHEP)
-+endif()
-+
-+# CLHEP library within Geant4
-+if (NOT EXTERNAL_CLHEP_LIBRARY)
-+ find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS
- ${Geant4_DIR}/..
- ${GEANT4_LIBRARY_DIR}
- )
-- if (CLHEP_LIBRARY_DIR)
-+ if (CLHEP_LIBRARY)
-+ get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY)
- set(CLHEP_LIBRARY_NAME G4clhep)
-- endif(CLHEP_LIBRARY_DIR)
--endif()
--
-+ endif(CLHEP_LIBRARY)
-+endif()
-+
- if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
- set(CLHEP_FOUND TRUE)
- endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild
deleted file mode 100644
index 5020ac5b550..00000000000
--- a/sci-physics/vgm/vgm-4.5.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
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
- MY_PV=$(ver_rs 1- -)
- SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="http://ivana.home.cern.ch/ivana/VGM.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-# sci-physics/root[c++11] required to match sci-physics/geant
-RDEPEND="
- sci-physics/clhep:=
- root? ( >=sci-physics/root-6.14:=[c++11] )
- geant4? ( >=sci-physics/geant-4.10.03 )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
- test? (
- sci-physics/geant[gdml]
- sci-physics/geant-vmc[g4root]
- )"
-RESTRICT="
- !geant4? ( test )
- !root? ( test )
- !test? ( test )"
-
-DOCS=(
- doc/README
- doc/todo.txt
- doc/VGMhistory.txt
- doc/VGM.html
- doc/VGMversions.html
-)
-PATCHES=(
- "${FILESDIR}"/"${PN}-fix-FindCLHEP.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCLHEP_DIR="${EPREFIX}/usr"
- -DWITH_EXAMPLES="$(usex examples)"
- -DINSTALL_EXAMPLES="$(usex examples)"
- -DWITH_GEANT4="$(usex geant4)"
- -DWITH_ROOT="$(usex root)"
- -DWITH_TEST="$(usex test)"
- )
- if use test && use root && use geant4; then
- mycmakeargs+=( -DWITH_G4ROOT=yes )
- else
- mycmakeargs+=( -DWITH_G4ROOT=no )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cd packages
- doxygen || die
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}"/test || die
- ./test_suite.sh || die
-}
-
-src_install() {
- cmake_src_install
- use doc && local HTML_DOCS=( doc/html/. )
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/, sci-physics/vgm/files/
@ 2022-12-18 15:50 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-12-18 15:50 UTC (permalink / raw
To: gentoo-commits
commit: ff22d8cbb8cc7f13fc48588934991eaf8152eb4a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 12:36:42 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 15:49:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff22d8cb
sci-physics/vgm: drop 4.9-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-physics/vgm/Manifest | 1 -
sci-physics/vgm/files/vgm-copy-test-seed.patch | 14 ----
sci-physics/vgm/vgm-4.9-r1.ebuild | 88 --------------------------
3 files changed, 103 deletions(-)
diff --git a/sci-physics/vgm/Manifest b/sci-physics/vgm/Manifest
index 07163b3d4018..4208e434d3ad 100644
--- a/sci-physics/vgm/Manifest
+++ b/sci-physics/vgm/Manifest
@@ -1,2 +1 @@
-DIST vgm-4.9.tar.gz 3881029 BLAKE2B 596a8df12f0dcd813a0d84e8c33eaa92dd2d332d9accf2fc38992f385748a2bd3579fee2af6cc00b878fe5491af4996d80775aa630120507ccc665f102f63b11 SHA512 90845d75a7ff0022f5fba15b7f621efd588251060c0d8e715fcc2e28bb6b4b01ddd83420dbd233cc0dd437ee6b8b5390bb1f84571ed12e696ee8c1dfc4bd8fd9
DIST vgm-5.0.tar.gz 3862583 BLAKE2B 7a1643b329f6f6b019e1b68ce691ed45a32d343925c59451d6e218469606a7a352334d4f1e330873fa1cbc4e1182b4557dc396f52ce7d35e26df81e79121cd60 SHA512 771c2e013c052ea1785fb79ba317b48482428ddf703e263eaf1c9840fbae66dd280d73aee99de30e1c3d70e46a5eb63affc92dfc5ba19298e2d4487b9e302588
diff --git a/sci-physics/vgm/files/vgm-copy-test-seed.patch b/sci-physics/vgm/files/vgm-copy-test-seed.patch
deleted file mode 100644
index 31dcebdccde2..000000000000
--- a/sci-physics/vgm/files/vgm-copy-test-seed.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 395eef0..bcf3a4a 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -76,7 +76,8 @@ set(VGM_TEST_SCRIPTS
- test1_suite.sh
- test2_suite.sh
- test3_suite.sh
-- test_suite.sh)
-+ test_suite.sh
-+ startRun.rdm)
-
- foreach(_script ${VGM_TEST_SCRIPTS})
- configure_file(
diff --git a/sci-physics/vgm/vgm-4.9-r1.ebuild b/sci-physics/vgm/vgm-4.9-r1.ebuild
deleted file mode 100644
index 16ffe2e9ae28..000000000000
--- a/sci-physics/vgm/vgm-4.9-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
-else
- MY_PV=$(ver_rs 1- -)
- SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="Virtual Geometry Model for High Energy Physics Experiments"
-HOMEPAGE="https://github.com/vmc-project/vgm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc examples +geant4 +root test"
-
-RDEPEND="
- sci-physics/clhep:=
- geant4? ( <sci-physics/geant-4.11[c++17] )
- root? ( sci-physics/root:=[c++17] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[dot] )
- test? (
- <sci-physics/geant-4.11[gdml]
- sci-physics/geant4_vmc[g4root]
- )"
-RESTRICT="
- !geant4? ( test )
- !root? ( test )
- !test? ( test )
- !examples? ( test )"
-
-DOCS=(
- doc/README
- doc/todo.txt
- doc/VGMhistory.txt
- doc/VGM.html
- doc/VGMversions.html
-)
-PATCHES=(
- "${FILESDIR}"/"${PN}-copy-test-seed.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCLHEP_DIR="${EPREFIX}/usr"
- -DWITH_EXAMPLES="$(usex examples)"
- -DINSTALL_EXAMPLES="$(usex examples)"
- -DWITH_GEANT4="$(usex geant4)"
- -DWITH_ROOT="$(usex root)"
- -DWITH_TEST="$(usex test)"
- )
- if use test && use root && use geant4; then
- mycmakeargs+=( -DWITH_G4ROOT=yes )
- else
- mycmakeargs+=( -DWITH_G4ROOT=no )
- fi
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cd packages
- doxygen || die
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}"/test || die
- # See upstream issue: https://github.com/vmc-project/vgm/issues/5
- sed -i 's/ ScaledSolids / /' test3_suite.sh || die
- PATH="${BUILD_DIR}"/test:${PATH} ./test_suite.sh || die
-}
-
-src_install() {
- cmake_src_install
- use doc && local HTML_DOCS=( doc/html/. )
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/, sci-physics/vgm/files/
@ 2024-05-31 11:50 Guilherme Amadio
0 siblings, 0 replies; 3+ messages in thread
From: Guilherme Amadio @ 2024-05-31 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 68c5c23d55b751e99870369a13212d390abe4f04
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu May 30 20:41:01 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri May 31 11:47:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c5c23d
sci-physics/vgm: add patch for >=sci-physics/root-6.32.00
ROOT 6.32.00 carries an incompatible API change in TessellatedSolid,
this backports an upstream fix to adapt to the API change.
Closes: https://github.com/gentoo/gentoo/pull/36911
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
.../vgm-5.2-r1-root-6.32-TesselatedSolid.patch | 31 ++++++++++++++++++++++
sci-physics/vgm/vgm-5.2-r1.ebuild | 4 +++
2 files changed, 35 insertions(+)
diff --git a/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch
new file mode 100644
index 000000000000..2c1bfc92a349
--- /dev/null
+++ b/sci-physics/vgm/files/vgm-5.2-r1-root-6.32-TesselatedSolid.patch
@@ -0,0 +1,31 @@
+adapt RootGM::TessellatedSolid for ROOT 6.32.00
+
+Bug: https://github.com/vmc-project/vgm/pull/16
+---
+ packages/RootGM/source/solids/TessellatedSolid.cxx | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- a/packages/RootGM/source/solids/TessellatedSolid.cxx
++++ b/packages/RootGM/source/solids/TessellatedSolid.cxx
+@@ -178,13 +178,16 @@ VGM::ThreeVector RootGM::TessellatedSolid::Vertex(int ifacet, int index) const
+ {
+ CheckVertexIndex(ifacet, index);
+
+- const TGeoFacet& facet = fTessellated->GetFacet(ifacet);
++#if ROOT_VERSION_CODE > ROOT_VERSION(6, 30, 4)
++ const auto& rvertex = fTessellated->GetVertex((fTessellated->GetFacet(ifacet))[index]);
++#else
++ const auto& rvertex = fTessellated->GetFacet(ifacet).GetVertex(index);
++#endif
+
+ VGM::ThreeVector vertex;
+- vertex.push_back(facet.GetVertex(index).fVec[0] * RootGM::Units::Length());
+- vertex.push_back(facet.GetVertex(index).fVec[1] * RootGM::Units::Length());
+- vertex.push_back(facet.GetVertex(index).fVec[2] * RootGM::Units::Length());
++ vertex.push_back(rvertex.fVec[0] * RootGM::Units::Length());
++ vertex.push_back(rvertex.fVec[1] * RootGM::Units::Length());
++ vertex.push_back(rvertex.fVec[2] * RootGM::Units::Length());
+
+ return vertex;
+ }
+-
diff --git a/sci-physics/vgm/vgm-5.2-r1.ebuild b/sci-physics/vgm/vgm-5.2-r1.ebuild
index 6e5f9a755e9c..ff3c18921bb1 100644
--- a/sci-physics/vgm/vgm-5.2-r1.ebuild
+++ b/sci-physics/vgm/vgm-5.2-r1.ebuild
@@ -45,6 +45,10 @@ DOCS=(
doc/VGMhistory.txt
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2-r1-root-6.32-TesselatedSolid.patch
+)
+
src_configure() {
local mycmakeargs=(
-DCLHEP_DIR="${EPREFIX}/usr"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-31 11:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-31 11:50 [gentoo-commits] repo/gentoo:master commit in: sci-physics/vgm/, sci-physics/vgm/files/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2022-12-18 15:50 Andreas Sturmlechner
2021-01-20 10:16 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox