public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2022-11-15 12:15 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-11-15 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f73f853373a42bd8b02c51c79651a847d0c34058
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 31 14:35:10 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 12:01:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f73f8533

sci-mathematics/netgen: add 6.2.2204

- OpenMP doesn't seem to be used, remove USE flag
- dev-tcltk/tix doesn't seem to be used, remove dependency
- dev-tcltk/togl is build internal and doesn't use a system togl installation
- Stub generation from pybind11 doesn't currently work in a sandbox, see
  https://github.com/NGSolve/netgen/issues/126
- only depend on sci-libs/metis for USE=mpi

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...tgen-6.2.2204-find-Tk-include-directories.patch |  21 ++++
 ...etgen-6.2.2204-find-libjpeg-turbo-library.patch |  34 +++++
 .../netgen-6.2.2204-link-against-ffmpeg.patch      |  20 +++
 .../netgen-6.2.2204-use-external-pybind11.patch    |  30 +++++
 sci-mathematics/netgen/netgen-6.2.2204.ebuild      | 137 +++++++++++++++++++++
 5 files changed, 242 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch b/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch
new file mode 100644
index 000000000..cf7b9d31e
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch
@@ -0,0 +1,21 @@
+From 53c45343f5a26841be10d930467e215da4a779f2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 30 Oct 2022 15:17:55 +0100
+Subject: [PATCH] find Tk include directories
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -270,6 +270,9 @@ if (USE_GUI)
+     endif(APPLE)
+     find_package(OpenGL REQUIRED)
+ 
++    include_directories(${TK_INCLUDE_PATH}/generic)
++    include_directories(${TK_INCLUDE_PATH}/unix)
++
+     target_compile_definitions(netgen_gui INTERFACE -DTCL -DOPENGL -DUSE_TOGL_2 -DUSE_TCL_STUBS -DUSE_TK_STUBS)
+     target_include_directories(netgen_gui INTERFACE ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH})
+     target_link_libraries(netgen_gui INTERFACE ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY})
+-- 
+2.38.1
+

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch b/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch
new file mode 100644
index 000000000..c45f5a4e4
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch
@@ -0,0 +1,34 @@
+From 39160b692fd051f2638f1a6e1df38eb616b6d6cb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 30 Oct 2022 16:09:43 +0100
+Subject: [PATCH] find libjpeg-turbo library
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/libsrc/visualization/CMakeLists.txt
++++ b/libsrc/visualization/CMakeLists.txt
+@@ -7,7 +7,7 @@ target_sources(nggui PRIVATE
+     vssolution.cpp
+     visualpkg.cpp
+ )
+-target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} )
++target_link_libraries( nggui PUBLIC "$<BUILD_INTERFACE:netgen_python>" ${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} )
+ 
+ install(FILES
+   meshdoc.hpp mvdraw.hpp visual_api.hpp
+--- a/nglib/CMakeLists.txt
++++ b/nglib/CMakeLists.txt
+@@ -7,6 +7,11 @@ endif(USE_OCC)
+ 
+ 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 ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns )
+ 
+ install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
+-- 
+2.38.1
+

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch b/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch
new file mode 100644
index 000000000..6f7a8bc3c
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch
@@ -0,0 +1,20 @@
+From 69d9c2da29adc9b7a209e78aae950d9834683f58 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 31 Oct 2022 13:07:05 +0100
+Subject: [PATCH] link against ffmpeg
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/ng/CMakeLists.txt
++++ b/ng/CMakeLists.txt
+@@ -28,7 +28,7 @@ if(USE_GUI)
+     if(APPLE)
+         set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)
+     endif(APPLE)
+-    target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY})
++    target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} ${TK_LIBRARY} ${FFMPEG_LIBRARIES})
+     endif(NOT BUILD_FOR_CONDA)
+ 
+     install(TARGETS nggui ${NG_INSTALL_DIR})
+-- 
+2.38.1
+

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2204-use-external-pybind11.patch b/sci-mathematics/netgen/files/netgen-6.2.2204-use-external-pybind11.patch
new file mode 100644
index 000000000..ef11c8b08
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2204-use-external-pybind11.patch
@@ -0,0 +1,30 @@
+From c3c55fe646ad6934e429edd080aceae54260551c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 30 Oct 2022 14:50:48 +0100
+Subject: [PATCH] use external pybind11
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -302,7 +302,7 @@ else()
+ endif()
+ 
+ if (USE_PYTHON)
+-    add_subdirectory(external_dependencies/pybind11)
++    find_package(pybind11)
+     find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
+     if( PYBIND_INCLUDE_DIR )
+         message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
+--- a/cmake/SuperBuild.cmake
++++ b/cmake/SuperBuild.cmake
+@@ -154,7 +154,6 @@ endif()
+ #######################################################################
+ if (USE_PYTHON)
+   find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
+-    set(NG_INSTALL_PYBIND ON)
+     if( NOT PYBIND_INCLUDE_DIR )
+       # if the pybind submodule is missing, try to initialize and update all submodules
+       execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+-- 
+2.38.1
+

