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

6 files changed, 190 insertions, 7 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 0f8d1664a..95fa30042 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/Manifest b/media-gfx/brlcad/Manifest
index 539be4627..19308c586 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,6 +1,9 @@
 AUX brlcad-7.20.2-cmake.patch 855 RMD160 a5cdfe4f00113631c677662a6b05d9008ec96959 SHA1 4944966b897e3d89f6815db5164c975f432d0a0c SHA256 98f121ca6b78207f583ed70952ffa29c82787fd1febbaa781cf37a33a316d1f2
+AUX brlcad-9999-cmake.patch 488 RMD160 51c1eaa27d2248f186746ad1b1b9c5ee32a9abbf SHA1 8f1e9ec4860bd9212892a185eafcfcd20137d328 SHA256 0131261e5ca51aeef5381e528feda1b5b4e24510c65f93861cb4d2ab1e4032b1
+AUX png_patch.diff 1171 RMD160 6faea89e2fcd65b5dc48e82a3cd343e4aba5b104 SHA1 509a912d0114599dcc600601d4eac04e614946b3 SHA256 066d0aec82e7e72d51d7dd3f5b12ce722e21e2b79382256e7e09aeb9a6a2a7e0
 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca
-EBUILD brlcad-7.20.2-r1.ebuild 3512 RMD160 f2912cc0ccdd7f60240527124b2dcd24fff14d34 SHA1 c86e614a15b7e21106db2cde2ca0f65a550a6a75 SHA256 1894f59d5c45ac29ba9eac5585298c038ef81def0f2023066bb9614670aadc1d
+EBUILD brlcad-7.20.2-r1.ebuild 3548 RMD160 0bebb71647cc17c38b1b6a9dae19bd840437ef69 SHA1 758b59511d903251a42c09f1986fb167e77c170c SHA256 adaf01174244ecf5cb6b39adc3f42a21d06e45cca9023b857b5435b8bb808002
 EBUILD brlcad-7.20.2.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4
-MISC ChangeLog 3994 RMD160 75d5aed7a3bb6afc64bd54b81688774c44d2cbaa SHA1 81aed964803e2b9e0311df086256bd9eb63d7b58 SHA256 1c11c844600cfe6c16a4fb93860752fb7990d0cc4ce895f0baa22c45aff338df
+EBUILD brlcad-9999.ebuild 3525 RMD160 d751d025c898a4b2af235e9cf0f47a4320e2f560 SHA1 e77768b4a4d078bb387b96ed90ef2bb016dd7fc2 SHA256 cbbfe6ca0ff4384cb7377b3e823171c6e00e68f15e41926d9d56a65e9e68de02
+MISC ChangeLog 4090 RMD160 8f8bc2eace4ec11bfa413f6a17d2da6cd22ee10c SHA1 60bf3d6ffe3df28dd8245ab93d527b7c78d9c742 SHA256 80fdceba558b4c4ca193177a1ff161282733af28da5eada53febcb5606a11806
 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d
diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
index de49dacda..4a42be013 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-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
new file mode 100644
index 000000000..76d25444d
--- /dev/null
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -0,0 +1,122 @@
+# 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 subversion
+
+DESCRIPTION="Constructive solid geometry modeling system"
+HOMEPAGE="http://brlcad.org/"
+ESVN_REPO_URI="https://brlcad.svn.sourceforge.net/svnroot/${PN}/${PN}/trunk"
+
+LICENSE="LGPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="benchmarks debug doc examples opengl smp"
+
+RDEPEND="media-libs/libpng
+	sys-libs/zlib
+	>=sci-libs/tnt-3
+	sci-libs/jama
+	=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}/${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
+		# -litcl -litk
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
+		-DBRLCAD-ENABLE_STRICT=OFF
+		-DBRLCAD_BUILD_LOCAL_OPENNURBS=ON
+		-DBUILD_STATIC_LIBS=OFF
+		-DBRLCAD-ENABLE_X11=ON
+		-DBRLCAD_BUILD_LOCAL_INCRTCL=OFF
+		-DBRLCAD_BUILD_LOCAL_TKHTML=OFF
+		-DBRLCAD_BUILD_LOCAL_TKPNG=OFF
+		-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_IWIDGETS_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_ITCL_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_ITK_FORCE_ON=ON
+
+		)
+
+			# use flag triggered options
+	if use debug; then
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+	else
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use amd64 BRLCAD-ENABLE_64BIT)
+		$(cmake-utils_use aqua BRLCAD-ENABLE_AQUA)
+		$(cmake-utils_use examples BRLCAD-INSTALL_EXAMPLE_GEOMETRY)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_PDF)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_MAN)
+		$(cmake-utils_use opengl BRLCAD-ENABLE_OPENGL)
+		$(cmake-utils_use smp BRLCAD-ENABLE_SMP)
+		$(cmake-utils_use debug BRLCAD-ENABLE_VERBOSE_PROGRESS)
+#			$(cmake-utils_use !debug BRLCAD-ENABLE_OPTIMIZED_BUILD)
+#			$(cmake-utils_use !debug )
+#			$(cmake-utils_use debug BRLCAD-ENABLE_DEBUG_BUILD)
+#			$(cmake-utils_use debug BRLCAD-ENABLE_RUNTIME_DEBUG)
+#			$(cmake-utils_use debug BRLCAD-ENABLE_COMPILER_WARNINGS_LABEL)
+			)
+	cmake-utils_src_configure
+}
+
+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-9999-cmake.patch b/media-gfx/brlcad/files/brlcad-9999-cmake.patch
new file mode 100644
index 000000000..d85af6954
--- /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 000000000..bdae6ba53
--- /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"