mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
media-gfx/netgen: drop 6.2.2406-r1, 6.2.2501-r1
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1856 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -1,4 +1,2 @@
|
||||
DIST netgen-6.2.2406.tar.gz 3452436 BLAKE2B 4cb42f20e7627a98e54a9f2e6da5d1b4af174fa7e33c6f72a731b4879c3e4324b20016f1980d2ceb50976fedc2b001a0824e2edd03b03c434c49baa947ded126 SHA512 262e57dca39519c797ea58b32eb886d523926aa48979b31df0c61839f9db09eea76346d3519742b7173a78a80335c16960860772646edd20f365dab1e1a6bed8
|
||||
DIST netgen-6.2.2501.tar.gz 3328069 BLAKE2B 68387ffdf3ff4025b8b68377aa5744077a5ab4718e1a9213bd2103e58dce8750355ad7031b8cc533345fa84bfa4b1c96f30f9e1efb977141d97a35f40dbf57a8 SHA512 7a39b8bc17216a69239e1f3774793f65e8ac3b1837b0859a730bba8967a4791a76ea5041a94e7de1e1e42f8d12b8ab59dfa06eadcf048f3c99dce57b360faa45
|
||||
DIST netgen-6.2.2505.tar.gz 3332150 BLAKE2B 9f8baa8423c34ee68c2cb77da1918a38c23a34dd61059f912d0bfb832ea9778d3dfa206ac35d39e8bdaad415be40682c4f1b7313c4f1b7ed0b4670a9568bf2b3 SHA512 f5274f8b1642109fa79926ce1c761f7d312ed86fc35624884917b7e39937bf8501e40238c7e9a3c7fc6324bfdaa27910c59a927c954d49e8dfc62618704f857f
|
||||
DIST netgen-6.2.2604.tar.gz 3308713 BLAKE2B 11643cf7d784b45a59e2a6e26dc95f2391140f58a140a2254e6d21fe7a711b8801e40d53b57a6c70cf188f7167ef431b237793e5d75f3c9c3c831d84aba6e0ca SHA512 2ddc416c235ba42c576e3b019d0a2ee49b0728fe56a1e57b0d230dab0abcd466bf11b0ac290cf449442b46749055978477018003f743700ae54b9f32a8094ca3
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 49507f7708d72b25fd5e350f7f6b30aa80a50cb4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
Date: Thu, 6 Jun 2024 15:40:10 +0200
|
||||
Subject: [PATCH] find libjpeg-turbo library
|
||||
|
||||
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
---
|
||||
nglib/CMakeLists.txt | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/nglib/CMakeLists.txt b/nglib/CMakeLists.txt
|
||||
index b1036ea..78340b6 100644
|
||||
--- a/nglib/CMakeLists.txt
|
||||
+++ b/nglib/CMakeLists.txt
|
||||
@@ -13,6 +13,11 @@ if(EMSCRIPTEN)
|
||||
target_link_libraries(nglib PRIVATE ${ZLIB_LIBRARIES} $<BUILD_INTERFACE:$<TARGET_PROPERTY:occ_libs,INTERFACE_LINK_LIBRARIES>>)
|
||||
else(EMSCRIPTEN)
|
||||
target_link_libraries(nglib PUBLIC ngcore)
|
||||
+ if(TARGET JPEG::JPEG)
|
||||
+ get_target_property(JPEG_LIBRARIES JPEG::JPEG IMPORTED_LOCATION_RELEASE)
|
||||
+ else()
|
||||
+ set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE})
|
||||
+ endif()
|
||||
target_link_libraries( nglib PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} occ_libs netgen_cgns )
|
||||
endif(EMSCRIPTEN)
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{12..13} )
|
||||
inherit cmake desktop flag-o-matic python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Automatic 3d tetrahedral mesh generator"
|
||||
HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
|
||||
SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
|
||||
IUSE="ffmpeg gui jpeg mpi +opencascade python test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
ffmpeg? ( gui )
|
||||
jpeg? ( gui )
|
||||
python? ( gui )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
virtual/zlib:=
|
||||
ffmpeg? ( media-video/ffmpeg:= )
|
||||
gui? (
|
||||
dev-lang/tcl:0/8.6
|
||||
dev-lang/tk:0/8.6
|
||||
media-libs/glu
|
||||
media-libs/libglvnd[X]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXmu
|
||||
x11-libs/libxcb:=
|
||||
)
|
||||
jpeg? ( media-libs/libjpeg-turbo:0= )
|
||||
mpi? (
|
||||
sci-libs/metis
|
||||
virtual/mpi
|
||||
)
|
||||
opencascade? ( sci-libs/opencascade:= )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/pybind11[${PYTHON_USEDEP}]
|
||||
'
|
||||
)
|
||||
mpi? (
|
||||
$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
sys-apps/lsb-release
|
||||
virtual/pkgconfig
|
||||
gui? ( virtual/imagemagick-tools[png] )
|
||||
test? (
|
||||
<dev-cpp/catch-3:0
|
||||
python? ( $(python_gen_cond_dep '
|
||||
dev-python/pytest-check[${PYTHON_USEDEP}]
|
||||
') )
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-link-against-ffmpeg.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-find-libjpeg-turbo-library.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-encoding_h.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-link-against-jpeg.patch"
|
||||
"${FILESDIR}/${PN}-PR202-std_map.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
# NOTE This calls find_package(Python3) without specifying Interpreter in COMPONENTS.
|
||||
# Python3_FIND_UNVERSIONED_NAMES=FIRST is thus never checked and we search the highest python version first.
|
||||
pushd "${T}/${EPYTHON}/bin" > /dev/null || die
|
||||
cp "python-config" "${EPYTHON}-config" || die
|
||||
chmod +x "${EPYTHON}-config" || die
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# # NOTE: need to manually check and update this string on version bumps!
|
||||
# # git describe --tags --match "v[0-9]*" --long --dirty
|
||||
# cat <<- EOF > "${S}/version.txt" || die
|
||||
# v${PV}-0-08eec44
|
||||
# EOF
|
||||
|
||||
# 855214 needs git
|
||||
sed \
|
||||
-e '/-DBDIR=${CMAKE_CURRENT_BINARY_DIR}/a -DNETGEN_VERSION_GIT=${NETGEN_VERSION_GIT}' \
|
||||
-i CMakeLists.txt || die
|
||||
|
||||
rm external_dependencies -r || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
filter-lto
|
||||
|
||||
local mycmakeargs=(
|
||||
# currently not working in a sandbox, expects netgen to be installed
|
||||
# see https://github.com/NGSolve/netgen/issues/132
|
||||
-DBUILD_STUB_FILES=OFF
|
||||
-DENABLE_UNIT_TESTS=$(usex test)
|
||||
-DINSTALL_PROFILES=OFF
|
||||
-DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
|
||||
-DNG_INSTALL_DIR_INCLUDE="include/${PN}"
|
||||
-DNG_INSTALL_DIR_LIB="$(get_libdir)"
|
||||
-DUSE_CCACHE=OFF
|
||||
# doesn't build with this version
|
||||
-DUSE_CGNS=OFF
|
||||
-DUSE_GUI=$(usex gui)
|
||||
-DUSE_INTERNAL_TCL=OFF
|
||||
-DUSE_JPEG=$(usex jpeg)
|
||||
-DUSE_MPEG=$(usex ffmpeg)
|
||||
# respect users -march= choice
|
||||
-DUSE_NATIVE_ARCH=OFF
|
||||
-DUSE_MPI=$(usex mpi)
|
||||
-DUSE_OCC=$(usex opencascade)
|
||||
-DUSE_PYTHON="$(usex python)"
|
||||
-DUSE_SUPERBUILD=OFF
|
||||
-DNETGEN_VERSION_GIT="v${PV}"
|
||||
)
|
||||
# no need to set this, if we only build the library
|
||||
if use gui; then
|
||||
mycmakeargs+=( -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include" )
|
||||
fi
|
||||
if use python; then
|
||||
append-cppflags -DPYBIND11_NO_ASSERT_GIL_HELD_INCREF_DECREF
|
||||
|
||||
mycmakeargs+=(
|
||||
-DPREFER_SYSTEM_PYBIND11=ON
|
||||
# # needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
|
||||
# -DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
)
|
||||
fi
|
||||
if use mpi && use python; then
|
||||
mycmakeargs+=( -DUSE_MPI4PY=ON )
|
||||
else
|
||||
mycmakeargs+=( -DUSE_MPI4PY=OFF )
|
||||
fi
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
DESTDIR="${T}" cmake_build install
|
||||
|
||||
if use python; then
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
local -x NETGENDIR="${T}/usr/bin"
|
||||
export PYTHONPATH="${T}$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core"
|
||||
fi
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
'^unit_symboltable$'
|
||||
'^pytest$' # SEGFAULT
|
||||
'^pytest-mpi$' # needs pytest-mpi
|
||||
)
|
||||
cmake_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use python && python_optimize
|
||||
|
||||
local NETGENDIR="/usr/share/${PN}"
|
||||
echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die
|
||||
doenvd 99netgen
|
||||
|
||||
if use gui; then
|
||||
mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die
|
||||
|
||||
convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die
|
||||
newicon -s 32 "${S}"/${PN}-2.png ${PN}.png
|
||||
newicon -s 16 "${S}"/${PN}-3.png ${PN}.png
|
||||
make_desktop_entry ${PN} "Netgen" netgen Graphics
|
||||
fi
|
||||
|
||||
mv "${ED}"/usr/share/${PN}/doc/ng4.pdf "${ED}"/usr/share/doc/${PF} || die
|
||||
dosym -r /usr/share/doc/${PF}/ng4.pdf /usr/share/${PN}/doc/ng4.pdf
|
||||
|
||||
use python || rm -r "${ED}${NETGENDIR}"/py_tutorials || die
|
||||
}
|
||||
@@ -1,211 +0,0 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{12..13} )
|
||||
inherit cmake desktop flag-o-matic python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Automatic 3d tetrahedral mesh generator"
|
||||
HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
|
||||
SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
|
||||
IUSE="ffmpeg gui jpeg mpi +opencascade python test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
ffmpeg? ( gui )
|
||||
jpeg? ( gui )
|
||||
python? ( gui )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
virtual/zlib:=
|
||||
ffmpeg? ( media-video/ffmpeg:= )
|
||||
gui? (
|
||||
dev-lang/tcl:0/8.6
|
||||
dev-lang/tk:0/8.6
|
||||
media-libs/glu
|
||||
media-libs/libglvnd[X]
|
||||
x11-libs/libX11
|
||||
x11-libs/libXmu
|
||||
x11-libs/libxcb:=
|
||||
)
|
||||
jpeg? ( media-libs/libjpeg-turbo:0= )
|
||||
mpi? (
|
||||
sci-libs/metis
|
||||
virtual/mpi
|
||||
)
|
||||
opencascade? ( sci-libs/opencascade:= )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/pybind11[${PYTHON_USEDEP}]
|
||||
'
|
||||
)
|
||||
mpi? (
|
||||
$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
sys-apps/lsb-release
|
||||
virtual/pkgconfig
|
||||
gui? ( virtual/imagemagick-tools[png] )
|
||||
test? (
|
||||
<dev-cpp/catch-3:0
|
||||
python? ( $(python_gen_cond_dep '
|
||||
dev-python/pytest-check[${PYTHON_USEDEP}]
|
||||
') )
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-6.2.2204-find-Tk-include-directories.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-link-against-ffmpeg.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2204-use-system-catch.patch"
|
||||
# "${FILESDIR}/${PN}-6.2.2406-find-libjpeg-turbo-library.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-encoding_h.patch"
|
||||
"${FILESDIR}/${PN}-6.2.2406-link-against-jpeg.patch"
|
||||
"${FILESDIR}/${PN}-PR202-std_map.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python-single-r1_pkg_setup
|
||||
|
||||
# NOTE This calls find_package(Python3) without specifying Interpreter in COMPONENTS.
|
||||
# Python3_FIND_UNVERSIONED_NAMES=FIRST is thus never checked and we search the highest python version first.
|
||||
pushd "${T}/${EPYTHON}/bin" > /dev/null || die
|
||||
cp "python-config" "${EPYTHON}-config" || die
|
||||
chmod +x "${EPYTHON}-config" || die
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# NOTE: need to manually check and update this string on version bumps!
|
||||
# git ls-remote --tags https://github.com/NGSolve/netgen.git refs/tags/v${PV} | cut -c-8
|
||||
# git describe --tags --match "v[0-9]*" --long --dirty
|
||||
# cat <<- EOF > "${S}/version.txt" || die
|
||||
# v${PV}-0-gd1a9f7ee
|
||||
# EOF
|
||||
|
||||
# 855214 needs git
|
||||
sed \
|
||||
-e '/-DBDIR=${CMAKE_CURRENT_BINARY_DIR}/a -DNETGEN_VERSION_GIT=${NETGEN_VERSION_GIT}' \
|
||||
-i CMakeLists.txt || die
|
||||
|
||||
if use python; then
|
||||
sed \
|
||||
-e "s/Python3_EXECUTABLE/PYTHON_EXECUTABLE/" \
|
||||
-i cmake/NetgenConfig.cmake.in || die
|
||||
fi
|
||||
|
||||
rm -r external_dependencies || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
# currently not working in a sandbox, expects netgen to be installed
|
||||
# see https://github.com/NGSolve/netgen/issues/132
|
||||
-DBUILD_STUB_FILES=OFF
|
||||
-DENABLE_UNIT_TESTS=$(usex test)
|
||||
-DINSTALL_PROFILES=OFF
|
||||
-DNG_INSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
|
||||
-DNG_INSTALL_DIR_INCLUDE="include/${PN}"
|
||||
-DNG_INSTALL_DIR_LIB="$(get_libdir)"
|
||||
-DUSE_CCACHE=OFF
|
||||
# doesn't build with this version
|
||||
-DUSE_CGNS=no
|
||||
-DUSE_GUI=$(usex gui)
|
||||
-DUSE_INTERNAL_TCL=OFF
|
||||
-DUSE_JPEG=$(usex jpeg)
|
||||
-DUSE_MPEG=$(usex ffmpeg)
|
||||
# respect users -march= choice
|
||||
-DUSE_NATIVE_ARCH=OFF
|
||||
-DUSE_MPI=$(usex mpi)
|
||||
-DUSE_OCC=$(usex opencascade)
|
||||
-DUSE_PYTHON="$(usex python)"
|
||||
-DUSE_SUPERBUILD=OFF
|
||||
|
||||
-DNETGEN_VERSION_GIT="v${PV}-0-gd1a9f7ee"
|
||||
)
|
||||
|
||||
# no need to set this, if we only build the library
|
||||
if use gui; then
|
||||
mycmakeargs+=(
|
||||
-DTK_INCLUDE_PATH="${ESYSROOT}/usr/$(get_libdir)/tk8.6/include"
|
||||
)
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
append-cppflags -DPYBIND11_NO_ASSERT_GIL_HELD_INCREF_DECREF
|
||||
|
||||
mycmakeargs+=(
|
||||
-DPREFER_SYSTEM_PYBIND11=ON
|
||||
# needed, so the value gets passed to NetgenConfig.cmake instead of ${T}/pythonX.Y
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
)
|
||||
fi
|
||||
|
||||
if use mpi && use python; then
|
||||
mycmakeargs+=( -DUSE_MPI4PY=ON )
|
||||
else
|
||||
mycmakeargs+=( -DUSE_MPI4PY=OFF )
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
DESTDIR="${T}" cmake_build install
|
||||
|
||||
if use python; then
|
||||
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||
local -x NETGENDIR="${T}/usr/bin"
|
||||
local -x PYTHONPATH="${T}$(python_get_sitedir):${T}/usr/$(get_libdir):${BUILD_DIR}/libsrc/core"
|
||||
fi
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
'^unit_symboltable$'
|
||||
'^pytest$' # floating point errors
|
||||
'^pytest-mpi$' # needs pytest-mpi
|
||||
)
|
||||
cmake_src_test
|
||||
|
||||
rm -r "${T}/usr" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
use python && python_optimize
|
||||
|
||||
local NETGENDIR="/usr/share/${PN}"
|
||||
echo -e "NETGENDIR=${NETGENDIR}" > ./99netgen || die
|
||||
doenvd 99netgen
|
||||
|
||||
if use gui; then
|
||||
mv "${ED}"/usr/bin/{*.tcl,*.ocf} "${ED}${NETGENDIR}" || die
|
||||
|
||||
convert -deconstruct "${S}/windows/${PN}.ico" netgen.png || die
|
||||
newicon -s 32 "${S}/${PN}-2.png" "${PN}.png"
|
||||
newicon -s 16 "${S}/${PN}-3.png" "${PN}.png"
|
||||
make_desktop_entry "${PN}" "Netgen" netgen Graphics
|
||||
fi
|
||||
|
||||
mv "${ED}/usr/share/${PN}/doc/ng4.pdf" "${ED}/usr/share/doc/${PF}" || die
|
||||
dosym -r "/usr/share/doc/${PF}/ng4.pdf" "/usr/share/${PN}/doc/ng4.pdf"
|
||||
|
||||
use python || rm -r "${ED}${NETGENDIR}/py_tutorials" || die
|
||||
}
|
||||
Reference in New Issue
Block a user