[gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/

[Andrew Ammerlaan]

commit:     13a931675f33bc43925f70d7b1dcba9e6b859e1a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 11:45:09 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 11:45:09 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=13a93167

media-gfx/brlcad: version bump 7.32.4, many fixes

Closes: https://github.com/gentoo/sci/issues/748
Closes: https://github.com/gentoo/sci/issues/763
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{brlcad-7.32.0.ebuild => brlcad-7.32.4.ebuild} | 56 ++++++++++++++++------
 media-gfx/brlcad/brlcad-9999.ebuild                | 56 +++++++++++++++-------
 .../brlcad/files/brlcad-7.32.4-skip-gstep.patch    | 12 +++++
 media-gfx/brlcad/metadata.xml                      |  4 +-
 4 files changed, 94 insertions(+), 34 deletions(-)

diff --git a/media-gfx/brlcad/brlcad-7.32.0.ebuild b/media-gfx/brlcad/brlcad-7.32.4.ebuild
similarity index 61%
rename from media-gfx/brlcad/brlcad-7.32.0.ebuild
rename to media-gfx/brlcad/brlcad-7.32.4.ebuild
index eeaa56efd..aa70351e9 100644
--- a/media-gfx/brlcad/brlcad-7.32.0.ebuild
+++ b/media-gfx/brlcad/brlcad-7.32.4.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake desktop java-pkg-2 flag-o-matic
 
 DESCRIPTION="Constructive solid geometry modeling system"
-HOMEPAGE="https://brlcad.org/"
-SRC_URI="https://downloads.sourceforge.net/project/brlcad/BRL-CAD%20Source/${PV}/${P}.tar.gz"
+HOMEPAGE="https://brlcad.org/ https://github.com/BRL-CAD/brlcad"
+SRC_URI="https://github.com/BRL-CAD/${PN}/archive/refs/tags/rel-${PV//./-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel-${PV//./-}"
 
 LICENSE="LGPL-2 BSD"
 SLOT="0"
@@ -16,18 +17,21 @@ IUSE="benchmarks debug doc examples java opengl smp"
 
 RDEPEND="
 	java? (
-		>=virtual/jre-1.7:*
+		>=virtual/jre-1.8:*
 	)
 	"
 
 DEPEND="${RDEPEND}
+	dev-util/astyle
+	dev-util/re2c
 	>=sci-libs/tnt-3
+	sci-libs/proj
+	sci-libs/lemon
 	sys-devel/bison
 	sys-devel/flex
 	media-libs/libpng:0
-	<dev-lang/tcl-8.6:0/8.5
-	<dev-lang/tk-8.6:0/8.5
-	dev-tcltk/tktable
+	>=dev-lang/tcl-8.6:0/8.6
+	>=dev-lang/tk-8.6:0/8.6
 	sys-libs/zlib
 	sys-libs/libtermcap-compat
 	media-libs/urt
@@ -35,15 +39,19 @@ DEPEND="${RDEPEND}
 	x11-libs/libXi
 	java? (
 		sci-libs/jama
-		>=virtual/jre-1.7:*
+		>=virtual/jre-1.8:*
 	)
 	doc? (
 		dev-libs/libxslt
 		app-doc/doxygen
 	)"
 
+# Install into /usr/ not recommended by upstream due to possible file conflicts
+# with bundled libraries!
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
+PATCHES=( "${FILESDIR}/${P}-skip-gstep.patch" )
+
 src_prepare() {
 	cmake_src_prepare
 }
@@ -52,9 +60,9 @@ src_configure() {
 	append-cflags "-w"
 	if use debug; then
 		CMAKE_BUILD_TYPE=Debug
-		else
+	else
 		CMAKE_BUILD_TYPE=Release
-		fi
+	fi
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
 		-DBRLCAD_ENABLE_STRICT=NO
@@ -63,13 +71,31 @@ src_configure() {
 		-DBRLCAD_FLAGS_OPTIMIZATION=ON
 		-DBRLCAD_ENABLE_X11=ON
 		-DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON
+		-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=ON
+# requires itk/itcl version 3, not packaged, use bundled instead
+# 		-DBRLCAD_TKTABLE=OFF
+# 		-DBRLCAD_IWIDGETS=OFF
+# 		-DBRLCAD_ITCL=OFF
+# 		-DBRLCAD_ITK=OFF
+#		-DBRLCAD_TKPNG=OFF
+# Not packaged, use bundled
+# 		-DBRLCAD_GDIAM
+# 		-DBRLCAD_VDS
+# 		-DBRLCAD_SC
+# 		-DBRLCAD_OPENNURBS
+# 		-DBRLCAD_TKHTML
+# 		-DBRLCAD_UTAHRLE
+# 		-DBRLCAD_TERMLIB
+# 		-DBRLCAD_XMLLINT
+# 		-DBRLCAD_XSLTPROC
+# 		-DBRLCAD_PERPLEX
 	)
 
 	# use flag triggered options
 	if use debug; then
-		mycmakeargs+="-DCMAKE_BUILD_TYPE=Debug"
+		mycmakeargs+=( -DCMAKE_BUILD_TYPE="Debug" )
 	else
-		mycmakeargs+="-DCMAKE_BUILD_TYPE=Release"
+		mycmakeargs+=( -DCMAKE_BUILD_TYPE="Release" )
 	fi
 	mycmakeargs+=(
 		$(usex opengl BRLCAD_ENABLE_OPENGL)
@@ -104,8 +130,8 @@ src_install() {
 	echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
 	echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
 	doenvd 99brlcad
-	for size in 16,24,36,48,64,96,128,256; do
-		doicon misc/debian/${size}x${Size}/*
+	for size in {16,24,36,48,64,96,128,256}; do
+		doicon misc/debian/icons/${size}x${size}/*
 	done
 	domenu misc/debian/*.desktop
 }

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index c787f758f..5d6a345ce 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake desktop subversion java-pkg-2 flag-o-matic
+inherit cmake desktop git-r3 java-pkg-2 flag-o-matic
 
 DESCRIPTION="Constructive solid geometry modeling system"
-HOMEPAGE="https://brlcad.org/"
-ESVN_REPO_URI="https://brlcad.svn.sourceforge.net/svnroot/${PN}/${PN}/trunk"
+HOMEPAGE="https://brlcad.org/ https://github.com/BRL-CAD/brlcad"
+EGIT_REPO_URI="https://github.com/BRL-CAD/brlcad"
 
 LICENSE="LGPL-2 BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="benchmarks debug doc examples java opengl smp"
 
 RDEPEND="
 	java? (
-		>=virtual/jre-1.7:*
+		>=virtual/jre-1.8:*
 	)
 	"
 
 DEPEND="${RDEPEND}
+	dev-util/astyle
+	dev-util/re2c
 	>=sci-libs/tnt-3
+	sci-libs/proj
+	sci-libs/lemon
 	sys-devel/bison
 	sys-devel/flex
 	media-libs/libpng:0
-	<dev-lang/tcl-8.6:0/8.5
-	<dev-lang/tk-8.6:0/8.5
-	dev-tcltk/tktable
+	>=dev-lang/tcl-8.6:0/8.6
+	>=dev-lang/tk-8.6:0/8.6
 	sys-libs/zlib
 	sys-libs/libtermcap-compat
 	media-libs/urt
@@ -35,13 +37,15 @@ DEPEND="${RDEPEND}
 	x11-libs/libXi
 	java? (
 		sci-libs/jama
-		>=virtual/jre-1.7:*
+		>=virtual/jre-1.8:*
 	)
 	doc? (
 		dev-libs/libxslt
 		app-doc/doxygen
 	)"
 
+# Install into /usr/ not recommended by upstream due to possible file conflicts
+# with bundled libraries!
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
 src_prepare() {
@@ -52,9 +56,9 @@ src_configure() {
 	append-cflags "-w"
 	if use debug; then
 		CMAKE_BUILD_TYPE=Debug
-		else
+	else
 		CMAKE_BUILD_TYPE=Release
-		fi
+	fi
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
 		-DBRLCAD_ENABLE_STRICT=NO
@@ -63,13 +67,31 @@ src_configure() {
 		-DBRLCAD_FLAGS_OPTIMIZATION=ON
 		-DBRLCAD_ENABLE_X11=ON
 		-DBRLCAD_ENABLE_VERBOSE_PROGRESS=ON
+		-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=ON
+# requires itk/itcl version 3, not packaged, use bundled instead
+# 		-DBRLCAD_TKTABLE=OFF
+# 		-DBRLCAD_IWIDGETS=OFF
+# 		-DBRLCAD_ITCL=OFF
+# 		-DBRLCAD_ITK=OFF
+#		-DBRLCAD_TKPNG=OFF
+# Not packaged, use bundled
+# 		-DBRLCAD_GDIAM
+# 		-DBRLCAD_VDS
+# 		-DBRLCAD_SC
+# 		-DBRLCAD_OPENNURBS
+# 		-DBRLCAD_TKHTML
+# 		-DBRLCAD_UTAHRLE
+# 		-DBRLCAD_TERMLIB
+# 		-DBRLCAD_XMLLINT
+# 		-DBRLCAD_XSLTPROC
+# 		-DBRLCAD_PERPLEX
 	)
 
 	# use flag triggered options
 	if use debug; then
-		mycmakeargs+="-DCMAKE_BUILD_TYPE=Debug"
+		mycmakeargs+=( -DCMAKE_BUILD_TYPE="Debug" )
 	else
-		mycmakeargs+="-DCMAKE_BUILD_TYPE=Release"
+		mycmakeargs+=( -DCMAKE_BUILD_TYPE="Release" )
 	fi
 	mycmakeargs+=(
 		$(usex opengl BRLCAD_ENABLE_OPENGL)
@@ -104,8 +126,8 @@ src_install() {
 	echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
 	echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
 	doenvd 99brlcad
-	for size in 16,24,36,48,64,96,128,256; do
-		doicon misc/debian/${size}x${Size}/*
+	for size in {16,24,36,48,64,96,128,256}; do
+		doicon misc/debian/icons/${size}x${size}/*
 	done
 	domenu misc/debian/*.desktop
 }

diff --git a/media-gfx/brlcad/files/brlcad-7.32.4-skip-gstep.patch b/media-gfx/brlcad/files/brlcad-7.32.4-skip-gstep.patch
new file mode 100644
index 000000000..5768ad63a
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.32.4-skip-gstep.patch
@@ -0,0 +1,12 @@
+--- a/db/nist/CMakeLists.txt
++++ b/db/nist/CMakeLists.txt
+@@ -10,7 +10,8 @@ set(NIST_SAMPLE_MODELS
+ )
+ 
+ foreach(im ${NIST_SAMPLE_MODELS})
+-  ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
++#  disabled because this often segfaults
++#  ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
+ endforeach(im ${NIST_SAMPLE_MODELS})
+ 
+ CMAKEFILES(

diff --git a/media-gfx/brlcad/metadata.xml b/media-gfx/brlcad/metadata.xml
index 5a5505b09..51a1c2468 100644
--- a/media-gfx/brlcad/metadata.xml
+++ b/media-gfx/brlcad/metadata.xml
@@ -32,9 +32,9 @@ photon mapping.
 	<use>
 		<flag name="benchmarks">
 Run benchmarks during test phase (need test option enabled)
-</flag>
+		</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">brlcad</remote-id>
+		<remote-id type="github">BRL-CAD/brlcad</remote-id>
 	</upstream>
 </pkgmetadata>