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

["Dongxu Li" <dongxuli2011@gmail.com>]

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"