diff --git a/sci-mathematics/netgen/netgen-6.2.2204.ebuild b/sci-mathematics/netgen/netgen-6.2.2204.ebuild
new file mode 100644
index 000000000..06a2bf53f
--- /dev/null
+++ b/sci-mathematics/netgen/netgen-6.2.2204.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop 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"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ffmpeg jpeg mpi opencascade python gui"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ffmpeg? ( gui )
+	jpeg? ( gui )
+	python? ( gui )
+"
+
+DEPEND="
+	sys-libs/zlib
+	ffmpeg? ( media-video/ffmpeg:= )
+	gui? (
+		dev-lang/tcl:0/8.6
+		dev-lang/tk:0/8.6
+		media-libs/glu
+		virtual/opengl
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-external-pybind11.patch"
+	"${FILESDIR}/${P}-find-Tk-include-directories.patch"
+	"${FILESDIR}/${P}-find-libjpeg-turbo-library.patch"
+	"${FILESDIR}/${P}-link-against-ffmpeg.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# NOTE: need to manually check and update this string on version bumps!
+	cat <<- EOF > "${S}/version.txt" || die
+		v${PV}-0-gde0d706e
+	EOF
+	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
+		-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
+	)
+	# 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
+		mycmakeargs+=(
+			-DPYBIND_INCLUDE_DIR="/usr/lib/${EPYTHON}/site-packages/pybind11/include/"
+			-DNG_INSTALL_PYBIND=OFF
+		)
+	fi
+	if use mpi && use python; then
+		mycmakeargs+=( -DUSE_MPI4PY=ON )
+	else
+		mycmakeargs+=( -DUSE_MPI4PY=OFF )
+	fi
+	cmake_src_configure
+}
+
+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
+
+		doicon "${FILESDIR}"/${PN}.png
+		domenu "${FILESDIR}"/${PN}.desktop
+	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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2022-01-13 14:19 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-01-13 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     430efe1166a93e1acf87c1980142052339f1ac5a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 14:18:03 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 14:18:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=430efe11

sci-mathematics/netgen: add version 6.2.2105

Bug: https://github.com/NGSolve/netgen/issues/72
Bug: https://github.com/NGSolve/netgen/issues/77
Closes: https://bugs.gentoo.org/155424
Closes: https://bugs.gentoo.org/756214
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../netgen/files/netgen-6.2.2105-find-tk.patch     |  35 +++++++
 sci-mathematics/netgen/metadata.xml                |   2 +-
 sci-mathematics/netgen/netgen-6.2.2105.ebuild      | 102 +++++++++++++++++++++
 3 files changed, 138 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch b/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch
new file mode 100644
index 000000000..c638d83a7
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcc24af..24f444e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -246,7 +246,8 @@ if (USE_GUI)
+ 
+     add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2)
+     include_directories(${TCL_INCLUDE_PATH})
+-    include_directories(${TK_INCLUDE_PATH})
++    include_directories(${TK_INCLUDE_PATH}/generic)
++    include_directories(${TK_INCLUDE_PATH}/unix)
+     set(LIBTOGL togl)
+ 
+     if(WIN32)
+@@ -268,7 +269,7 @@ else()
+ endif()
+ 
+ if (USE_PYTHON)
+-    add_subdirectory(external_dependencies/pybind11)
++    find_package(pybind11)
+     find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
+     if( PYBIND_INCLUDE_DIR )
+         message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
+diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
+index c24b631..2354a09 100644
+--- a/cmake/SuperBuild.cmake
++++ b/cmake/SuperBuild.cmake
+@@ -39,7 +39,6 @@ endif(NOT WIN32)
+ #######################################################################
+ if (USE_PYTHON)
+   find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
+-    set(NG_INSTALL_PYBIND ON)
+     if( NOT PYBIND_INCLUDE_DIR )
+       # if the pybind submodule is missing, try to initialize and update all submodules
+       execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/sci-mathematics/netgen/metadata.xml b/sci-mathematics/netgen/metadata.xml
index a2cd926a4..cb94caeca 100644
--- a/sci-mathematics/netgen/metadata.xml
+++ b/sci-mathematics/netgen/metadata.xml
@@ -9,6 +9,6 @@
 		<flag name="opencascade"> Enable OpenCASCADE support</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">netgen-mesher</remote-id>
