diff --git a/perl-PDL-2.4.1-long.patch b/perl-PDL-2.4.1-long.patch deleted file mode 100644 index e05d980..0000000 --- a/perl-PDL-2.4.1-long.patch +++ /dev/null @@ -1,332 +0,0 @@ -Index: PDL-2.4.1/Basic/Core/Dev.pm -=================================================================== ---- PDL-2.4.1.orig/Basic/Core/Dev.pm 2004-12-12 00:07:52.010537392 +0100 -+++ PDL-2.4.1/Basic/Core/Dev.pm 2004-12-12 00:09:07.904999680 +0100 -@@ -203,14 +203,14 @@ - # - # case PDL_L: - # { --# long *xx = x.data; -+# PDL_Long *xx = x.data; - # for(i=0; invals == 1) - for(i=0;i<$COMP(rdim);i++) -- $COMP(sizes[i]) = *((long *)(size_pdl->data)); -+ $COMP(sizes[i]) = *((PDL_Long *)(size_pdl->data)); - - else if( size_pdl->nvals <= $COMP(rdim) &&size_pdl->ndims == 1) - for(i=0;i<$COMP(rdim);i++) - $COMP(sizes[i]) = ( (i < size_pdl->nvals) ? -- ((long *)(size_pdl->data))[i] : -+ ((PDL_Long *)(size_pdl->data))[i] : - 0 - ); - else { -@@ -795,7 +795,7 @@ - /* bad we don't have access to the parent piddle here... */ - - for(j=0;j<$COMP(rdim);j++) -- *(cptr++) = ((long *)(ind_pdl->data))[ioff + ind_pdl->dimincs[0] * j]; -+ *(cptr++) = ((PDL_Long *)(ind_pdl->data))[ioff + ind_pdl->dimincs[0] * j]; - - /* Increment the iterator -- the test increments, the body carries. */ - for(k=0; k<$COMP(itdim) && (++(iter[k]))>=($COMP(itdims)[k]) ;k++) -Index: PDL-2.4.1/Basic/Core/Core.xs.PL -=================================================================== ---- PDL-2.4.1.orig/Basic/Core/Core.xs.PL 2004-12-06 00:32:06.000000000 +0100 -+++ PDL-2.4.1/Basic/Core/Core.xs.PL 2004-12-12 22:05:11.000000000 +0100 -@@ -463,11 +463,11 @@ - CODE: - setflag(self->state,PDL_INPLACE,val); - --int -+long - address(self) - pdl *self; - CODE: -- RETVAL = (int) self; -+ RETVAL = (long) self; - OUTPUT: - RETVAL - -Index: PDL-2.4.1/IO/Dumper.pm -=================================================================== ---- PDL-2.4.1.orig/IO/Dumper.pm 2003-01-17 09:27:26.000000000 +0100 -+++ PDL-2.4.1/IO/Dumper.pm 2004-12-12 23:41:27.544945320 +0100 -@@ -149,7 +149,7 @@ - my($s) = Data::Dumper->Dump([@_]); - my(%pdls); - # Find the bless(...,'PDL') lines -- while($s =~ s/bless\( do\{\\\(my \$o \= (\d+)\)\}\, \'PDL\' \)/\$PDL_$1/) { -+ while($s =~ s/bless\( do\{\\\(my \$o \= '?(\d+)'?\)\}\, \'PDL\' \)/\$PDL_$1/) { - $pdls{$1}++; - } - -Index: PDL-2.4.1/Lib/GSL/INTERP/gsl_interp.pd -=================================================================== ---- PDL-2.4.1.orig/Lib/GSL/INTERP/gsl_interp.pd 2003-03-12 21:10:50.000000000 +0100 -+++ PDL-2.4.1/Lib/GSL/INTERP/gsl_interp.pd 2004-12-12 22:16:43.000000000 +0100 -@@ -255,7 +255,7 @@ - - pp_def('init_meat', - Pars => 'double x(n); double y(n);', -- OtherPars => 'int spl', -+ OtherPars => 'long spl', - Doc => undef, - Code =>' - GSLERR(gsl_spline_init,( (gsl_spline *) $COMP(spl), $P(x),$P(y),$SIZE(n)));' -@@ -280,14 +280,14 @@ - - pp_def('eval_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -314,14 +314,14 @@ - - pp_def('eval_deriv_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_deriv_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_deriv_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_deriv( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -346,14 +346,14 @@ - - pp_def('eval_deriv2_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_deriv2_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_deriv2_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_deriv2( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -378,14 +378,14 @@ - - pp_def('eval_integ_meat', - Pars => 'double a(); double b(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_integ_e,( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc),$P(out))); - '); - pp_def('eval_integ_meat_ext', - Pars => 'double a(); double b(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_integ( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc)); -Index: PDL-2.4.1/Lib/GSL/RNG/gsl_random.pd -=================================================================== ---- PDL-2.4.1.orig/Lib/GSL/RNG/gsl_random.pd 2002-12-02 17:58:34.000000000 +0100 -+++ PDL-2.4.1/Lib/GSL/RNG/gsl_random.pd 2004-12-12 22:53:48.536580656 +0100 -@@ -676,7 +676,7 @@ - 'gsl_get_uniform_meat', - Pars => '[o]a()', - GenericTypes => [F,D], -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_uniform((gsl_rng *) $COMP(rng));'); - -@@ -684,21 +684,21 @@ - 'gsl_get_uniform_pos_meat', - Pars => '[o]a()', - GenericTypes => [F,D], -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_uniform_pos((gsl_rng *) $COMP(rng));'); - - pp_defnd( - 'gsl_get_meat', - Pars => '[o]a()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_get((gsl_rng *) $COMP(rng));'); - - pp_defnd( - 'gsl_get_int_meat', - Pars => '[o]a()', -- OtherPars => 'int n; int rng', -+ OtherPars => 'int n; long rng', - Code => ' - $a() = gsl_rng_uniform_int((gsl_rng *) $COMP(rng),$COMP(n));'); - -@@ -709,21 +709,21 @@ - my ($pars1,$fcall1,$arglist); - - if ($npar==1) { -- $pars1='double a; int rng'; -+ $pars1='double a; long rng'; - $fcall1='$COMP(a)'; - $arglist='$a,'; - $pars2='a()'; - $fcall2='$a()'; - } - if ($npar==2) { -- $pars1='double a; double b; int rng'; -+ $pars1='double a; double b; long rng'; - $fcall1='$COMP(a),$COMP(b)'; - $arglist='$a,$b,'; - $pars2='a();b()'; - $fcall2='$a(),$b()'; - } - if ($npar==3) { -- $pars1='double a; double b; double c; int rng'; -+ $pars1='double a; double b; double c; long rng'; - $fcall1='$COMP(a),$COMP(b),$COMP(c)'; - $arglist='$a,$b,$c,'; - $pars2='a();b();c()'; -@@ -757,7 +757,7 @@ - pp_defnd( - 'ran_' . $name . '_var_meat', - Pars => $pars2 . ';[o]x()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - $x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng),' . $fcall2 . ');'); - -@@ -793,7 +793,7 @@ - # pp_defnd( - # 'ran_' . $name . '_feed_meat', - # Pars => '[o]x()', --# OtherPars => 'int rng', -+# OtherPars => 'long rng', - # Code =>' - #$x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng), $x());'); - -@@ -848,7 +848,7 @@ - pp_defnd( - 'ran_additive_gaussian_meat', - Pars => ';[o]x()', -- OtherPars => 'double sigma; int rng', -+ OtherPars => 'double sigma; long rng', - Code =>'$x() += gsl_ran_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma));'); - - pp_addpm(' -@@ -867,7 +867,7 @@ - pp_defnd( - 'ran_additive_poisson_meat', - Pars => ';[o]x()', -- OtherPars => 'double sigma; int rng', -+ OtherPars => 'double sigma; long rng', - Code =>'$x() += gsl_ran_poisson((gsl_rng *) $COMP(rng), $COMP(sigma));'); - - pp_addpm(' -@@ -886,7 +886,7 @@ - pp_defnd( - 'ran_feed_poisson_meat', - Pars => ';[o]x()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>'$x() = gsl_ran_poisson((gsl_rng *) $COMP(rng), $x());'); - - pp_addpm(' -@@ -905,7 +905,7 @@ - pp_defnd( - 'ran_bivariate_gaussian_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double sigma_x; double sigma_y; double rho; int rng', -+ OtherPars => 'double sigma_x; double sigma_y; double rho; long rng', - Code =>' - double xx,yy; - gsl_ran_bivariate_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma_x), $COMP(sigma_y),$COMP(rho), &xx, &yy); -@@ -930,7 +930,7 @@ - pp_defnd( - 'ran_dir_2d_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - double xx,yy; - gsl_ran_dir_2d((gsl_rng *) $COMP(rng), &xx, &yy); -@@ -941,7 +941,7 @@ - pp_defnd( - 'ran_dir_3d_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - double xx,yy,zz; - gsl_ran_dir_3d((gsl_rng *) $COMP(rng), &xx, &yy, &zz); -@@ -955,7 +955,7 @@ - pp_defnd( - 'ran_dir_nd_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int ns => n; int rng', -+ OtherPars => 'int ns => n; long rng', - Code =>' - double xxx[' . $MAX_DIMENSIONS .']; - gsl_ran_dir_nd((gsl_rng *) $COMP(rng), $COMP(ns), xxx); -@@ -981,7 +981,7 @@ - pp_defnd( - 'ran_discrete_meat', - Pars => ';[o]x()', -- OtherPars => 'int rng_discrete; int rng', -+ OtherPars => 'long rng_discrete; long rng', - Code =>' - $x()=gsl_ran_discrete((gsl_rng *) $COMP(rng), (gsl_ran_discrete_t *) $COMP(rng_discrete)); '); - -@@ -1035,7 +1035,7 @@ - pp_defnd( - 'ran_ver_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double x0; double r;int ns => n; int rng', -+ OtherPars => 'double x0; double r;int ns => n; long rng', - Code =>' - double xx=$COMP(x0); - -@@ -1044,7 +1044,7 @@ - pp_defnd( - 'ran_caos_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double m; int ns => n; int rng', -+ OtherPars => 'double m; int ns => n; long rng', - Code =>' - double xx=gsl_ran_gaussian((gsl_rng *) $COMP(rng),0.1)+0.5; - diff --git a/perl-PDL-2.4.2-fix_64bit_pointers.patch b/perl-PDL-2.4.2-fix_64bit_pointers.patch deleted file mode 100644 index b946ae9..0000000 --- a/perl-PDL-2.4.2-fix_64bit_pointers.patch +++ /dev/null @@ -1,248 +0,0 @@ ---- PDL-2.4.2/Lib/GSL/RNG/gsl_random.pd.fix_64bit_pointers 2002-12-02 11:58:34.000000000 -0500 -+++ PDL-2.4.2/Lib/GSL/RNG/gsl_random.pd 2006-03-09 19:15:01.000000000 -0500 -@@ -676,7 +676,7 @@ - 'gsl_get_uniform_meat', - Pars => '[o]a()', - GenericTypes => [F,D], -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_uniform((gsl_rng *) $COMP(rng));'); - -@@ -684,21 +684,21 @@ - 'gsl_get_uniform_pos_meat', - Pars => '[o]a()', - GenericTypes => [F,D], -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_uniform_pos((gsl_rng *) $COMP(rng));'); - - pp_defnd( - 'gsl_get_meat', - Pars => '[o]a()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code => ' - $a() = gsl_rng_get((gsl_rng *) $COMP(rng));'); - - pp_defnd( - 'gsl_get_int_meat', - Pars => '[o]a()', -- OtherPars => 'int n; int rng', -+ OtherPars => 'int n; long rng', - Code => ' - $a() = gsl_rng_uniform_int((gsl_rng *) $COMP(rng),$COMP(n));'); - -@@ -709,21 +709,21 @@ - my ($pars1,$fcall1,$arglist); - - if ($npar==1) { -- $pars1='double a; int rng'; -+ $pars1='double a; long rng'; - $fcall1='$COMP(a)'; - $arglist='$a,'; - $pars2='a()'; - $fcall2='$a()'; - } - if ($npar==2) { -- $pars1='double a; double b; int rng'; -+ $pars1='double a; double b; long rng'; - $fcall1='$COMP(a),$COMP(b)'; - $arglist='$a,$b,'; - $pars2='a();b()'; - $fcall2='$a(),$b()'; - } - if ($npar==3) { -- $pars1='double a; double b; double c; int rng'; -+ $pars1='double a; double b; double c; long rng'; - $fcall1='$COMP(a),$COMP(b),$COMP(c)'; - $arglist='$a,$b,$c,'; - $pars2='a();b();c()'; -@@ -757,7 +757,7 @@ - pp_defnd( - 'ran_' . $name . '_var_meat', - Pars => $pars2 . ';[o]x()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - $x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng),' . $fcall2 . ');'); - -@@ -793,7 +793,7 @@ - # pp_defnd( - # 'ran_' . $name . '_feed_meat', - # Pars => '[o]x()', --# OtherPars => 'int rng', -+# OtherPars => 'long rng', - # Code =>' - #$x() = gsl_ran_' . $name . '((gsl_rng *) $COMP(rng), $x());'); - -@@ -848,7 +848,7 @@ - pp_defnd( - 'ran_additive_gaussian_meat', - Pars => ';[o]x()', -- OtherPars => 'double sigma; int rng', -+ OtherPars => 'double sigma; long rng', - Code =>'$x() += gsl_ran_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma));'); - - pp_addpm(' -@@ -867,7 +867,7 @@ - pp_defnd( - 'ran_additive_poisson_meat', - Pars => ';[o]x()', -- OtherPars => 'double sigma; int rng', -+ OtherPars => 'double sigma; long rng', - Code =>'$x() += gsl_ran_poisson((gsl_rng *) $COMP(rng), $COMP(sigma));'); - - pp_addpm(' -@@ -886,7 +886,7 @@ - pp_defnd( - 'ran_feed_poisson_meat', - Pars => ';[o]x()', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>'$x() = gsl_ran_poisson((gsl_rng *) $COMP(rng), $x());'); - - pp_addpm(' -@@ -905,7 +905,7 @@ - pp_defnd( - 'ran_bivariate_gaussian_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double sigma_x; double sigma_y; double rho; int rng', -+ OtherPars => 'double sigma_x; double sigma_y; double rho; long rng', - Code =>' - double xx,yy; - gsl_ran_bivariate_gaussian((gsl_rng *) $COMP(rng), $COMP(sigma_x), $COMP(sigma_y),$COMP(rho), &xx, &yy); -@@ -930,7 +930,7 @@ - pp_defnd( - 'ran_dir_2d_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - double xx,yy; - gsl_ran_dir_2d((gsl_rng *) $COMP(rng), &xx, &yy); -@@ -941,7 +941,7 @@ - pp_defnd( - 'ran_dir_3d_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int rng', -+ OtherPars => 'long rng', - Code =>' - double xx,yy,zz; - gsl_ran_dir_3d((gsl_rng *) $COMP(rng), &xx, &yy, &zz); -@@ -955,7 +955,7 @@ - pp_defnd( - 'ran_dir_nd_meat', - Pars => ';[o]x(n)', -- OtherPars => 'int ns => n; int rng', -+ OtherPars => 'int ns => n; long rng', - Code =>' - double xxx[' . $MAX_DIMENSIONS .']; - gsl_ran_dir_nd((gsl_rng *) $COMP(rng), $COMP(ns), xxx); -@@ -981,7 +981,7 @@ - pp_defnd( - 'ran_discrete_meat', - Pars => ';[o]x()', -- OtherPars => 'int rng_discrete; int rng', -+ OtherPars => 'long rng_discrete; long rng', - Code =>' - $x()=gsl_ran_discrete((gsl_rng *) $COMP(rng), (gsl_ran_discrete_t *) $COMP(rng_discrete)); '); - -@@ -1035,7 +1035,7 @@ - pp_defnd( - 'ran_ver_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double x0; double r;int ns => n; int rng', -+ OtherPars => 'double x0; double r;int ns => n; long rng', - Code =>' - double xx=$COMP(x0); - -@@ -1044,7 +1044,7 @@ - pp_defnd( - 'ran_caos_meat', - Pars => ';[o]x(n)', -- OtherPars => 'double m; int ns => n; int rng', -+ OtherPars => 'double m; int ns => n; long rng', - Code =>' - double xx=gsl_ran_gaussian((gsl_rng *) $COMP(rng),0.1)+0.5; - ---- PDL-2.4.2/Lib/GSL/INTERP/gsl_interp.pd.fix_64bit_pointers 2003-03-12 15:10:50.000000000 -0500 -+++ PDL-2.4.2/Lib/GSL/INTERP/gsl_interp.pd 2006-03-09 19:14:08.000000000 -0500 -@@ -255,7 +255,7 @@ - - pp_def('init_meat', - Pars => 'double x(n); double y(n);', -- OtherPars => 'int spl', -+ OtherPars => 'long spl', - Doc => undef, - Code =>' - GSLERR(gsl_spline_init,( (gsl_spline *) $COMP(spl), $P(x),$P(y),$SIZE(n)));' -@@ -280,14 +280,14 @@ - - pp_def('eval_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -314,14 +314,14 @@ - - pp_def('eval_deriv_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_deriv_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_deriv_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_deriv( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -346,14 +346,14 @@ - - pp_def('eval_deriv2_meat', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_deriv2_e,( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc), $P(out))); - '); - pp_def('eval_deriv2_meat_ext', - Pars => 'double x(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_deriv2( (gsl_spline *) $COMP(spl), $x(), (gsl_interp_accel *) $COMP(acc)); -@@ -378,14 +378,14 @@ - - pp_def('eval_integ_meat', - Pars => 'double a(); double b(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - GSLERR(gsl_spline_eval_integ_e,( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc),$P(out))); - '); - pp_def('eval_integ_meat_ext', - Pars => 'double a(); double b(); double [o] out();', -- OtherPars => 'int spl;int acc;', -+ OtherPars => 'long spl;long acc;', - Doc => undef, - Code =>' - $out() = gsl_spline_eval_integ( (gsl_spline *) $COMP(spl), $a(), $b(), (gsl_interp_accel *) $COMP(acc)); diff --git a/perl-PDL-2.4.3-Xext.patch b/perl-PDL-2.4.3-Xext.patch new file mode 100644 index 0000000..9602312 --- /dev/null +++ b/perl-PDL-2.4.3-Xext.patch @@ -0,0 +1,10 @@ +--- PDL-2.4.3/Graphics/Makefile.PL.Xext 2006-08-16 20:46:37.000000000 -0600 ++++ PDL-2.4.3/Graphics/Makefile.PL 2007-08-01 11:18:50.000000000 -0600 +@@ -145,6 +145,6 @@ + require ExtUtils::Liblist; + my ($libs) = @_; + my $lpath = '-L/usr/X11R6/lib -L/usr/lib/mesa'; +- my $extra = '-lXext -lX11 -lm'; ++ my $extra = '-lX11 -lm'; + return ${[ExtUtils::Liblist->ext("$lpath $libs $extra")]}[0]; + } diff --git a/perl-PDL-2.4.3-fortran.patch b/perl-PDL-2.4.3-fortran.patch new file mode 100644 index 0000000..02ac579 --- /dev/null +++ b/perl-PDL-2.4.3-fortran.patch @@ -0,0 +1,31 @@ +--- PDL-2.4.3/Lib/Slatec/Makefile.PL.fortran 2007-08-07 14:28:11.000000000 -0600 ++++ PDL-2.4.3/Lib/Slatec/Makefile.PL 2007-08-07 14:29:48.000000000 -0600 +@@ -128,15 +128,14 @@ + + sub MY::postamble { + $mycompiler = $f77->compiler(); +- $mycflags = $f77->cflags(); ++ $mycflags = $f77->cflags() . " -fPIC " . $Config{"ccflags"}; + my $orig = pdlpp_postamble_int(@::pack); +- $hack_64bit = ($Config{archname}=~m/x86_64/ ?" -fPIC " : ""); + $orig =~ s/:\s*slatec\.pd/: slatec.pd/; + $orig .join "\n",map { + (" + + slatec/$_\$(OBJ_EXT): slatec/$_.f +- $mycompiler -c $hack_64bit -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f ++ $mycompiler -c -o slatec/$_\$(OBJ_EXT) $mycflags slatec/$_.f + " )} @slatecfiles; + + } +--- PDL-2.4.3/t/flexraw.t.fortran 2007-08-07 15:36:21.000000000 -0600 ++++ PDL-2.4.3/t/flexraw.t 2007-08-07 15:36:35.000000000 -0600 +@@ -206,7 +206,7 @@ + $fh->print( $code ); + $fh->close; + +- system("$F77 $F77flags -o $prog$exec $file". ++ system("$F77 $F77flags -frecord-marker=4 -o $prog$exec $file". + (($Verbose || $DEBUG)?'': $null)); + + unlink $data if -f $data; diff --git a/perl-PDL-2.4.3-hdf.patch b/perl-PDL-2.4.3-hdf.patch new file mode 100644 index 0000000..0177264 --- /dev/null +++ b/perl-PDL-2.4.3-hdf.patch @@ -0,0 +1,24 @@ +--- PDL-2.4.3/IO/HDF/Makefile.PL.hdf 2007-07-31 10:48:08.000000000 -0600 ++++ PDL-2.4.3/IO/HDF/Makefile.PL 2007-07-31 11:29:56.000000000 -0600 +@@ -28,11 +28,13 @@ + # default locations: + @HDF_lib_locations = ( + '/usr/lib64', ++ '/usr/lib64/hdf', + '/usr/local/netcdf/lib', + '/usr/local/lib', + '/usr/local/lib64', + '/opt/local/lib', + '/usr/lib', ++ '/usr/lib/hdf', + '/opt/lib' + ); + @HDF_inc_locations = ( +@@ -40,6 +42,7 @@ + '/usr/local/netcdf/include', + '/opt/local/include', + '/usr/include', ++ '/usr/include/hdf', + '/opt/include' + ); + diff --git a/perl-PDL-2.4.3-test.patch b/perl-PDL-2.4.3-test.patch new file mode 100644 index 0000000..f9438d2 --- /dev/null +++ b/perl-PDL-2.4.3-test.patch @@ -0,0 +1,88 @@ +--- PDL-2.4.3/t/gis_proj.t.test 2006-07-26 21:34:29.000000000 -0600 ++++ PDL-2.4.3/t/gis_proj.t 2007-07-31 12:15:15.000000000 -0600 +@@ -68,7 +68,7 @@ + + # Do the corners of a cyl eq map, and see what we get... + print "\nCorners of a cylindrical equidistant projection:\n"; +-my $cyl_eq = "+proj=eqc +lon_0=0"; ++my $cyl_eq = "+proj=eqc +lon_0=0 +a=5.3049894774131808e-315"; + print "Perl level params: \'$cyl_eq\'\n"; + my $lon3 = double [-180.0, -180.0, 180.0, 180.0]; + my $lat3 = double [ 90.0, -90.0, 90.0, -90.0]; +--- PDL-2.4.3/t/xvals.t.test 1999-12-09 04:15:22.000000000 -0700 ++++ PDL-2.4.3/t/xvals.t 2007-08-14 14:35:57.000000000 -0600 +@@ -13,11 +13,11 @@ + $a0 = zeroes(3,2); + # $a0->doflow(); + +- print $a0; ++# print $a0; + + $a1 = $a0->slice('(1)'); + +- print $a1; ++# print $a1; + + # $a0->dump(); $a1->dump(); + +@@ -27,19 +27,19 @@ + + # $a1->dump(); + +- print $a1; ++# print $a1; + + $dummy = PDL::Core::new_or_inplace($a0); +-print $dummy; ++#print $dummy; + $dummy2 = $dummy->xchg(0,0); +-print $dummy2; +-$dummy2->dump(); +-$dummy->dump(); ++#print $dummy2; ++#$dummy2->dump(); ++#$dummy->dump(); + PDL::Primitive::axisvalues($dummy2); +-$dummy2->dump(); +-$dummy->dump(); +-print $dummy2; +-print $dummy; ++#$dummy2->dump(); ++#$dummy->dump(); ++#print $dummy2; ++#print $dummy; + + + +@@ -55,24 +55,24 @@ + + $a = xvals $a0; + +-print $a; ++#print $a; + + ok(1,$a->at(0,0) == 0); + ok(2,$a->at(1,0) == 1); + ok(3,$a->at(2,0) == 2); + ok(4,$a->at(1,1) == 1); + +-$a = zeroes 5,10; ++#$a = zeroes 5,10; + +-$b = yvals $a; ++#$b = yvals $a; + +-$c = $b->copy(); ++#$c = $b->copy(); + +-$d = $b-$c; ++#$d = $b-$c; + +-print "$d,$b,$c"; ++#print "$d,$b,$c"; + + # print $a; + +-print "OUTOUT\n"; ++#print "OUTOUT\n"; + diff --git a/perl-PDL-2.4.3-x86_64.patch b/perl-PDL-2.4.3-x86_64.patch new file mode 100644 index 0000000..552ff9c --- /dev/null +++ b/perl-PDL-2.4.3-x86_64.patch @@ -0,0 +1,32 @@ +--- PDL-2.4.3/Graphics/PLplot/Makefile.PL.x86_64 2006-05-28 12:19:38.000000000 -0600 ++++ PDL-2.4.3/Graphics/PLplot/Makefile.PL 2007-07-31 10:40:31.000000000 -0600 +@@ -39,6 +39,7 @@ + '/usr/local/plplot/lib', + '/usr/local/lib', + '/opt/local/lib', ++ '/usr/lib64', + '/usr/lib', + '/opt/lib', + '/ops/tools/lib', +--- PDL-2.4.3/Graphics/TriD/Makefile.PL.x86_64 2006-05-29 11:19:07.000000000 -0600 ++++ PDL-2.4.3/Graphics/TriD/Makefile.PL 2007-07-31 10:40:16.000000000 -0600 +@@ -20,7 +20,7 @@ + } else { + # + # default locations: +- my @check_dirs = qw( /lib/ /usr/lib/ /usr/local/lib/ /usr/X11R6/lib/ /usr/local/X11R6/lib/ /usr/X11/lib/ /usr/local/X11/lib/ ); ++ my @check_dirs = qw( /lib/ /usr/lib64/ /usr/lib/ /usr/local/lib/ /usr/X11R6/lib/ /usr/local/X11R6/lib/ /usr/X11/lib/ /usr/local/X11/lib/ ); + + # append locations from perldl.conf, if specified: + @check_dirs = +--- PDL-2.4.3/perldl.conf.x86_64 2007-07-31 10:33:12.000000000 -0600 ++++ PDL-2.4.3/perldl.conf 2007-07-31 10:44:44.000000000 -0600 +@@ -158,7 +158,7 @@ + WITH_FFTW => undef, # Leave it up to PDL to decide + + # Location to search for the FFTW libs +- FFTW_LIBS => [ '/lib','/usr/lib','/usr/local/lib'], ++ FFTW_LIBS => [ '/lib','/usr/lib64','/usr/lib','/usr/local/lib'], + # Location to find FFTW includes: + FFTW_INC => ['/usr/include/','/usr/local/include'], + diff --git a/perl-PDL-settings.patch b/perl-PDL-settings.patch index 6c85ba8..089aa4c 100644 --- a/perl-PDL-settings.patch +++ b/perl-PDL-settings.patch @@ -1,12 +1,20 @@ -diff -u PDL-2.4.3.orig/perldl.conf PDL-2.4.3/perldl.conf ---- PDL-2.4.3.orig/perldl.conf 2006-08-16 22:59:51.000000000 -0400 -+++ PDL-2.4.3/perldl.conf 2006-12-02 18:01:19.000000000 -0500 +--- PDL-2.4.3/perldl.conf.settings 2006-08-16 20:59:51.000000000 -0600 ++++ PDL-2.4.3/perldl.conf 2007-07-31 11:08:20.000000000 -0600 @@ -91,7 +91,7 @@ # There are problems with the build on OS-X, so we turn it off by default # for such systems # - WITH_3D => $^O eq "darwin" ? 0 : undef, -+ WITH_3D => 0, ++ WITH_3D => 1, # # For Mesa 3.2 +@@ -191,7 +191,7 @@ + # about curses to fix it + # - 1 builds, 0 or undef does not build + # +- WITH_IO_BROWSER => 0, ++ WITH_IO_BROWSER => 1, + + # Quiet Astro::FITS::Header warnings for PDL build process by default + # Eventually would be better to set undef by default, and have the diff --git a/perl-PDL.spec b/perl-PDL.spec index 8a4b1b9..b59bc46 100644 --- a/perl-PDL.spec +++ b/perl-PDL.spec @@ -1,27 +1,41 @@ Name: perl-PDL Version: 2.4.3 -Release: 1%{?dist} -Summary: PDL Perl module +Release: 4%{?dist} +Summary: The Perl Data Language Group: Development/Libraries -License: GPL or Artistic +License: GPL+ or Artistic Url: http://search.cpan.org/dist/PDL/ Source0: http://www.cpan.org/authors/id/C/CS/CSOE/PDL-%{version}.tar.gz Patch0: perl-PDL-settings.patch -Patch1: perl-PDL-2.4.2-fix_ia64_sdump.patch -Patch2: perl-PDL-2.4.3-cleanup.patch +Patch1: perl-PDL-2.4.2-fix_ia64_sdump.patch +Patch2: perl-PDL-2.4.3-cleanup.patch +Patch3: perl-PDL-2.4.3-test.patch +Patch4: perl-PDL-2.4.3-x86_64.patch +Patch5: perl-PDL-2.4.3-hdf.patch +Patch6: perl-PDL-2.4.3-Xext.patch +Patch7: perl-PDL-2.4.3-fortran.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 -BuildRequires: gsl-devel +BuildRequires: perl(ExtUtils::F77) BuildRequires: perl(Inline) +BuildRequires: perl(Test::More) +BuildRequires: fftw2-devel +BuildRequires: gcc-gfortran +BuildRequires: gd-devel +BuildRequires: gsl-devel +BuildRequires: hdf-devel +BuildRequires: libGLU-devel +BuildRequires: plplot-devel +BuildRequires: proj-devel +BuildRequires: ncurses-devel +BuildRequires: sharutils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl(PDL::Config) perl(PDL::PP::CType) perl(PDL::PP::Dims) Provides: perl(PDL::PP::PDLCode) perl(PDL::PP::SymTab) perl(PDL::PP::XS) -Provides: perl(PDL::Slatec) perl(PGPLOT) perl(PDL::LiteF) perl(PDL::Lite) -Provides: perl(PDL::Graphics::TriD), perl(PDL::Graphics::TriD::Contours) -Provides: perl(PDL::Graphics::TriD::GL), perl(PDL::Graphics::TriD::Image) -Provides: perl(PDL::Graphics::TriD::Tk) +Provides: perl(PGPLOT) perl(PDL::LiteF) perl(PDL::Lite) +Provides: perl(PDL::Graphics::TriD::GL) perl(PDL::Graphics::TriD::Objects) %{?!DEBUG: %define DEBUG 0} @@ -29,7 +43,7 @@ Provides: perl(PDL::Graphics::TriD::Tk) PDL ("Perl Data Language") gives standard Perl the ability to compactly store and speedily manipulate the large N-dimensional data arrays which are the bread and butter of scientific computing. PDL -turns perl in to a free, array-oriented, numerical language similar to +turns perl into a free, array-oriented, numerical language similar to such commercial packages as IDL and MatLab. @@ -38,6 +52,12 @@ such commercial packages as IDL and MatLab. %patch0 -p1 -b .settings %patch1 -p1 %patch2 -p1 -b .cleanup +%patch3 -p1 -b .test +%patch4 -p1 -b .x86_64 +%patch5 -p1 -b .hdf +%patch6 -p1 -b .Xext +%patch7 -p1 -b .fortran + # Provides: explicitly filter perl(Inline) cat <<__EOF__ > %{name}-findperlprovides #!/bin/sh @@ -49,7 +69,7 @@ chmod +x %{__perl_provides} # Requires: explicitly filter perl(Tk) cat <<__EOF__ > %{name}-findperlrequires #!/bin/sh -%{__perl_requires} \$* | grep -v 'perl(Tk)' +%{__perl_requires} \$* | grep -v 'perl(Tk)' | grep -v 'perl(Win32::DDE::Client)' __EOF__ %define __perl_requires %{_builddir}/PDL-%{version}/%{name}-findperlrequires chmod +x %{__perl_requires} @@ -70,6 +90,7 @@ CFLAGS="$RPM_OPT_FLAGS -Wno-unused" %ifarch ppc ppc64 s390 s390x CFLAGS="$CFLAGS -fsigned-char" %endif +CFLAGS="$CFLAGS -DNCURSES" CFLAGS="$CFLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$CFLAGS" make OPTIMIZE="$CFLAGS" # smp flags blows up spectacularly (2.4.1-10 May 7th 2005) @@ -85,15 +106,18 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -file=$RPM_BUILD_ROOT%{_mandir}/man3/PDL::Func.3pm -iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" -mv -f "${file}_" "$file" + +for file in $RPM_BUILD_ROOT%{_mandir}/man3/PDL::Func.3pm $RPM_BUILD_ROOT%{_mandir}/man3/PDL::Complex.3pm; do + iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" + mv -f "${file}_" "$file" +done + %if %{DEBUG} /usr/lib/rpm/brp-compress exit 0 %endif -%check || : +%check export PERL5LIB=`pwd`/blib/lib make test @@ -103,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING +%doc COPYING BUGS Changes Known_problems Release_Notes README %{_bindir}/* %{perl_vendorarch}/Inline/* %{perl_vendorarch}/PDL* @@ -113,10 +137,34 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 15 2007 Robin Norwood - 2.4-3-4 +- Updated perl-PDL-2.4.3-test.patch from Orion to fix ppc and ppc64 +- Fixed license string +- Fixed old changelog version number + +* Fri Aug 10 2007 Robin Norwood - 2.4.3-3 +- More changes from Orion Poplawski +- BuildRequires and patch for fortran/f77 support +- Added Provides: perl(PDL::Graphics::TriD::Object +- Filter perl(Win32::DDE::Client) from Requires + +* Mon Aug 06 2007 Robin Norwood - 2.4.3-2 +- Apply changes from package review +- untabify spec file +- Add various files to %%doc +- turn on 3D/GL +- turn on IO Browser +- add a bunch of BRs to enable more modules +- remove unneeded Provides +- perl-PDL-2.4.3-hdf.patch to look for hdf devel files in the right place +- perl-PDL-2.4.3-test.patch to fix some tests +- perl-PDL-2.4.3-x86_64.patch to find 64bit libraries for some modules +- perl-PDL-2.4.3-Xext.patch to remove -lXext from GL linking options + * Sat Dec 02 2006 Robin Norwood - 2.4.3-1 - Latest version from CPAN: 2.4.3 -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +* Wed Jul 12 2006 Jesse Keating - 2.4.2-4.fc5.1 - rebuild * Fri Mar 10 2006 Jason Vas Dias - 2.4.2-4 @@ -195,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT - automated release bump and build * Tue Jul 16 2002 Chip Turner -- updated %description +- updated %%description * Thu Jun 27 2002 Chip Turner - description update