diff options
author | Oliver Borm (oli) <oli.borm@web.de> | 2009-11-11 09:57:39 +0000 |
---|---|---|
committer | Oliver Borm (oli) <oli.borm@web.de> | 2009-11-11 09:57:39 +0000 |
commit | edbf1a8ec6240a9561bd5de8fa808e36b347ecb3 (patch) | |
tree | 0df51315498b3919607210eea55a9e0be1595f67 /sci-libs | |
parent | sunrise/ net-print/xerox-drivers: Deleting net-print/xerox-drivers from sunri... (diff) | |
download | sunrise-edbf1a8ec6240a9561bd5de8fa808e36b347ecb3.tar.gz sunrise-edbf1a8ec6240a9561bd5de8fa808e36b347ecb3.tar.bz2 sunrise-edbf1a8ec6240a9561bd5de8fa808e36b347ecb3.zip |
sci-libs/nurbs++: added doc USE-flag, gcc-4.4 patch, changed to EAPI=2, fixed Homepage
svn path=/sunrise/; revision=9501
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/nurbs++/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/nurbs++/Manifest | 9 | ||||
-rw-r--r-- | sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch | 10 | ||||
-rw-r--r-- | sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch.bz2 | bin | 0 -> 13505 bytes | |||
-rw-r--r-- | sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.4.patch | 59 | ||||
-rw-r--r-- | sci-libs/nurbs++/files/nurbs++-3.0.11-linker.patch | 41 | ||||
-rw-r--r-- | sci-libs/nurbs++/nurbs++-3.0.11.ebuild | 41 |
7 files changed, 136 insertions, 32 deletions
diff --git a/sci-libs/nurbs++/ChangeLog b/sci-libs/nurbs++/ChangeLog index 33fff6df8..a6f5f24d2 100644 --- a/sci-libs/nurbs++/ChangeLog +++ b/sci-libs/nurbs++/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-libs/nurbs++ -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Nov 2009; Oliver Borm (boroli) <oli.borm@web.de> nurbs++-3.0.11.ebuild, + -files/nurbs++-3.0.11-gcc-4.3.patch, + +files/nurbs++-3.0.11-gcc-4.3.patch.bz2, + +files/nurbs++-3.0.11-gcc-4.4.patch, +files/nurbs++-3.0.11-linker.patch: + added doc USE-flag, gcc-4.4 patch, changed to EAPI=2, fixed Homepage + 15 Dec 2008; Oliver Borm (boroli) <oli.borm@web.de> nurbs++-3.0.11.ebuild, +files/nurbs++-3.0.11-gcc-4.3.patch: Corrected typo and added gcc-4.3 support diff --git a/sci-libs/nurbs++/Manifest b/sci-libs/nurbs++/Manifest index d6c5b778d..6a9ee191f 100644 --- a/sci-libs/nurbs++/Manifest +++ b/sci-libs/nurbs++/Manifest @@ -1,6 +1,7 @@ -AUX nurbs++-3.0.11-gcc-4.3.patch 300 RMD160 30b39cd188f6b0dcb25d3020be373bca57608b6c SHA1 b45af75fcbfeae975a45e0d53bfcd58a8fe56c22 SHA256 dd50d023ef0a8a3e2935b6e67074c2a817129df040ee786abf99becef3edd216 -DIST nurbs++-3.0.11-gcc-4.1.patch.bz2 13220 RMD160 78403d2ab8d646637435d7ca04e4c77405a51b19 SHA1 29cc80c224935a3ae3ea226aa0ed9964d6b8c0a4 SHA256 7f0c28ed8e4860b6c28d2453b9a64be7bc32a9760ccb0f722f6a2cd9ba3dff19 +AUX nurbs++-3.0.11-gcc-4.3.patch.bz2 13505 RMD160 0d8615c305284e0c7aff697df58e6e6c4a0db2d0 SHA1 640533dc5090dbff1ba99b4301c62e06b3553c40 SHA256 489debe11071b279fd390f366004b88af242e4c9ffcbfb9055c86c95add6e34e +AUX nurbs++-3.0.11-gcc-4.4.patch 2789 RMD160 2aedf011a51a5cde2fd41b24f91b6c42644775c3 SHA1 80ca9f479efc4169dd50de3dbdbbb6ad05721bc6 SHA256 02c9f215992c16610deddafab0e78bd1fe3d4edc50041a224afe336a3e751191 +AUX nurbs++-3.0.11-linker.patch 1618 RMD160 75609acaaf9e6e31b55fe617e15196a18550b3ab SHA1 b84d4fd685f2383ef040537dcaab08a4a18f2658 SHA256 0b33dab739e356f90aa55cf87e431859340362e02e5f5cdb70759030e0813652 DIST nurbs++-3.0.11.tar.bz2 391439 RMD160 bc0da90da3a19154efe3356191ccc8bbbff5332f SHA1 0e0213294c26651c791bcb2e3e2602860e474511 SHA256 61691c401353e5c3bf70f63bc18ce07cefdc802d5abff637f02ea2c86f74fbfe -EBUILD nurbs++-3.0.11.ebuild 914 RMD160 7942aa4ced52af81dc6c34c99b7672b1ad73a08a SHA1 eb6ad5d9d96124bb0e767fb8336c8a68203bbdfd SHA256 c13b02b32c3c0d16328ed19118cb48efb4b4f96ec00c8ec20d11121133964fc0 -MISC ChangeLog 1001 RMD160 e4016c7eb177e981de4338537acbcf00f52d1916 SHA1 4e724105e673b2ed8fd28f4b7b6af2541c6e4cf2 SHA256 d2e2e21ffbfd726a32157ddc2fd30513ab9b4677b128c6e506aeb3f4cdc017d1 +EBUILD nurbs++-3.0.11.ebuild 980 RMD160 1e26301ca3f9a479b3f2531a13c2affa028ffc6d SHA1 2efbbd3cf50ac4611afb9737434a79164e646769 SHA256 c59efde3ee3ebd2f540dcb63660565e3b862d21c8bf00af78ba4b15eefa7f063 +MISC ChangeLog 1307 RMD160 fef2ac4602e4bef810e518493ea3132cd71c5c6f SHA1 2a951ee4ced695714e07b88c9401866a37a28059 SHA256 998836c45be6cafc2068c028311dafd48285cc83894bb2580c9d97818d004719 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch b/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch deleted file mode 100644 index eceb05cdc..000000000 --- a/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nurbs++-3.0.11/nurbs/nurbsGL.cpp.orig 2008-12-15 13:46:03.000000000 +0100 -+++ nurbs++-3.0.11/nurbs/nurbsGL.cpp 2008-12-15 13:46:03.000000000 +0100 -@@ -26,7 +26,7 @@ - #include <nurbsGL.h> - #include <string.h> - #include <stdio.h> --#include <iostream.h> -+#include <iostream> - - #ifdef WITH_OPENGL diff --git a/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch.bz2 b/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch.bz2 Binary files differnew file mode 100644 index 000000000..7e6a5dfec --- /dev/null +++ b/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.3.patch.bz2 diff --git a/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.4.patch b/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.4.patch new file mode 100644 index 000000000..eac4a1f05 --- /dev/null +++ b/sci-libs/nurbs++/files/nurbs++-3.0.11-gcc-4.4.patch @@ -0,0 +1,59 @@ +--- nurbs/nurbs.h 2009-06-06 12:17:03.000000000 +1000 ++++ nurbs/nurbs.h.new 2009-06-06 12:16:55.000000000 +1000 +@@ -105,8 +105,8 @@ + + // Basis functions + T basisFun(T u, int i, int p=-1) const ; +- void basisFuns(T u, int span, Vector<T>& N) const ; +- void dersBasisFuns(int n,T u, int span, Matrix<T>& N) const; ++ void basisFuns(T u, int span, Vector<T>& Nd)const ; ++ void dersBasisFuns(int n,T u, int span, Matrix<T>& Nd) const; + + // Knot functions + T minKnot() const //! the minimal value for the knot vector +--- nurbs/nurbsS.cpp 2009-06-05 23:18:28.000000000 +1000 ++++ nurbs/nurbsS.cpp.new 2009-06-05 23:21:09.000000000 +1000 +@@ -4082,7 +4082,7 @@ + + char front[1024] ; + +- char *ext ; ++ const char *ext ; + ext = strstr(filename,".rib") ; + if(ext){ + for(i=0;i<1024;++i){ +--- nurbs/nurbsS.h 2009-06-06 12:18:02.000000000 +1000 ++++ nurbs/nurbsS.h.new 2009-06-06 12:17:58.000000000 +1000 +@@ -99,8 +99,8 @@ + virtual HPoint_nD<T,N> operator()(T u, T v) const ; + + void basisFuns(T u, T v, int spanU, int spanV, Vector<T>& Nu, Vector<T>& Nv) const ; +- void basisFunsU(T u, int span, Vector<T>& N) const ; +- void basisFunsV(T u, int span, Vector<T>& N) const ; ++ void basisFunsU(T u, int span, Vector<T>& Nd) const ; ++ void basisFunsV(T u, int span, Vector<T>& Nd) const ; + void dersBasisFuns(T u, T v, int dU, int dV,int uspan, int vspan,Matrix<T> & Niku, Matrix<T>& Njkv ) const ; + + // Derivative functions +@@ -135,8 +135,8 @@ + int skinU(NurbsCurveArray<T,N>& ca, int degU); + void sweep(const NurbsCurve<T,N>& t, const NurbsCurve<T,N>& C, const NurbsCurve<T,N>& Sv, int K,int useAy=0, int invAz=0) ; + void sweep(const NurbsCurve<T,N>& t, const NurbsCurve<T,N>& C, int K,int useAy=0, int invAz=0) ; +- void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T, double theta) ; +- void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& T) ; ++ void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& Ta, double theta) ; ++ void makeFromRevolution(const NurbsCurve<T,N>& profile, const Point_nD<T,N>& S, const Point_nD<T,N>& Ta) ; + void makeFromRevolution(const NurbsCurve<T,N>& profile) ; + + void makeSphere(const Point_nD<T,N>& O, T r) ; +--- nurbs/nurbsGL.cpp 2009-06-06 15:12:23.000000000 +1000 ++++ nurbs/nurbsGL.cpp.new 2009-06-06 15:12:20.000000000 +1000 +@@ -1459,7 +1459,7 @@ + NurbsGL* readNurbsObject(const char* filename) { + NurbsGL *temp ; + // guess the type of the curve first, if that doesn't work try all of them +- char* ext ; ++ const char* ext ; + //ext = strstr(filename,".n()ca") ; + //if(ext){ + // openByType = OPENCURVEARRAY ; diff --git a/sci-libs/nurbs++/files/nurbs++-3.0.11-linker.patch b/sci-libs/nurbs++/files/nurbs++-3.0.11-linker.patch new file mode 100644 index 000000000..e2697f1ad --- /dev/null +++ b/sci-libs/nurbs++/files/nurbs++-3.0.11-linker.patch @@ -0,0 +1,41 @@ +--- nurbs/Makefile.am 2009-07-07 22:32:45.000000000 +1000 ++++ nurbs/Makefile.am.new 2009-07-07 22:33:16.000000000 +1000 +@@ -44,7 +44,7 @@ + + lib_LTLIBRARIES = libnurbsf.la libnurbsd.la + libnurbsf_la_SOURCES = $(float_sources) +-libnurbsf_la_LDFLAGS = $(ldflags) ++libnurbsf_la_LDFLAGS = $(ldflags) -lmatrix -lmatrixN -lmatrixI + libnurbsd_la_SOURCES = $(double_sources) +-libnurbsd_la_LDFLAGS = $(ldflags) ++libnurbsd_la_LDFLAGS = $(ldflags) -lmatrix -lmatrixN -lmatrixI + +--- image/Makefile.am 2002-05-14 06:04:34.000000000 +1000 ++++ image/Makefile.am.new 2009-07-09 00:21:55.000000000 +1000 +@@ -9,4 +9,4 @@ + + lib_LTLIBRARIES = libmatrixI.la + libmatrixI_la_SOURCES = color.cpp image_.cpp rec_filter_.cpp filter_.cpp +-libmatrixI_la_LDFLAGS = -version-info 1:0:0 ++libmatrixI_la_LDFLAGS = -version-info 1:0:0 -lmatrix + +--- numerical/Makefile.am 2002-05-14 06:04:38.000000000 +1000 ++++ numerical/Makefile.am.new 2009-07-09 00:22:24.000000000 +1000 +@@ -6,5 +6,5 @@ + + lib_LTLIBRARIES = libmatrixN.la + libmatrixN_la_SOURCES = matrixMat_.cpp fft_.cpp chebexp_.cpp intccq_.cpp statistic_.cpp +-libmatrixN_la_LDFLAGS = -version-info 1:0:0 ++libmatrixN_la_LDFLAGS = -version-info 1:0:0 -lmatrix + +--- Doxyfile.in 2009-11-11 09:20:32.000000000 +0100 ++++ Doxyfile.in.new 2009-11-11 09:20:14.000000000 +0100 +@@ -123,7 +123,7 @@ + # and *.h) to filter out the source-files in the directories. If left + # blank all files are included. + +-FILE_PATTERNS = *.hh *.cc ++FILE_PATTERNS = + + # The EXAMPLE_PATH tag can be used to specify one or more files or + # directories that contain example code fragments that are included (see diff --git a/sci-libs/nurbs++/nurbs++-3.0.11.ebuild b/sci-libs/nurbs++/nurbs++-3.0.11.ebuild index 4ca1d626e..d9a3454f5 100644 --- a/sci-libs/nurbs++/nurbs++-3.0.11.ebuild +++ b/sci-libs/nurbs++/nurbs++-3.0.11.ebuild @@ -2,39 +2,46 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit libtool eutils +EAPI="2" -DESCRIPTION="This C++ library provides the basic methods for Non-Uniform Rational B-Splines (NURBS)." -HOMEPAGE="http://libnurbs.sourceforge.net/" -SRC_URI="mirror://sourceforge/libnurbs/${P}.tar.bz2 - http://dev.gentooexperimental.org/~jokey/sunrise-dist/${P}-gcc-4.1.patch.bz2" +inherit autotools eutils + +DESCRIPTION="Non Uniform Rational Basis Spline (NURBS) library for C++" +HOMEPAGE="http://libnurbs.sourceforge.net/index.shtml" +SRC_URI="mirror://sourceforge/libnurbs/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug" +IUSE="debug doc" -DEPEND="dev-lang/perl" +DEPEND="dev-lang/perl + doc? ( app-doc/doxygen ) " RDEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/${P}-gcc-4.1.patch - epatch "${FILESDIR}"/${P}-gcc-4.3.patch - elibtoolize +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc-4.3.patch.bz2 + epatch "${FILESDIR}"/${P}-gcc-4.4.patch + epatch "${FILESDIR}"/${P}-linker.patch + eautoreconf } -src_compile() { +src_configure() { econf \ --without-x \ $(use_enable debug) \ - $(use_enable debug verbose-exception) \ + $(use_enable debug verbose-exception) +} - emake || die "emake failed!" +src_compile() { + emake || die 'emake failed' + if use doc ; then + doxygen || die 'doxygen failed' + fi } src_install() { emake DESTDIR="${D}" install || die "emake install failed!" - dodoc AUTHORS ChangeLog NEWS README + dodoc AUTHORS ChangeLog README + use doc && dohtml -r html/* } |