+		<remote-id type="github">NGSolve/netgen</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sci-mathematics/netgen/netgen-6.2.2105.ebuild b/sci-mathematics/netgen/netgen-6.2.2105.ebuild
new file mode 100644
index 000000000..ba602adf6
--- /dev/null
+++ b/sci-mathematics/netgen/netgen-6.2.2105.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop 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"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ffmpeg jpeg mpi opencascade openmp python +gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	dev-lang/tcl:0/8.6
+	dev-lang/tk:0/8.6
+	dev-tcltk/tix
+	dev-tcltk/togl:0
+	gui? (
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXmu
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			dev-python/pybind11-stubgen[${PYTHON_USEDEP}]
+			'
+		)
+		mpi? (
+			$(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
+		)
+	)
+	opencascade? ( sci-libs/opencascade:* )
+	ffmpeg? ( media-video/ffmpeg )
+	jpeg? ( virtual/jpeg:0= )
+	mpi? ( virtual/mpi sci-libs/parmetis opencascade? ( sci-libs/hdf5[mpi] ) )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-vcs/git"
+
+PATCHES=( "${FILESDIR}/${P}-find-tk.patch" )
+
+src_prepare() {
+	# https://github.com/NGSolve/netgen/issues/72
+	git init -q || die
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	git add . || die
+	git commit -qm 'init' || die
+	git tag "${PV}" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	 local mycmakeargs=(
+		-DUSE_MPI="$(usex mpi)"
+		-DUSE_JPEG="$(usex jpeg)"
+		-DUSE_MPEG="$(usex ffmpeg)"
+		-DUSE_GUI="$(usex gui)"
+		-DUSE_OCC="$(usex opencascade)"
+		-DUSE_PYTHON="$(usex python)"
+		-DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include"
+		-DNG_INSTALL_DIR_LIB="$(get_libdir)"
+		-DINSTALL_PROFILES=ON
+		-DUSE_INTERNAL_TCL=OFF
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYBIND_INCLUDE_DIR="/usr/lib/${EPYTHON}/site-packages/pybind11/include/"
+			-DNG_INSTALL_PYBIND=OFF
+		)
+	fi
+	if use mpi && use python; then
+		mycmakeargs+=( -DUSE_MPI4PY=ON )
+	else
+		mycmakeargs+=( -DUSE_MPI4PY=OFF )
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	local NETGENDIR="/usr/share/netgen"
+
+	echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl2.0" > ./99netgen
+	doenvd 99netgen
+
+	mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2016-02-22  8:38 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2016-02-22  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f83f93985041a9cd241f2f8d3937d4c1e6fe731d
Author:     Grégory Salvan <apieum <AT> gmail <DOT> com>
AuthorDate: Sun Feb 21 20:54:51 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f83f9398

Remove -DTOGL_X11 and merge with build patch

 ...uild.patch => netgen-5.x-makefiles-fixes.patch} | 148 +++++++++++++--------
 sci-mathematics/netgen/netgen-5.3.1.ebuild         |   4 +-
 2 files changed, 96 insertions(+), 56 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
similarity index 69%
rename from sci-mathematics/netgen/files/netgen-5.3.1_build.patch
rename to sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
index 82c6ac9..b6c8fd4 100644
--- a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
@@ -1,7 +1,15 @@
-diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
---- netgen-5.3.1/configure.ac	2014-10-07 21:38:21.990021106 +0200
-+++ netgen-5.3.1-new/configure.ac	2014-10-07 21:39:14.530034275 +0200
-@@ -35,15 +35,15 @@ AC_ARG_WITH([occ],
+diff -uwrN -x.git netgen-5.3.1/configure.ac netgen/configure.ac
+--- netgen-5.3.1/configure.ac	2016-02-21 21:40:41.852331652 +0100
++++ netgen/configure.ac	2016-02-21 21:39:31.355329711 +0100
+@@ -14,7 +14,6 @@
+ AC_DISABLE_STATIC
+ 
+ AC_LANG([C++])
+-AM_PROG_AR
+ AC_PROG_CXX
+ 
+ AC_OPENMP
+@@ -36,15 +35,15 @@
          [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in directory dir])],
          [occdir=$withval] 
  	[occon=true],
@@ -20,7 +28,7 @@ diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
  
  #  -lTKDCAF
  
-@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui],
+@@ -90,18 +89,18 @@
          [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])],
          [if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi])
  
@@ -43,10 +51,10 @@ diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
          )       
  #          -DVTRACE
  #          -lvt-hyb
-diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makefile.am
---- netgen-5.3.1/libsrc/csg/Makefile.am	2014-10-07 21:38:21.787017193 +0200
-+++ netgen-5.3.1-new/libsrc/csg/Makefile.am	2014-10-07 21:39:14.530034275 +0200
-@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/csg/Makefile.am netgen/libsrc/csg/Makefile.am
+--- netgen-5.3.1/libsrc/csg/Makefile.am	2016-02-21 21:40:41.852331652 +0100
++++ netgen/libsrc/csg/Makefile.am	2016-02-21 21:39:31.355329711 +0100
+@@ -8,24 +8,24 @@
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include  $(TCL_INCLUDES)
  METASOURCES = AUTO
  
@@ -77,10 +85,10 @@ diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am netgen-5.3.1-new/libsrc/csg/Makef
  endif
  
  #   $(top_builddir)/libsrc/geom2d/libgeom2d.la 
-diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/general/Makefile.am
---- netgen-5.3.1/libsrc/general/Makefile.am	2014-10-07 21:38:21.638014320 +0200
-+++ netgen-5.3.1-new/libsrc/general/Makefile.am	2014-10-07 21:39:14.531034296 +0200
-@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/general/Makefile.am netgen/libsrc/general/Makefile.am
+--- netgen-5.3.1/libsrc/general/Makefile.am	2016-02-21 21:40:41.852331652 +0100
++++ netgen/libsrc/general/Makefile.am	2016-02-21 21:39:31.356329711 +0100
+@@ -4,8 +4,8 @@
  
  AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include
  METASOURCES = AUTO
