rpms/nurbs++/devel import.log, NONE, 1.1 nurbs++-gcc4.4.patch, NONE, 1.1 nurbs++-gcc4.patch, NONE, 1.1 nurbs++-linker.patch, NONE, 1.1 nurbs++-opengl-config.patch, NONE, 1.1 nurbs++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
mycae
mycae at fedoraproject.org
Fri Jul 10 14:51:44 UTC 2009
Author: mycae
Update of /cvs/pkgs/rpms/nurbs++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9158/devel
Modified Files:
.cvsignore sources
Added Files:
import.log nurbs++-gcc4.4.patch nurbs++-gcc4.patch
nurbs++-linker.patch nurbs++-opengl-config.patch nurbs++.spec
Log Message:
*Initial commit
--- NEW FILE import.log ---
nurbs++-3_0_11-6_fc10:HEAD:nurbs++-3.0.11-6.fc10.src.rpm:1247237693
nurbs++-gcc4.4.patch:
--- NEW FILE nurbs++-gcc4.4.patch ---
--- 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 ;
nurbs++-gcc4.patch:
--- NEW FILE nurbs++-gcc4.patch ---
Only in ../nurbs++-3.0.11.new/config: Makefile
Only in ../nurbs++-3.0.11.new/: config.log
Only in ../nurbs++-3.0.11.new/: config.status
Only in ../nurbs++-3.0.11.new/: Doxyfile
Only in ../nurbs++-3.0.11.new/examples/image: .deps
Only in ../nurbs++-3.0.11.new/examples/image: Makefile
Only in ../nurbs++-3.0.11.new/examples: Makefile
Only in ../nurbs++-3.0.11.new/examples/matrix: .deps
Only in ../nurbs++-3.0.11.new/examples/matrix: Makefile
Only in ../nurbs++-3.0.11.new/examples/numerical: .deps
Only in ../nurbs++-3.0.11.new/examples/numerical: Makefile
Only in ../nurbs++-3.0.11.new/examples/nurbs: .deps
Only in ../nurbs++-3.0.11.new/examples/nurbs: Makefile
Only in ../nurbs++-3.0.11.new/: html
diff -ruh ./image/color.cpp ../nurbs++-3.0.11.new/image/color.cpp
--- ./image/color.cpp 2002-05-14 07:07:45.000000000 +1000
+++ ../nurbs++-3.0.11.new/image/color.cpp 2009-01-24 18:36:20.000000000 +1100
@@ -50,7 +50,7 @@
Color blackColor(0,0,0) ;
*/
- double
+template<> double
Matrix<Color>::norm(void) {
#ifdef USE_EXCEPTION
throw MatrixErr();
@@ -63,7 +63,7 @@
}
#ifndef USING_VCC
- int Matrix<Color>::read(char* filename,int r, int c) {
+ template<> int Matrix<Color>::read(char* filename,int r, int c) {
ifstream fin(filename) ;
if(!fin) {
resize(1,1) ;
@@ -89,7 +89,7 @@
}
#endif
- int Vector<Color>::minIndex() const {
+template<> int Vector<Color>::minIndex() const {
#ifdef USE_EXCEPTION
throw MatrixErr() ;
#else
Only in ../nurbs++-3.0.11.new/image: color.lo
Only in ../nurbs++-3.0.11.new/image: color.o
Only in ../nurbs++-3.0.11.new/image: .deps
Only in ../nurbs++-3.0.11.new/image: filter_.lo
Only in ../nurbs++-3.0.11.new/image: filter_.o
diff -ruh ./image/image.cpp ../nurbs++-3.0.11.new/image/image.cpp
--- ./image/image.cpp 2002-05-14 07:07:45.000000000 +1000
+++ ../nurbs++-3.0.11.new/image/image.cpp 2009-01-24 18:36:20.000000000 +1100
@@ -55,9 +55,9 @@
void MatrixImage<T>::drawLine(int i1, int j1, int i2, int j2, T color){
int i,j ;
double mx,b ;
- if(i1<0 || j1<0 || i1>rows() || j1>=cols() ){
+ if(i1<0 || j1<0 || i1>MatrixImage<T>::rows() || j1>=MatrixImage<T>::cols() ){
#ifdef USE_EXCEPTION
- throw OutOfBound2D(i1,j1,0,rows()-1,0,cols()-1) ;
+ throw OutOfBound2D(i1,j1,0,MatrixImage<T>::rows()-1,0,MatrixImage<T>::cols()-1) ;
#else
Error error("MatrixImage<T>::drawLine") ;
error << "Error in drawing line\n Invalid index ("<< i1 << ", " << j1 << ") to ( " << i2 << ", " << j2 << ") \n" ;
@@ -65,9 +65,9 @@
#endif
return ;
}
- if(i2 <0 || j2<0 || i2>rows() || j2>=cols() ){
+ if(i2 <0 || j2<0 || i2>MatrixImage<T>::rows() || j2>=MatrixImage<T>::cols() ){
#ifdef USE_EXCEPTION
- throw OutOfBound2D(i2,j2,0,rows()-1,0,cols()-1) ;
+ throw OutOfBound2D(i2,j2,0,MatrixImage<T>::rows()-1,0,MatrixImage<T>::cols()-1) ;
#else
Error error("MatrixImage<T>::drawLine") ;
error << "Error in drawing line\n Invalid index ("<< i1 << ", " << j1 << ") to ( " << i2 << ", " << j2 << ") \n" ;
@@ -79,7 +79,7 @@
// check if line is vertical
if(j1==j2){
for(i=minimum(i1,i2);i<=maximum(i1,i2);i++)
- operator()(i,j1) = color ;
+ MatrixImage<T>:: operator()(i,j1) = color ;
return ;
}
mx = (double)(i1-i2)/(double)(j1-j2) ;
@@ -88,13 +88,13 @@
if(i1>i2){
for(i=i1;i>=i2;i--){
j = int(((double)i-b)/mx) ;
- operator()(i,j) = color ;
+ MatrixImage<T>::operator()(i,j) = color ;
}
}
else{
for(i=i1;i<=i2;i++){
j = (int)((i-b)/mx) ;
- operator()(i,j) = color ;
+ MatrixImage<T>::operator()(i,j) = color ;
}
}
}
@@ -102,13 +102,13 @@
if(j1>j2){
for(j=j1;j>=j2;j--){
i = (int)(mx*j+b) ;
- operator()(i,j) = color ;
+ MatrixImage<T>::operator()(i,j) = color ;
}
}
else{
for(j=j1;j<=j2;j++){
i = (int)(mx*j+b) ;
- operator()(i,j) = color ;
+ MatrixImage<T>::operator()(i,j) = color ;
}
}
}
@@ -133,9 +133,9 @@
void MatrixImage<T>::drawPoint(int i, int j, double r , T color){
for(int y=i-int(ceil(r)) ; y<i+int(ceil(r)) ; y++)
for(int x = j-int(ceil(r)) ; x<j+int(ceil(r)) ; x++){
- if(y>=0 && y<rows() && x>=0 && x<cols()){
+ if(y>=0 && y<MatrixImage<T>::rows() && x>=0 && x<MatrixImage<T>::cols()){
if( ((y-i)*(y-i)+(x-j)*(x-j))<= r*r)
- operator()(y,x) = color ;
+ MatrixImage<T>::operator()(y,x) = color ;
}
}
}
@@ -153,14 +153,14 @@
*/
template <class T>
void MatrixImage<T>::store(Matrix<T>& a){
- if(a.rows() != rows() || a.cols() != cols()) {
- a.resize(rows(),cols()) ;
+ if(a.rows() != MatrixImage<T>::rows() || a.cols() != MatrixImage<T>::cols()) {
+ a.resize(MatrixImage<T>::rows(),MatrixImage<T>::cols()) ;
}
T *aptr, *bptr ;
int size,i ;
aptr = &a(0,0)-1 ;
- bptr = m-1 ;
- size = cols()*rows() ;
+ bptr = this->m-1 ;
+ size = MatrixImage<T>::cols()*MatrixImage<T>::rows() ;
for(i=0;i<size;i++)
*(++aptr) = *(++bptr) ;
}
Only in ../nurbs++-3.0.11.new/image: image_.lo
Only in ../nurbs++-3.0.11.new/image: image_.o
Only in ../nurbs++-3.0.11.new/image: libmatrixI.la
Only in ../nurbs++-3.0.11.new/image: .libs
Only in ../nurbs++-3.0.11.new/image: Makefile
Only in ../nurbs++-3.0.11.new/image: rec_filter_.lo
Only in ../nurbs++-3.0.11.new/image: rec_filter_.o
Only in ../nurbs++-3.0.11.new/include: Makefile
diff -ruh ./include/plib_config.h ../nurbs++-3.0.11.new/include/plib_config.h
--- ./include/plib_config.h 2002-05-25 04:18:37.000000000 +1000
+++ ../nurbs++-3.0.11.new/include/plib_config.h 2009-01-24 18:36:20.000000000 +1100
@@ -54,7 +54,7 @@
#define USING_LINUX 1
// Specify if you have CppUnit installed
-#define HAS_CPPUNIT 1
+/* #undef HAS_CPPUNIT */
// Specify if you have abs defined for the Complex type
#define HAS_COMPLEX_ABS 1
@@ -117,4 +117,4 @@
#define VERSION "3.0.11"
/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
+#define X_DISPLAY_MISSING 1
Only in ../nurbs++-3.0.11.new/include: stamp-h1
Only in ../nurbs++-3.0.11.new/: latex
Only in ../nurbs++-3.0.11.new/: libtool
Only in ../nurbs++-3.0.11.new/: Makefile
Only in ../nurbs++-3.0.11.new/matrix: barray2d_char.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_char.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_complex.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_complex.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_coordinate.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_coordinate.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_double.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_double.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_float.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_float.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_hpoint.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_hpoint.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_int.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_int.o
Only in ../nurbs++-3.0.11.new/matrix: barray2d_point.lo
Only in ../nurbs++-3.0.11.new/matrix: barray2d_point.o
diff -ruh ./matrix/barray2d_uchar.cpp ../nurbs++-3.0.11.new/matrix/barray2d_uchar.cpp
--- ./matrix/barray2d_uchar.cpp 2002-05-14 07:07:45.000000000 +1000
+++ ../nurbs++-3.0.11.new/matrix/barray2d_uchar.cpp 2009-01-24 18:36:21.000000000 +1100
@@ -27,7 +27,7 @@
[...3206 lines suppressed...]
#ifdef USE_EXCEPTION
throw NurbsInputError();
#else
@@ -88,12 +88,12 @@
#endif
}
else{
- maxV.resize(P.cols()) ;
- maxAtV_.resize(P.cols()) ;
- for(int i=0;i<P.cols();++i){
- if(!maxInfluence(i,V,degV,maxAtV_[i]))
+ maxV.resize(this->P.cols()) ;
+ maxAtV_.resize(this->P.cols()) ;
+ for(int i=0;i<this->P.cols();++i){
+ if(!maxInfluence(i,this->V,this->degV,maxAtV_[i]))
cerr << "Problem in maxInfluence V!\n" ;
- maxV[i] = nurbsBasisFun(maxAtV_[i],i,degV,V) ;
+ maxV[i] = nurbsBasisFun(maxAtV_[i],i,this->degV,this->V) ;
}
}
@@ -124,11 +124,11 @@
NurbsSurfaceSP<T,N> NurbsSurfaceSP<T,N>::generateParallel(T d) const {
NurbsSurfaceSP<T,N> p(*this) ;
- Vector< Point_nD<T,N> > offset(P.rows()*P.cols()) ;
- Vector<T> ur(P.rows()*P.cols()) ;
- Vector<T> vr(P.rows()*P.cols()) ;
- Vector_INT Du(P.rows()*P.cols()) ;
- Vector_INT Dv(P.rows()*P.cols()) ;
+ Vector< Point_nD<T,N> > offset(this->P.rows()*this->P.cols()) ;
+ Vector<T> ur(this->P.rows()*this->P.cols()) ;
+ Vector<T> vr(this->P.rows()*this->P.cols()) ;
+ Vector_INT Du(this->P.rows()*this->P.cols()) ;
+ Vector_INT Dv(this->P.rows()*this->P.cols()) ;
Du.reset(0) ;
Dv.reset(0) ;
@@ -137,8 +137,8 @@
no = 0 ;
- for(i=0;i<P.rows();++i)
- for(j=0;j<P.cols();++j){
+ for(i=0;i<this->P.rows();++i)
+ for(j=0;j<this->P.cols();++j){
Point_nD<T,N> norm ;
norm = normal(maxAtU_[i],maxAtV_[j]) ;
if(norm.x() == T(0) &&
@@ -155,19 +155,19 @@
norm /= T(2) ;
ok = 1 ;
}
- if(i==P.rows()-1 && j==P.cols()-1){
+ if(i==this->P.rows()-1 && j==this->P.cols()-1){
norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
norm += normal(maxAtU_[i],maxAtV_[j]-delta) ;
norm /= T(2) ;
ok = 1 ;
}
- if(i==0 && j==P.cols()-1){
+ if(i==0 && j==this->P.cols()-1){
norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
norm /= T(2) ;
ok = 1 ;
}
- if(i==P.rows()-1 && j==0){
+ if(i==this->P.rows()-1 && j==0){
norm = normal(maxAtU_[i]-delta,maxAtV_[j]) ;
norm += normal(maxAtU_[i],maxAtV_[j]+delta) ;
norm /= T(2) ;
@@ -178,7 +178,7 @@
while(norm.x() == T(0) &&
norm.y() == T(0) &&
norm.z() == T(0)){
- if( nt*d >(U[U.n()-1]-U[0])){
+ if( nt*d >(this->U[this->U.n()-1]-this->U[0])){
#ifdef USE_EXCEPTION
throw NurbsComputationError();
#else
@@ -188,12 +188,12 @@
#endif
}
T u1,u2,v1,v2 ;
- if(i==0 || i==P.rows()-1){
+ if(i==0 || i==this->P.rows()-1){
u1 = u2 = maxAtU_[i] ;
v1 = maxAtV_[j]+ nt*delta ;
v2 = maxAtV_[j]- nt*delta ;
- if(v1>V[V.n()-1]) v1 = V[V.n()-1] ;
- if(v2<V[0]) v2 = V[0] ;
+ if(v1>this->V[this->V.n()-1]) v1 = this->V[this->V.n()-1] ;
+ if(v2<this->V[0]) v2 = this->V[0] ;
norm = normal(u1,v1);
norm += normal(u2,v2) ;
norm /= 2 ;
@@ -202,8 +202,8 @@
u1 = maxAtU_[i]- nt*delta ;
u2 = maxAtU_[i]+ nt*delta ;
v1 = v2 = maxAtV_[j] ;
- if(u1 < U[0]) u1 = U[0] ;
- if(u2 > U[U.n()-1]) u2 = U[U.n()-1] ;
+ if(u1 < this->U[0]) u1 = this->U[0] ;
+ if(u2 > this->U[this->U.n()-1]) u2 = this->U[this->U.n()-1] ;
T u3,v3 ;
u3 = maxAtU_[i] ;
@@ -212,8 +212,8 @@
else
v3 = maxAtV_[j]- nt*delta ;
- if(v3<V[0]) v3 = V[0] ;
- if(v3>V[V.n()-1]) v3 = V[V.n()-1] ;
+ if(v3<this->V[0]) v3 = this->V[0] ;
+ if(v3>this->V[this->V.n()-1]) v3 = this->V[this->V.n()-1] ;
norm = normal(u1,v1);
norm += normal(u2,v2) ;
@@ -263,13 +263,13 @@
int sizeU, sizeV ;
- sizeU = 2*degU+3 ;
- if(i-degU-1<0) sizeU += i-degU-1 ;
- if(i+degU+1>=P.rows()) sizeU -= i+degU+1-P.rows() ;
-
- sizeV = 2*degV+3 ;
- if(j-degV-1<0) sizeV += j-degV-1 ;
- if(j+degV+1>=P.cols()) sizeV -= j+degV+1-P.cols() ;
+ sizeU = 2*this->degU+3 ;
+ if(i-this->degU-1<0) sizeU += i-this->degU-1 ;
+ if(i+this->degU+1>=this->P.rows()) sizeU -= i+this->degU+1-this->P.rows() ;
+
+ sizeV = 2*this->degV+3 ;
+ if(j-this->degV-1<0) sizeV += j-this->degV-1 ;
+ if(j+this->degV+1>=this->P.cols()) sizeV -= j+this->degV+1-this->P.cols() ;
Vector<T> u(sizeU) ;
Vector<T> v(sizeV) ;
@@ -280,16 +280,16 @@
int n=0;
int nu = 0 ;
int nv = 0 ;
- for(int k=i-degU-1;k<=i+degU+1;++k){
+ for(int k=i-this->degU-1;k<=i+this->degU+1;++k){
if(k<0)
continue ;
- if(k>=P.rows())
+ if(k>=this->P.rows())
break ;
nv = 0 ;
- for(int l=j-degV-1;l<=j+degV+1;++l){
+ for(int l=j-this->degV-1;l<=j+this->degV+1;++l){
if(l<0)
continue ;
- if(l>=P.cols())
+ if(l>=this->P.cols())
break ;
if( k == i && j==l){
pts[n].x() = a.x() ;
diff -ruh ./nurbs/nurbsS_sp.h ../nurbs++-3.0.11.new/nurbs/nurbsS_sp.h
--- ./nurbs/nurbsS_sp.h 2002-05-14 07:07:46.000000000 +1000
+++ ../nurbs++-3.0.11.new/nurbs/nurbsS_sp.h 2009-01-24 18:36:20.000000000 +1100
@@ -78,7 +78,7 @@
void modSurfCPby(int i, int j, const HPoint_nD<T,N>& a) //!< Moves a surface point by a value
- { P(i,j) += a / (maxU[i]*maxV[j]) ; }
+ { this->P(i,j) += a / (maxU[i]*maxV[j]) ; }
void modSurfCP(int i, int j, const HPoint_nD<T,N>& a) //!< Moves a surface point to a value
{ modSurfCPby(i,j,a-surfP(i,j)) ; }
diff -ruh ./nurbs/nurbsSub.cpp ../nurbs++-3.0.11.new/nurbs/nurbsSub.cpp
--- ./nurbs/nurbsSub.cpp 2002-05-14 07:07:46.000000000 +1000
+++ ../nurbs++-3.0.11.new/nurbs/nurbsSub.cpp 2009-01-24 18:36:20.000000000 +1100
@@ -904,7 +904,7 @@
/* Allocate storage for the grid of points generated */
- CHECK( pts = new (SurfSample<T>*)[Granularity+1]);
+ CHECK( pts = new SurfSample<T>*[Granularity+1]);
CHECK( pts[0] = new SurfSample<T>[(Granularity+1)*(Granularity+1)]);
for (i = 1; i <= Granularity; i++)
@@ -983,7 +983,7 @@
if (! *alpha) /* Must allocate alpha */
{
- CHECK( *alpha = new (T*)[k+1]);
+ CHECK( *alpha = new T*[k+1]);
for (i = 0; i <= k; i++)
CHECK( (*alpha)[i] = new T[(m + n + 1)]);
}
Only in ../nurbs++-3.0.11.new/: nurbs++-config
Only in ../nurbs++-3.0.11.new/tests: Makefile
Only in ../nurbs++-3.0.11.new/tests/matrix: .deps
Only in ../nurbs++-3.0.11.new/tests/matrix: Makefile
Only in ../nurbs++-3.0.11.new/tests/nurbs: .deps
Only in ../nurbs++-3.0.11.new/tests/nurbs: Makefile
nurbs++-linker.patch:
--- NEW FILE nurbs++-linker.patch ---
--- 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,8 @@
lib_LTLIBRARIES = libnurbsf.la libnurbsd.la
libnurbsf_la_SOURCES = $(float_sources)
-libnurbsf_la_LDFLAGS = $(ldflags)
+libnurbsf_la_LDFLAGS = $(ldflags) -lGL -lGLU -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
nurbs++-opengl-config.patch:
--- NEW FILE nurbs++-opengl-config.patch ---
--- config/has_opengl.m4 2002-05-18 02:03:18.000000000 +1000
+++ config/has_opengl.m4.new 2009-01-25 01:06:11.000000000 +1100
@@ -163,7 +163,7 @@
else
GL_LFLAGS="-L${ac_cv_with_gl_lib}"
fi
- GL_LIBS="-lGLU -lGL $X_PRE_LIBS -lXext -lm"
+ GL_LIBS="-lGLU -lGL"
AC_SUBST(GL_LIBS)
AC_SUBST(GL_LFLAGS)
],
--- NEW FILE nurbs++.spec ---
Name: nurbs++
Version: 3.0.11
Release: 6%{?dist}
Summary: Non Uniform Rational Basis Spline (NURBS) library for C++
Group: Development/Libraries
License: LGPLv2+
URL: http://sourceforge.net/projects/libnurbs/
Source: http://downloads.sourceforge.net/libnurbs/%{name}-%{version}.tar.bz2
#Upstream maintenance request
#https://sourceforge.net/tracker/index.php?func=detail&aid=2531392&group_id=3254&atid=103254
#Patch to fix gcc4.3 builds (template compliance problems)
#Submitted to upstream tracker
#https://sourceforge.net/tracker/index.php?func=detail&aid=2531330&group_id=3254&atid=303254
Patch0: %{name}-gcc4.patch
#Patch to fix openGL lib finding.
Patch1: %{name}-opengl-config.patch
#Patch to fix gcc4.4 builds (template parameter shadowing)
Patch2: %{name}-gcc4.4.patch
#Patch to fix linker (non-weak symbols)
Patch3: %{name}-linker.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Note cppunit-devel is not included, as the unit tests do not build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
%description
A C++ library to manipulate and create NURBS curves and surfaces. Also
featuring vector, matrix, and OpenGL support classes.
%package devel
Group: Development/Libraries
License: LGPLv2
Requires: %{name} = %{version}-%{release}
Requires: libGL-devel
Requires: libGLU-devel
Summary: Provides development files for %{name} applications
%description devel
Development libraries for the %{name} library.
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3
#Reconfigure to fix openGL test
autoreconf -f
#libtool provided is <1.5, which causes --tags to be not recognised
#and build breaks.
rm -f libtool
ln -s `which libtool` libtool
#F10 has /usr/share/libtool/ltmain.sh.
#F11 has it in config subdir
if [ -f /usr/share/libtool/config/ltmain.sh ] ; then
cp /usr/share/libtool/config/ltmain.sh .
else
cp /usr/share/libtool/ltmain.sh .
fi
%build
%configure --enable-shared --disable-static --with-opengl --with-gl-lib=%{_libdir}
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/image/.libs/:`pwd`/matrix/.libs/:`pwd`/numerical/.libs/
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
mkdir %{buildroot}
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/image/.libs/:`pwd`/matrix/.libs/:`pwd`/numerical/.libs/
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
rm -f %{buildroot}/%{_libdir}/*.la
rm -f %{buildroot}/%{_libdir}/*.a
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README AUTHORS
%{_libdir}/libmatrix.so.*
%{_libdir}/libmatrixI.so.*
%{_libdir}/libmatrixN.so.*
%{_libdir}/libnurbsd.so.*
%{_libdir}/libnurbsf.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_bindir}/%{name}-config
%{_mandir}/man1/%{name}-config.1.gz
%{_libdir}/libmatrix.so
%{_libdir}/libmatrixI.so
%{_libdir}/libmatrixN.so
%{_libdir}/libnurbsd.so
%{_libdir}/libnurbsf.so
%changelog
* Wed Jul 08 2009 <mycae(a!t)yahoo.com> 3.0.11-6
- ImageMagick is in ifdefs that are not activated
- Fix more weak-link errors
* Tue Jul 07 2009 <mycae(a!t)yahoo.com> 3.0.11-5
- Move manpage for -config utility to devel package
- Add ImageMagick support
- Fixed weak-linking errors
- Add linker patch
- Licence to LGPLv2+
* Sat Jun 06 2009 <mycae(a!t)yahoo.com> 3.0.11-4
- Patch to fix build for gcc-4.4
- Add buildrequires to fix autoreconf/libtool command missing in f11 koji
* Sat Jan 24 2009 <mycae(a!t)yahoo.com> 3.0.11-3
- Modified patch to enable opengl build
* Sat Jan 24 2009 <mycae(a!t)yahoo.com> 3.0.11-2
- Use version macro in URL name
* Sat Jan 24 2009 <mycae(a!t)yahoo.com> 3.0.11-1
- Initial spec file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nurbs++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 10 Jul 2009 03:36:41 -0000 1.1
+++ .cvsignore 10 Jul 2009 14:51:44 -0000 1.2
@@ -0,0 +1 @@
+nurbs++-3.0.11.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nurbs++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 10 Jul 2009 03:36:41 -0000 1.1
+++ sources 10 Jul 2009 14:51:44 -0000 1.2
@@ -0,0 +1 @@
+11aa7f2a1ae2bc3e2671d56f557fbbbf nurbs++-3.0.11.tar.bz2
More information about the fedora-extras-commits
mailing list