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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2011-07-15 15:37 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2011-07-15 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     59e1dc1f059708654ec4b948e0d933a02d47ce58
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 15 15:37:30 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Fri Jul 15 15:37:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59e1dc1f

media-gfx/brlcad: Fixed a config time error when building

---
 media-gfx/brlcad/brlcad-7.20.2-r1.ebuild         |    4 ++++
 media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch |   19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
index 4905ca3..066edbc 100644
--- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cmake.patch"
+}
+
 src_configure() {
 		#waiting for upstream to fix itck/itk issues for cmake
 		#have to enable tcl/tk local build, otherwise cmake won't be able to link for

diff --git a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
new file mode 100644
index 0000000..7635211
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
@@ -0,0 +1,19 @@
+--- old/CMakeLists.txt	2011-07-14 16:14:18.053187225 -0400
++++ new/CMakeLists.txt  2011-07-14 16:14:39.073507247 -0400
+@@ -1187,14 +1187,14 @@
+ 	SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
+ 	SET(PATH_LABEL_LENGTH 0)
+ 	FOREACH(path_label ${PATH_LABELS})
+-		STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH)
+ 		if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH})
+ 			SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH})
+ 		endif()
+ 	ENDFOREACH()
+ 	FOREACH(path_label ${PATH_LABELS})
+ 		SET(CURRENT_LABEL ${${path_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
+ 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
\ No newline at end of file



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2011-08-10  0:33 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2011-08-10  0:33 UTC (permalink / raw
  To: gentoo-commits

commit:     43cea46b844c44ef2ea20f8b8dc9bbbb62ae7024
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Wed Aug 10 00:31:52 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Wed Aug 10 00:31:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=43cea46b

media-gfx/brlcad: fixed libpng-1.5, added version 9999 back

---
 media-gfx/brlcad/ChangeLog                         |    5 +-
 media-gfx/brlcad/brlcad-7.20.2-r1.ebuild           |    4 +-
 ...{brlcad-7.20.2-r1.ebuild => brlcad-9999.ebuild} |    5 +-
 media-gfx/brlcad/files/brlcad-9999-cmake.patch     |   11 +++++
 media-gfx/brlcad/files/png_patch.diff              |   48 ++++++++++++++++++++
 5 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 0f8d166..95fa300 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,9 +4,8 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
-  09 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.2-r1.ebuild:
-  No need to depend on cmake explicitly
-
+  09 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-9999.ebuild brlcad-7.20.2-r1.ebuild:
+  No need to depend on cmake explicitly, added patch for libpng-1.5, added the subversion version brlcad-9999.ebuild
 
   15 Jul 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.2-r1.ebuild:
   Patching of CMakeLists.txt still needed. Since upstream already fixed this problem, the patch won't be necessary after the current release 

diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
index de49dac..4a42be0 100644
--- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
@@ -45,6 +45,7 @@ BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-cmake.patch"
+	epatch "${FILESDIR}/png_patch.diff"
 }
 
 src_configure() {
@@ -63,13 +64,12 @@ src_configure() {
 		-DBRLCAD_BUILD_LOCAL_TKTABLE=OFF
 		-DBRLCAD_BUILD_LOCAL_PNG=OFF
 		-DBRLCAD_BUILD_LOCAL_REGEX=OFF
-		-DBRLCAD_BUILD_LOCAL_ZLIB=OFF
 		-DBRLCAD_BUILD_LOCAL_TERMLIB=OFF
 		-DBRLCAD_BUILD_LOCAL_UTAHRLE=OFF
 		-DBRLCAD_BUILD_LOCAL_SCL=OFF
 		-DBRLCAD-ENABLE_RTSERVER=OFF
 		-DBRLCAD-ENABLE_JOVE=OFF
-
+		-DBRLCAD_BUILD_LOCAL_ZLIB=OFF
 		-DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=ON
 		-DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=ON
 		-DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=ON

diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
similarity index 96%
copy from media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
copy to media-gfx/brlcad/brlcad-9999.ebuild
index de49dac..76d2544 100644
--- a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -3,12 +3,11 @@
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $
 
 EAPI=4
-inherit cmake-utils eutils
+inherit cmake-utils eutils subversion
 
 DESCRIPTION="Constructive solid geometry modeling system"
 HOMEPAGE="http://brlcad.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-# CMAKE_MIN_VERSION="2.8"
+ESVN_REPO_URI="https://brlcad.svn.sourceforge.net/svnroot/${PN}/${PN}/trunk"
 
 LICENSE="LGPL-2 BSD"
 SLOT="0"

diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
new file mode 100644
index 0000000..d85af69
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2011-08-09 16:41:03.073611709 -0400
++++ b/CMakeLists.txt	2011-08-09 16:41:22.943844346 -0400
+@@ -1221,7 +1221,7 @@
+ 	ENDFOREACH()
+ 	FOREACH(path_label ${PATH_LABELS})
+ 		SET(CURRENT_LABEL ${${path_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
+ 			STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)

diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/files/png_patch.diff
new file mode 100644
index 0000000..bdae6ba
--- /dev/null
+++ b/media-gfx/brlcad/files/png_patch.diff
@@ -0,0 +1,48 @@
+Index: src/other/libpng.dist
+===================================================================
+--- src/other/libpng.dist	(revision 45616)
++++ src/other/libpng.dist	(revision 45617)
+@@ -8,7 +8,6 @@
+ configure.ac
+ contrib
+ example.c
+-libpng-1.4.5.txt
+ libpng-config.in
+ libpng.3
+ libpng.pc.in
+Index: src/libged/png.c
+===================================================================
+--- src/libged/png.c	(revision 45616)
++++ src/libged/png.c	(revision 45617)
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include "bio.h"
+ 
++#include "zlib.h"
+ #include "png.h"
+ #include "bu.h"
+ #include "vmath.h"
+Index: src/fb/fb-png.c
+===================================================================
+--- src/fb/fb-png.c	(revision 45616)
++++ src/fb/fb-png.c	(revision 45617)
+@@ -38,6 +38,7 @@
+ #  include <unistd.h>
+ #endif
+ 
++#include "zlib.h"
+ #include "png.h"
+ #include "bu.h"
+ #include "fb.h"
+Index: src/util/pix-png.c
+===================================================================
+--- src/util/pix-png.c	(revision 45616)
++++ src/util/pix-png.c	(revision 45617)
+@@ -36,7 +36,6 @@
+ #include "bio.h"
+ 
+ #include "zlib.h"
+-#include "pngconf.h"
+ #include "png.h"
+ 
+ #include "bu.h"



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2011-09-26 14:42 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2011-09-26 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     44d4582768174b870467ada6faa89eb6fe9be554
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 14:35:27 2011 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 14:35:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=44d45827

media-gfx/brlcad: included patch for 7.20.2, bug#378273

---
 media-gfx/brlcad/ChangeLog                         |    3 +
 media-gfx/brlcad/brlcad-7.20.2.ebuild              |    3 +
 .../brlcad/files/brlcad-7.18.4-libpng15.patch      |   42 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 08295cf..3a0944d 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,6 +4,9 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
+  26 Sep 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.20.2.ebuild:
+  Included libpng15 patch by Ian Stakenvicius, bug#378273
+
   18 Aug 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Fixed an ebuild configuration issue
 

diff --git a/media-gfx/brlcad/brlcad-7.20.2.ebuild b/media-gfx/brlcad/brlcad-7.20.2.ebuild
index c473901..f554089 100644
--- a/media-gfx/brlcad/brlcad-7.20.2.ebuild
+++ b/media-gfx/brlcad/brlcad-7.20.2.ebuild
@@ -36,6 +36,9 @@ DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-7.18.4-libpng15.patch"
+}
 
 src_configure() {
 	local myconf="--without-jdk"

diff --git a/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
new file mode 100644
index 0000000..e0d42d1
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.18.4-libpng15.patch
@@ -0,0 +1,42 @@
+http://bugs.gentoo.org/378273
+
+--- src/libged/png.c
++++ src/libged/png.c
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #include "bio.h"
+ 
++#include <zlib.h> /* Z_BEST_COMPRESSION */
++
+ #include "png.h"
+ #include "bu.h"
+ #include "vmath.h"
+--- src/fb/fb-png.c	2011-04-12 14:31:56.000000000 -0400
++++ src/fb/fb-png.c.new	2011-09-19 13:18:08.000000000 -0400
+@@ -38,13 +38,13 @@
+ #  include <unistd.h>
+ #endif
+ 
++#include "zlib.h"
+ #include "png.h"
+ #include "bu.h"
+ #include "fb.h"
+ 
+ #include "pkg.h"
+ 
+-
+ /* in cmap-crunch.c */
+ extern void cmap_crunch(RGBpixel (*scan_buf), int pixel_ct, ColorMap *colormap);
+ 
+--- src/util/pix-png.c	2011-04-12 14:34:24.000000000 -0400
++++ src/util/pix-png.c.new	2011-09-19 13:18:59.000000000 -0400
+@@ -36,7 +36,8 @@
+ #include "bio.h"
+ 
+ #include "zlib.h"
+-#include "pngconf.h"
++/* removed as png.h includes this and including it in the wrong order seems to cause bugs
++#include "pngconf.h" */
+ #include "png.h"
+ 
+ #include "bu.h"



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2012-02-05 15:14 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2012-02-05 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     463bf69b4b08b44cca93888602132e9f9016aa94
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Sun Feb  5 15:14:22 2012 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Sun Feb  5 15:14:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=463bf69b

media-gfx/brlcad: version bumped 7.20.4

---
 media-gfx/brlcad/ChangeLog                       |    2 +-
 media-gfx/brlcad/brlcad-7.20.4.ebuild            |  112 ++++++++++++++++++++++
 media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch |   19 ----
 media-gfx/brlcad/files/png_patch.diff            |   48 ---------
 4 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 150102a..a1a1414 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,7 +4,7 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
-  16 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
+  5 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Use system libraries
 
   16 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.20.4.ebuild brlcad-9999.ebuild:

diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.20.4.ebuild
new file mode 100644
index 0000000..f150a45
--- /dev/null
+++ b/media-gfx/brlcad/brlcad-7.20.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $
+
+EAPI=4
+inherit cmake-utils eutils java-pkg-2 flag-o-matic
+
+DESCRIPTION="Constructive solid geometry modeling system"
+HOMEPAGE="http://brlcad.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="benchmarks debug doc examples java opengl smp"
+
+RDEPEND="media-libs/libpng
+	sys-libs/zlib
+	>=sci-libs/tnt-3
+	sci-libs/jama
+	>=dev-lang/tcl-8.5
+	>=dev-lang/tk-8.5
+	=dev-tcltk/itcl-3.4*
+	=dev-tcltk/itk-3.4*
+	dev-tcltk/iwidgets
+	dev-tcltk/tkimg
+	dev-tcltk/tkpng
+	sys-libs/libtermcap-compat
+	media-libs/urt
+	x11-libs/libXt
+	x11-libs/libXi
+	java? ( >=virtual/jre-1.5 )
+	"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-tcltk/tktable
+	>=virtual/jre-1.5
+	doc? (
+		dev-libs/libxslt
+		app-doc/doxygen
+	)"
+
+BRLCAD_DIR="${EPREFIX}/usr/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9999-cmake.patch"
+}
+
+src_configure() {
+filter-flags -std=c++0x
+filter-ldflags -Wl,--as-needed
+	if use Debug; then
+		CMAKE_BUILD_TYPE=Debug
+		else
+		CMAKE_BUILD_TYPE=Release
+		fi
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
+		-DBRLCAD_ENABLE_STRICT=OFF
+		-DBRLCAD-ENABLE_STRICT=OFF
+		-DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF
+		-DBRLCAD_FLAGS_OPTIMIZATION=ON
+		-DBRLCAD_ENABLE_X11=ON
+		-DBRLCAD_BUNDLED_LIBS=AUTO
+		)
+
+			# use flag triggered options
+	if use debug; then
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+	else
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
+#experimental RTGL support
+	#	$(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
+		$(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
+		$(cmake-utils_use smp BRLCAD_ENABLE_SMP)
+	#	$(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
+		$(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
+		$(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS)
+			)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+	#emake check || die "emake check failed"
+	if use benchmarks; then
+		emake benchmark || die "emake benchmark failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -f "${D}"usr/share/brlcad/{README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
+	dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
+	echo "PATH=\"${BRLCAD_DIR}/bin\"" >  99brlcad
+	echo "MANPATH=\"${BRLCAD_DIR}/man\"" >> 99brlcad
+	doenvd 99brlcad || die
+	newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png
+	make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
+}

diff --git a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
deleted file mode 100644
index 7635211..0000000
--- a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- old/CMakeLists.txt	2011-07-14 16:14:18.053187225 -0400
-+++ new/CMakeLists.txt  2011-07-14 16:14:39.073507247 -0400
-@@ -1187,14 +1187,14 @@
- 	SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
- 	SET(PATH_LABEL_LENGTH 0)
- 	FOREACH(path_label ${PATH_LABELS})
--		STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH)
-+		STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH)
- 		if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH})
- 			SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH})
- 		endif()
- 	ENDFOREACH()
- 	FOREACH(path_label ${PATH_LABELS})
- 		SET(CURRENT_LABEL ${${path_label}_LABEL})
--		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
- 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
- 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
- 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
\ No newline at end of file

diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/files/png_patch.diff
deleted file mode 100644
index bdae6ba..0000000
--- a/media-gfx/brlcad/files/png_patch.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: src/other/libpng.dist
-===================================================================
---- src/other/libpng.dist	(revision 45616)
-+++ src/other/libpng.dist	(revision 45617)
-@@ -8,7 +8,6 @@
- configure.ac
- contrib
- example.c
--libpng-1.4.5.txt
- libpng-config.in
- libpng.3
- libpng.pc.in
-Index: src/libged/png.c
-===================================================================
---- src/libged/png.c	(revision 45616)
-+++ src/libged/png.c	(revision 45617)
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include "bio.h"
- 
-+#include "zlib.h"
- #include "png.h"
- #include "bu.h"
- #include "vmath.h"
-Index: src/fb/fb-png.c
-===================================================================
---- src/fb/fb-png.c	(revision 45616)
-+++ src/fb/fb-png.c	(revision 45617)
-@@ -38,6 +38,7 @@
- #  include <unistd.h>
- #endif
- 
-+#include "zlib.h"
- #include "png.h"
- #include "bu.h"
- #include "fb.h"
-Index: src/util/pix-png.c
-===================================================================
---- src/util/pix-png.c	(revision 45616)
-+++ src/util/pix-png.c	(revision 45617)
-@@ -36,7 +36,6 @@
- #include "bio.h"
- 
- #include "zlib.h"
--#include "pngconf.h"
- #include "png.h"
- 
- #include "bu.h"



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2012-02-11 17:14 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2012-02-11 17:14 UTC (permalink / raw
  To: gentoo-commits

commit:     020bd97580650a69a090a88ba4fc1f999f70e891
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 11 17:14:07 2012 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Sat Feb 11 17:14:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=020bd975

media-gfx/brlcad: fixed as-needed filtering

---
 media-gfx/brlcad/ChangeLog                     |    3 +++
 media-gfx/brlcad/brlcad-9999.ebuild            |    2 +-
 media-gfx/brlcad/files/brlcad-9999-cmake.patch |   22 +++++++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index a1a1414..a360494 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,6 +4,9 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
+  11 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
+  Fixed building error
+
   5 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Use system libraries
 

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index 6fbcf2a..1f841c2 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 
 src_configure() {
 filter-flags -std=c++0x
-filter-ldflags -Wl,--as-needed
+	append-ldflags $(no-as-needed)
 	if use Debug; then
 		CMAKE_BUILD_TYPE=Debug
 		else

diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
index d85af69..17a63d6 100644
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch
+++ b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
@@ -1,11 +1,11 @@
---- a/CMakeLists.txt	2011-08-09 16:41:03.073611709 -0400
-+++ b/CMakeLists.txt	2011-08-09 16:41:22.943844346 -0400
-@@ -1221,7 +1221,7 @@
- 	ENDFOREACH()
- 	FOREACH(path_label ${PATH_LABELS})
- 		SET(CURRENT_LABEL ${${path_label}_LABEL})
--		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
- 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
- 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
- 			STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+--- brlcad-9999/CMakeLists.txt	2012-02-11 11:37:28.287828624 -0500
++++ brlcad-9999/CMakeLists.txt	2012-02-11 11:37:54.018158044 -0500
+@@ -1586,7 +1586,7 @@
+   endforeach()
+   foreach(path_label ${PATH_LABELS})
+     set(CURRENT_LABEL ${${path_label}_LABEL})
+-    string(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++    string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+     while(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+       set(CURRENT_LABEL " ${CURRENT_LABEL}")
+       string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2012-03-27 22:06 Dongxu Li
  0 siblings, 0 replies; 8+ messages in thread
From: Dongxu Li @ 2012-03-27 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b64928a90773b0299f09f1ff5c30539289f5b0c4
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 27 22:04:55 2012 +0000
Commit:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
CommitDate: Tue Mar 27 22:06:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b64928a9

media-gfx/brlcad: added a missing patch

---
 media-gfx/brlcad/.brlcad-7.20.2.ebuild.swp       |  Bin 0 -> 12288 bytes
 media-gfx/brlcad/ChangeLog                       |    5 ++++-
 media-gfx/brlcad/brlcad-9999.ebuild              |    4 ----
 media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch |   20 ++++++++++++++++++++
 media-gfx/brlcad/files/brlcad-9999-cmake.patch   |   11 -----------
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/media-gfx/brlcad/.brlcad-7.20.2.ebuild.swp b/media-gfx/brlcad/.brlcad-7.20.2.ebuild.swp
new file mode 100644
index 0000000..3b64b03
Binary files /dev/null and b/media-gfx/brlcad/.brlcad-7.20.2.ebuild.swp differ

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 5094a8a..a22b70a 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -2,7 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $
 
-*brlcad-7.20.2 (15 Jul 2011)
+*brlcad-7.20.4 (27 Mar 2012)
+
+  27 Mar 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild +files/brlcad-7.20.4-cmake.patch:
+  added missing patch for 7.20.4
 
   12 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> -brlcad-7.20.2.ebuild brlcad-7.20.4.ebuild:
   Removed 7.20.2 for building issues. Fixed 7.20.4 for as-needed

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index 1f841c2..e7cfb1c 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -44,10 +44,6 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cmake.patch"
-}
-
 src_configure() {
 filter-flags -std=c++0x
 	append-ldflags $(no-as-needed)

diff --git a/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
new file mode 100644
index 0000000..1dd79c2
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
@@ -0,0 +1,20 @@
+--- brlcad-7.20.4/CMakeLists.txt	2012-02-11 22:21:21.407311510 -0500
++++ brlcad-7.20.4/CMakeLists.txt	2012-02-11 22:21:33.220804265 -0500
+@@ -1394,7 +1394,7 @@
+ 	ENDFOREACH()
+ 	FOREACH(path_label ${PATH_LABELS})
+ 		SET(CURRENT_LABEL ${${path_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
+ 			STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+@@ -1436,7 +1436,7 @@
+ 	ENDFOREACH()
+ 	FOREACH(setting_label ${SETTINGLABELS})
+ 		SET(CURRENT_LABEL ${${setting_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL "${CURRENT_LABEL} ")
+ 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)

diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
deleted file mode 100644
index 17a63d6..0000000
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- brlcad-9999/CMakeLists.txt	2012-02-11 11:37:28.287828624 -0500
-+++ brlcad-9999/CMakeLists.txt	2012-02-11 11:37:54.018158044 -0500
-@@ -1586,7 +1586,7 @@
-   endforeach()
-   foreach(path_label ${PATH_LABELS})
-     set(CURRENT_LABEL ${${path_label}_LABEL})
--    string(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+    string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
-     while(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
-       set(CURRENT_LABEL " ${CURRENT_LABEL}")
-       string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2012-03-29  9:07 Justin Lecher
  0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2012-03-29  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     8fbb6bf05b4682333c44cd57e3f47b09413ad75f
Author:     Dongxu Li <dongxuli2011 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 27 21:58:47 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 21:58:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8fbb6bf0

media-gfx/brlcad: added missing patch

---
 media-gfx/brlcad/ChangeLog                       |    5 ++++-
 media-gfx/brlcad/brlcad-9999.ebuild              |    4 ----
 media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch |   20 ++++++++++++++++++++
 media-gfx/brlcad/files/brlcad-9999-cmake.patch   |   11 -----------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 5094a8a..a22b70a 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -2,7 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $
 
-*brlcad-7.20.2 (15 Jul 2011)
+*brlcad-7.20.4 (27 Mar 2012)
+
+  27 Mar 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild +files/brlcad-7.20.4-cmake.patch:
+  added missing patch for 7.20.4
 
   12 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> -brlcad-7.20.2.ebuild brlcad-7.20.4.ebuild:
   Removed 7.20.2 for building issues. Fixed 7.20.4 for as-needed

diff --git a/media-gfx/brlcad/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index 1f841c2..e7cfb1c 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -44,10 +44,6 @@ DEPEND="${RDEPEND}
 
 BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-cmake.patch"
-}
-
 src_configure() {
 filter-flags -std=c++0x
 	append-ldflags $(no-as-needed)

diff --git a/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
new file mode 100644
index 0000000..1dd79c2
--- /dev/null
+++ b/media-gfx/brlcad/files/brlcad-7.20.4-cmake.patch
@@ -0,0 +1,20 @@
+--- brlcad-7.20.4/CMakeLists.txt	2012-02-11 22:21:21.407311510 -0500
++++ brlcad-7.20.4/CMakeLists.txt	2012-02-11 22:21:33.220804265 -0500
+@@ -1394,7 +1394,7 @@
+ 	ENDFOREACH()
+ 	FOREACH(path_label ${PATH_LABELS})
+ 		SET(CURRENT_LABEL ${${path_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
+ 			STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+@@ -1436,7 +1436,7 @@
+ 	ENDFOREACH()
+ 	FOREACH(setting_label ${SETTINGLABELS})
+ 		SET(CURRENT_LABEL ${${setting_label}_LABEL})
+-		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
++		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
+ 		WHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
+ 			SET(CURRENT_LABEL "${CURRENT_LABEL} ")
+ 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)

diff --git a/media-gfx/brlcad/files/brlcad-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
deleted file mode 100644
index 17a63d6..0000000
--- a/media-gfx/brlcad/files/brlcad-9999-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- brlcad-9999/CMakeLists.txt	2012-02-11 11:37:28.287828624 -0500
-+++ brlcad-9999/CMakeLists.txt	2012-02-11 11:37:54.018158044 -0500
-@@ -1586,7 +1586,7 @@
-   endforeach()
-   foreach(path_label ${PATH_LABELS})
-     set(CURRENT_LABEL ${${path_label}_LABEL})
--    string(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+    string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
-     while(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
-       set(CURRENT_LABEL " ${CURRENT_LABEL}")
-       string(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/
@ 2022-01-12 11:46 Andrew Ammerlaan
  0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2022-01-12 11:46 UTC (permalink / raw
  To: gentoo-commits

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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-01-12 11:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-10  0:33 [gentoo-commits] proj/sci:master commit in: media-gfx/brlcad/files/, media-gfx/brlcad/ Dongxu Li
  -- strict thread matches above, loose matches on Subject: below --
2022-01-12 11:46 Andrew Ammerlaan
2012-03-29  9:07 Justin Lecher
2012-03-27 22:06 Dongxu Li
2012-02-11 17:14 Dongxu Li
2012-02-05 15:14 Dongxu Li
2011-09-26 14:42 Dongxu Li
2011-07-15 15:37 Dongxu Li

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