@@ -91,10 +99,10 @@ diff -rupN netgen-5.3.1/libsrc/general/Makefile.am netgen-5.3.1-new/libsrc/gener
  	hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \
  	profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \
  	mpi_interface.cpp gzstream.cpp
-diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d/Makefile.am
---- netgen-5.3.1/libsrc/geom2d/Makefile.am	2014-10-07 21:38:21.832018060 +0200
-+++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am	2014-10-07 21:39:14.531034296 +0200
-@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc
+diff -uwrN -x.git netgen-5.3.1/libsrc/geom2d/Makefile.am netgen/libsrc/geom2d/Makefile.am
+--- netgen-5.3.1/libsrc/geom2d/Makefile.am	2016-02-21 21:40:41.852331652 +0100
++++ netgen/libsrc/geom2d/Makefile.am	2016-02-21 21:39:31.356329711 +0100
+@@ -4,18 +4,18 @@
  
  METASOURCES = AUTO
  
@@ -119,10 +127,10 @@ diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am netgen-5.3.1-new/libsrc/geom2d
 +libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS)
  
  
-diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/Makefile.am
---- netgen-5.3.1/libsrc/gprim/Makefile.am	2014-10-07 21:38:21.719015882 +0200
-+++ netgen-5.3.1-new/libsrc/gprim/Makefile.am	2014-10-07 21:39:14.531034296 +0200
-@@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp  geom3d.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/gprim/Makefile.am netgen/libsrc/gprim/Makefile.am
+--- netgen-5.3.1/libsrc/gprim/Makefile.am	2016-02-21 21:40:41.853331652 +0100
++++ netgen/libsrc/gprim/Makefile.am	2016-02-21 21:39:31.357329711 +0100
+@@ -2,6 +2,6 @@
  
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
  METASOURCES = AUTO
@@ -131,10 +139,10 @@ diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am netgen-5.3.1-new/libsrc/gprim/M
 +noinst_LTLIBRARIES = libnggprim.la
 +libnggprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \
  	geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
-diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/interface/Makefile.am
---- netgen-5.3.1/libsrc/interface/Makefile.am	2014-10-07 21:38:21.846018330 +0200
-+++ netgen-5.3.1-new/libsrc/interface/Makefile.am	2014-10-07 21:44:17.523887314 +0200
-@@ -2,14 +2,14 @@ noinst_HEADERS = writeuser.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/interface/Makefile.am netgen/libsrc/interface/Makefile.am
+--- netgen-5.3.1/libsrc/interface/Makefile.am	2016-02-21 21:40:41.853331652 +0100
++++ netgen/libsrc/interface/Makefile.am	2016-02-21 21:39:31.357329711 +0100
+@@ -2,14 +2,14 @@
  
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface  $(MPI_INCLUDES) $(TCL_INCLUDES) -DOPENGL
  METASOURCES = AUTO
@@ -152,9 +160,9 @@ diff -rupN netgen-5.3.1/libsrc/interface/Makefile.am netgen-5.3.1-new/libsrc/int
 +libnginterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la
  
  # libinterface_la_LDFLAGS = -rdynamic
-diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg/Makefile.am
---- netgen-5.3.1/libsrc/linalg/Makefile.am	2014-10-07 21:38:21.667014879 +0200
-+++ netgen-5.3.1-new/libsrc/linalg/Makefile.am	2014-10-07 21:39:14.532034315 +0200
+diff -uwrN -x.git netgen-5.3.1/libsrc/linalg/Makefile.am netgen/libsrc/linalg/Makefile.am
+--- netgen-5.3.1/libsrc/linalg/Makefile.am	2016-02-21 21:40:41.853331652 +0100
++++ netgen/libsrc/linalg/Makefile.am	2016-02-21 21:39:31.357329711 +0100
 @@ -1,8 +1,8 @@
  noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp opti.hpp
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include
@@ -166,10 +174,10 @@ diff -rupN netgen-5.3.1/libsrc/linalg/Makefile.am netgen-5.3.1-new/libsrc/linalg
  
  #  vector.cpp
  
-diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshing/Makefile.am
---- netgen-5.3.1/libsrc/meshing/Makefile.am	2014-10-07 21:38:21.895019275 +0200
-+++ netgen-5.3.1-new/libsrc/meshing/Makefile.am	2014-10-07 21:39:14.532034315 +0200
-@@ -15,9 +15,9 @@ clusters.hpp hprefinement.hpp improve3.h
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/Makefile.am netgen/libsrc/meshing/Makefile.am
+--- netgen-5.3.1/libsrc/meshing/Makefile.am	2016-02-21 21:40:41.853331652 +0100
++++ netgen/libsrc/meshing/Makefile.am	2016-02-21 21:39:31.358329711 +0100
+@@ -15,9 +15,9 @@
  
  METASOURCES = AUTO
  
@@ -181,7 +189,7 @@ diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshi
  	clusters.cpp curvedelems.cpp delaunay.cpp delaunay2d.cpp	    \
  	geomsearch.cpp global.cpp hprefinement.cpp improve2.cpp		    \
  	improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp		    \
-@@ -30,8 +30,8 @@ libmesh_la_SOURCES = adfront2.cpp adfron
+@@ -30,8 +30,8 @@
  	topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp   \
  	parallelmesh.cpp  paralleltop.cpp  paralleltop.hpp basegeom.cpp 
  
@@ -194,10 +202,10 @@ diff -rupN netgen-5.3.1/libsrc/meshing/Makefile.am netgen-5.3.1-new/libsrc/meshi
 +	$(top_builddir)/libsrc/general/libnggen.la \
 +	$(MPI_LIBS) -lz
  
-diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makefile.am
---- netgen-5.3.1/libsrc/occ/Makefile.am	2014-10-07 21:38:21.739016267 +0200
-+++ netgen-5.3.1-new/libsrc/occ/Makefile.am	2014-10-07 21:39:14.533034334 +0200
-@@ -14,20 +14,20 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc
+diff -uwrN -x.git netgen-5.3.1/libsrc/occ/Makefile.am netgen/libsrc/occ/Makefile.am
+--- netgen-5.3.1/libsrc/occ/Makefile.am	2016-02-21 21:40:41.853331652 +0100
++++ netgen/libsrc/occ/Makefile.am	2016-02-21 21:39:31.358329711 +0100
+@@ -14,20 +14,20 @@
  
  METASOURCES = AUTO
  
@@ -224,10 +232,10 @@ diff -rupN netgen-5.3.1/libsrc/occ/Makefile.am netgen-5.3.1-new/libsrc/occ/Makef
 +libngoccvis_la_LIBADD = libngocc.la $(TCL_LIB_SPEC)
  
  
-diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlgeom/Makefile.am
---- netgen-5.3.1/libsrc/stlgeom/Makefile.am	2014-10-07 21:38:21.683015188 +0200
-+++ netgen-5.3.1-new/libsrc/stlgeom/Makefile.am	2014-10-07 21:39:14.533034334 +0200
-@@ -4,18 +4,18 @@ stltool.hpp stltopology.hpp vsstl.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen/libsrc/stlgeom/Makefile.am
+--- netgen-5.3.1/libsrc/stlgeom/Makefile.am	2016-02-21 21:40:41.854331653 +0100
++++ netgen/libsrc/stlgeom/Makefile.am	2016-02-21 21:39:31.359329711 +0100
+@@ -4,18 +4,18 @@
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
  METASOURCES = AUTO
  
@@ -252,10 +260,10 @@ diff -rupN netgen-5.3.1/libsrc/stlgeom/Makefile.am netgen-5.3.1-new/libsrc/stlge
 +libngstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libngmesh.la $(MPI_LIBS)
  # libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la 
  
-diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc/visualization/Makefile.am
---- netgen-5.3.1/libsrc/visualization/Makefile.am	2014-10-07 21:38:21.822017867 +0200
-+++ netgen-5.3.1-new/libsrc/visualization/Makefile.am	2014-10-07 21:39:14.533034334 +0200
-@@ -7,11 +7,11 @@ AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_s
+diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.am netgen/libsrc/visualization/Makefile.am
+--- netgen-5.3.1/libsrc/visualization/Makefile.am	2016-02-21 21:40:41.854331653 +0100
++++ netgen/libsrc/visualization/Makefile.am	2016-02-21 21:39:31.359329711 +0100
+@@ -7,11 +7,11 @@
  METASOURCES = AUTO
  
  if NGGUI
@@ -270,10 +278,30 @@ diff -rupN netgen-5.3.1/libsrc/visualization/Makefile.am netgen-5.3.1-new/libsrc
  
 -
 +libngvisual_la_LIBADD = -lGL
-diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am
---- netgen-5.3.1/ng/Makefile.am	2014-10-07 21:38:21.973020778 +0200
-+++ netgen-5.3.1-new/ng/Makefile.am	2014-10-07 21:39:14.534034353 +0200
-@@ -17,21 +17,18 @@ MKL_LIBS = -L$(MKLROOT)/lib/intel64  -lm
+diff -uwrN -x.git netgen-5.3.1/libsrc/visualization/Makefile.in netgen/libsrc/visualization/Makefile.in
+--- netgen-5.3.1/libsrc/visualization/Makefile.in	2016-02-21 21:40:41.855331653 +0100
++++ netgen/libsrc/visualization/Makefile.in	2016-02-21 21:39:31.360329711 +0100
+@@ -275,7 +275,7 @@
+ visual.hpp vssolution.hpp
+ 
+ include_HEADERS = soldata.hpp
+-AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include  -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES)
++AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include  -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES)
+ METASOURCES = AUTO
+ @NGGUI_TRUE@noinst_LTLIBRARIES = libvisual.la
+ libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \
+diff -uwrN -x.git netgen-5.3.1/ng/Makefile.am netgen/ng/Makefile.am
+--- netgen-5.3.1/ng/Makefile.am	2016-02-21 21:40:41.855331653 +0100
++++ netgen/ng/Makefile.am	2016-02-21 21:39:31.360329711 +0100
+@@ -1,6 +1,6 @@
+ include_HEADERS = 
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL  -D$(TOGL_WINDOWINGSYSTEM)  $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) 
++AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) 
+ 
+ 
+ if NGGUI
+@@ -17,21 +17,18 @@
  endif
  # -lpardiso500-GNU472-X86-64 -lgfortran
  
@@ -307,10 +335,22 @@ diff -rupN netgen-5.3.1/ng/Makefile.am netgen-5.3.1-new/ng/Makefile.am
  
  
  # add for static linkage of ngsolve:
-diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am
---- netgen-5.3.1/nglib/Makefile.am	2014-10-07 21:38:21.552012662 +0200
-+++ netgen-5.3.1-new/nglib/Makefile.am	2014-10-07 21:39:27.915292493 +0200
-@@ -8,15 +8,15 @@ lib_LTLIBRARIES = libnglib.la
+diff -uwrN -x.git netgen-5.3.1/ng/Makefile.in netgen/ng/Makefile.in
+--- netgen-5.3.1/ng/Makefile.in	2016-02-21 21:40:41.856331653 +0100
++++ netgen/ng/Makefile.in	2016-02-21 21:39:31.361329711 +0100
+@@ -302,7 +302,7 @@
+ include_HEADERS = 
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include \
+ 	-I$(top_srcdir)/libsrc/interface -DOPENGL \
+-	-D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) \
++	$(TCL_INCLUDES) $(MPI_INCLUDES) \
+ 	$(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(am__append_1)
+ netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h
+ @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64  -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def
+diff -uwrN -x.git netgen-5.3.1/nglib/Makefile.am netgen/nglib/Makefile.am
+--- netgen-5.3.1/nglib/Makefile.am	2016-02-21 21:40:41.856331653 +0100
++++ netgen/nglib/Makefile.am	2016-02-21 21:39:31.362329711 +0100
+@@ -8,15 +8,15 @@
  libnglib_la_SOURCES = nglib.cpp 
  
  libnglib_la_LIBADD = \
@@ -333,7 +373,7 @@ diff -rupN netgen-5.3.1/nglib/Makefile.am netgen-5.3.1-new/nglib/Makefile.am
  #  -rdynamic
  
  
-@@ -25,24 +25,24 @@ bin_PROGRAMS = ng_vol ng_stl
+@@ -25,24 +25,24 @@
  
  ng_vol_SOURCES = ng_vol.cpp
  ng_vol_LDADD = libnglib.la \

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index d3cf9f9..b23cd8a 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -39,8 +39,8 @@ src_prepare() {
 	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
 	epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
 	epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
-	# Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch
-	epatch "${FILESDIR}/${PN}-5.3.1_build.patch"
+	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch
+	epatch "${FILESDIR}/${PN}-5.x-makefiles-fixes.patch"
 	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
 	epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
 	epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2016-02-22  8:38 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2016-02-22  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5fe163f16c48e49e7dbcce805fd177df657e9cf7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 08:36:11 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5fe163f1

sci-mathematics/netgen: Amend patches for -p1

* Use PATCHES=()
* Convert myconf to array
* Prune .la files
* Add missing SLOT operators

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../netgen/files/netgen-5.x-missing-define.patch   |  8 ++--
 .../files/netgen-5.x-occ-stl-api-change.patch      |  4 +-
 sci-mathematics/netgen/netgen-5.3.1.ebuild         | 45 ++++++++++++----------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch b/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
index 4ad5c52..d9d8f99 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
@@ -1,5 +1,5 @@
---- libsrc/occ/Partition_Loop2d.cxx.orig	2012-11-14 21:16:22.876287910 +0100
-+++ libsrc/occ/Partition_Loop2d.cxx	2012-11-14 21:22:30.909650554 +0100
+--- a/libsrc/occ/Partition_Loop2d.cxx	2012-11-14 21:16:22.876287910 +0100
++++ b/libsrc/occ/Partition_Loop2d.cxx	2012-11-14 21:22:30.909650554 +0100
 @@ -13,6 +13,7 @@
  
  //using namespace std;
@@ -26,8 +26,8 @@
        {
          // an angle is too close to PI; assure that an angle sign really
          // reflects an edge position: +PI - an edge is worst,
---- configure.ac.orig	2012-11-15 14:55:45.048938870 +0100
-+++ configure.ac	2012-11-15 14:55:12.545923777 +0100
+--- a/configure.ac	2012-11-15 14:55:45.048938870 +0100
++++ b/configure.ac	2012-11-15 14:55:12.545923777 +0100
 @@ -14,6 +14,7 @@
  AC_DISABLE_STATIC
  

diff --git a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
index 05f3a54..0452d6b 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
@@ -1,5 +1,5 @@
---- libsrc/occ/occgeom.cpp	2014-08-29 11:54:03.000000000 +0200
-+++ libsrc/occ/occgeom.cpp	2016-02-12 21:14:49.258982206 +0100
+--- a/libsrc/occ/occgeom.cpp	2014-08-29 11:54:03.000000000 +0200
++++ b/libsrc/occ/occgeom.cpp	2016-02-12 21:14:49.258982206 +0100
 @@ -149,7 +149,7 @@
  
           for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 9aac92d..b3f383d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade openmp"
 
 DEPEND="
-	dev-lang/tcl
-	dev-lang/tk
+	dev-lang/tcl:0
+	dev-lang/tk:0
 	dev-tcltk/tix
 	dev-tcltk/togl:1.7
 	virtual/opengl
@@ -32,19 +32,22 @@ DEPEND="
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
 
-src_prepare() {
-	default
+PATCHES=(
 	# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
-	epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
+	"${FILESDIR}"/${PN}-5.x-missing-define.patch
 	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
-	epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
-	epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
+	"${FILESDIR}"/${PN}-5.x-metis-fixes.patch
+	"${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch
 	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch
-	epatch "${FILESDIR}/${PN}-5.x-makefiles-fixes.patch"
+	"${FILESDIR}"/${PN}-5.x-makefiles-fixes.patch
 	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
-	epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
-	epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
-	epatch "${FILESDIR}/${PN}-5.x-parallelmetis4-fix.patch"
+	"${FILESDIR}"/${PN}-5.x-fedora-fixes.patch
+	"${FILESDIR}"/${PN}-5.x-includes-fixes.patch
+	"${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch
+)
+
+src_prepare() {
+	default
 	if use mpi; then
 		export CC=mpicc
 		export CXX=mpic++
@@ -58,14 +61,12 @@ src_prepare() {
 src_configure() {
 	# This is not the most clever way to deal with these flags
 	# but --disable-xxx does not seem to work correcly, so...
-	local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
+	local myconf=( --with-togl=/usr/$(get_libdir)/Togl1.7 )
 
-	if use !openmp; then
-		myconf="${myconf} --disable-openmp"
-	fi
+	myconf+=( $(use_enable openmp) )
 
 	if use opencascade; then
-		myconf="${myconf} --enable-occ --with-occ=$CASROOT"
+		myconf+=( --enable-occ --with-occ=$CASROOT )
 		append-ldflags -L$CASROOT/$(get_libdir)
 	fi
 	if use mpi; then
@@ -74,16 +75,16 @@ src_configure() {
 		ewarn "MPI has not been tested, you should probably deactivate the mpi use flag"
 		ewarn ""
 		ewarn "*************************************************************************"
-		myconf="${myconf} --enable-parallel"
+		myconf+=( --enable-parallel )
 		append-cppflags -I/usr/include/metis
 		append-ldflags -L/usr/$(get_libdir)/openmpi/
 	fi
-	use ffmpeg && myconf="${myconf} --enable-ffmpeg"
-	use jpeg && myconf="${myconf} --enable-jpeglib"
+	use ffmpeg && myconf+=( --enable-ffmpeg )
+	use jpeg && myconf+=( --enable-jpeglib )
 	append-cppflags -I/usr/include/togl-1.7
 
 	econf \
-		${myconf}
+		${myconf[@]}
 
 	# This would be the more elegant way:
 # 	econf \
@@ -106,6 +107,8 @@ src_install() {
 	# Install icon and .desktop for menu entry
 	doicon "${FILESDIR}"/${PN}.png
 	domenu "${FILESDIR}"/${PN}.desktop
+
+	prune_libtool_files
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2016-02-22  8:38 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2016-02-22  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     4a0832f4a3fbc03195c3f9a2bbadde48c40b58a4
Author:     Grégory Salvan <apieum <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 22:26:59 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a0832f4

merge parallelmesh.cpp patches

 ...dora-metis.patch => netgen-5.x-metis-fixes.patch} | 15 ++++++++++++---
 .../netgen/files/netgen-5.x-metis-numflag.patch      | 20 --------------------
 sci-mathematics/netgen/netgen-5.3.1.ebuild           |  5 ++---
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
similarity index 85%
rename from sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
rename to sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
index 68b3396..cf59613 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
@@ -1,5 +1,5 @@
---- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp	2016-02-20 21:55:59.227450843 +0100
-+++ ./netgen/libsrc/meshing/parallelmesh.cpp	2016-02-20 21:46:32.331435233 +0100
+--- netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp	2014-08-29 11:54:05.000000000 +0200
++++ netgen/libsrc/meshing/parallelmesh.cpp	2016-02-20 23:07:00.350568182 +0100
 @@ -14,7 +14,7 @@
  
  #if METIS_VER_MAJOR >= 5
@@ -47,6 +47,15 @@
  	BubbleSort(array);
        }
  
+@@ -1318,7 +1318,7 @@
+     idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
+ 
+     int weightflag = 0;
+-    // int numflag = 0;
++    int numflag = 0;
+     int nparts = ntasks - 1;
+ 
+     int options[5];
 @@ -1377,7 +1377,7 @@
  
      for ( int el = 0; el < ne; el++ )
@@ -72,7 +81,7 @@
      idxtype *v_weights = NULL, *e_weights = NULL;
  
 -    int weightflag = 0;
--    int numflag = 0;
+-    // int numflag = 0;
 -    int nparts = ntasks - 1;
 +    metis::idx_t weightflag = 0;
 +    metis::idx_t numflag = 0;

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
deleted file mode 100644
index 9e5ba88..0000000
--- a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libsrc/meshing/parallelmesh.cpp	2014-08-29 11:54:05.000000000 +0200
-+++ libsrc/meshing/parallelmesh.cpp	2016-02-11 19:12:14.474185736 +0100
-@@ -1318,7 +1318,7 @@
-     idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
-
-     int weightflag = 0;
--    // int numflag = 0;
-+    int numflag = 0;
-     int nparts = ntasks - 1;
-
-     int options[5];
-@@ -1485,7 +1485,7 @@
-     idxtype *v_weights = NULL, *e_weights = NULL;
-
-     int weightflag = 0;
--    // int numflag = 0;
-+    int numflag = 0;
-     int nparts = ntasks - 1;
-
-     int edgecut;

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index cf09c82..0c2da7d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -35,9 +35,8 @@ src_prepare() {
 	default
 	# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
 	epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
-	epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
-	# Taken from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
-	epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch"
+	# Adapted from http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
+	epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
 	epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
 	if use mpi; then
 		export CC=mpicc


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/
@ 2016-02-22  8:38 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2016-02-22  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5ec3233859aac528082c693381300f5b237c4a91
Author:     Grégory Salvan <apieum <AT> gmail <DOT> com>
AuthorDate: Thu Feb 11 18:24:57 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 08:36:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5ec32338

added netgen-5.3.1 ebuild and patch for metis

 .../netgen/files/netgen-5.x-metis-numflag.patch    | 21 +++++
 sci-mathematics/netgen/netgen-5.3.1.ebuild         | 89 ++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
new file mode 100644
index 0000000..4c32304
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
@@ -0,0 +1,21 @@
+diff -uwrN ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp
+--- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp	2016-02-11 19:12:14.474185736 +0100
++++ netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp	2014-08-29 11:54:05.000000000 +0200
+@@ -1318,7 +1318,7 @@
+     idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
+ 
+     int weightflag = 0;
+-    int numflag = 0;
++    // int numflag = 0;
+     int nparts = ntasks - 1;
+ 
+     int options[5];
+@@ -1485,7 +1485,7 @@
+     idxtype *v_weights = NULL, *e_weights = NULL;
+ 
+     int weightflag = 0;
+-    int numflag = 0;
++    // int numflag = 0;
+     int nparts = ntasks - 1;
+ 
+     int edgecut;

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild b/sci-mathematics/netgen/netgen-5.3.1.ebuild
new file mode 100644
index 0000000..8a2f60b
--- /dev/null
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_PN=${PN}-mesher
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
+HOMEPAGE="http://www.hpfem.jku.at/netgen/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="-ffmpeg jpeg -mpi opencascade"
+
+DEPEND="
+	dev-tcltk/tix
+	dev-tcltk/togl:1.7
+	virtual/opengl
+	x11-libs/libXmu
+	opencascade? ( sci-libs/opencascade:* )
+	ffmpeg? ( media-video/ffmpeg )
+	jpeg? ( virtual/jpeg:0= )
+	mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
+RDEPEND="${DEPEND}"
+# Note, MPI has not be tested.
+
+src_prepare() {
+	# Adapted from http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
+	epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
+	epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# This is not the most clever way to deal with these flags
+	# but --disable-xxx does not seem to work correcly, so...
+	sed -i -e 's:-lTogl:-lTogl1.7:' ng/Makefile.am || die
+	local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
+
+	if use opencascade; then
+		myconf="${myconf} --enable-occ --with-occ=$CASROOT"
+		append-ldflags -L$CASROOT/lin/$(get_libdir)
+	fi
+	if use mpi; then
+		myconf="${myconf} --enable-parallel"
+		append-cppflags -I/usr/include/metis
+	fi
+	use ffmpeg && myconf="${myconf} --enable-ffmpeg"
+	use jpeg && myconf="${myconf} --enable-jpeglib"
+	append-cppflags -I/usr/include/togl-1.7
+
+	econf \
+		${myconf}
+
+	# This would be the more elegant way:
+# 	econf \
+# 		$(use_enable opencascade occ) \
+# 		$(use_with opencascade "occ=$CASROOT") \
+# 		$(use_enable mpi parallel) \
+# 		$(use_enable ffmpeg) \
+# 		$(use_enable jpeg jpeglib)
+}
+
+src_install() {
+	local NETGENDIR="/usr/share/netgen"
+
+	echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen
+	doenvd 99netgen
+
+	default
+	mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	elog "Please make sure to update your environment variables:"
+	elog "env-update && source /etc/profile"
+	elog "Netgen ebuild is still under development."
+	elog "Help us improve the ebuild in:"
+	elog "http://bugs.gentoo.org/show_bug.cgi?id=155424"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-15 12:15 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-15 12:15 [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-01-13 14:19 Andrew Ammerlaan
2016-02-22  8:38 Justin Lecher
2016-02-22  8:38 Justin Lecher
2016-02-22  8:38 Justin Lecher
2016-02-22  8:38 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox