Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv21727/10.7/stable/main/finkinfo/sci
Modified Files:
general-oct-1.2.2.info miscellaneous-oct.info
physicalconstants-oct.info zenity-oct.info
Added Files:
fltk-backend-oct-3.2.4.info
Removed Files:
fltk-backend.info
Log Message:
Validation fix for fltk-backend*
Internal commentary updates for the others.
--- fltk-backend.info DELETED ---
Index: physicalconstants-oct.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/physicalconstants-oct.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- physicalconstants-oct.info 1 Sep 2011 10:55:45 -0000 1.4
+++ physicalconstants-oct.info 1 Sep 2011 15:03:27 -0000 1.5
@@ -15,7 +15,12 @@
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
-# fftw3, hdf5.7-oldapi
+# fftw3,
+# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
+# ( %type_pkg[oct] != 305 ) hdf5.7
+#
+# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
+# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
Index: zenity-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/zenity-oct.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- zenity-oct.info 1 Sep 2011 10:55:45 -0000 1.6
+++ zenity-oct.info 1 Sep 2011 15:03:27 -0000 1.7
@@ -27,7 +27,12 @@
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
-# fftw3, hdf5.7-oldapi
+# fftw3,
+# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
+# ( %type_pkg[oct] != 305 ) hdf5.7
+#
+# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
+# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
Index: miscellaneous-oct.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/miscellaneous-oct.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- miscellaneous-oct.info 17 Aug 2011 22:44:53 -0000 1.6
+++ miscellaneous-oct.info 1 Sep 2011 15:03:27 -0000 1.7
@@ -32,7 +32,12 @@
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
-# fftw3, hdf5.7-oldapi
+# fftw3,
+# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
+# ( %type_pkg[oct] != 305 ) hdf5.7
+#
+# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
+# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
Index: general-oct-1.2.2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/general-oct-1.2.2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- general-oct-1.2.2.info 1 Sep 2011 10:56:55 -0000 1.1
+++ general-oct-1.2.2.info 1 Sep 2011 15:03:27 -0000 1.2
@@ -42,7 +42,12 @@
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
-# fftw3, hdf5.7-oldapi
+# fftw3,
+# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
+# ( %type_pkg[oct] != 305 ) hdf5.7
+#
+# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
+# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
--- NEW FILE: fltk-backend-oct-3.2.4.info ---
Info2: <<
Package: fltk-backend-%type_pkg[ui]-oct%type_pkg[oct]
Type: ui (x11 aqua), oct(3.2.4)
Version: 3.2.4
Revision: 2
Maintainer: Alexander Hansen <[email protected]>
Description: Graphics backend for octave%type_pkg[oct]
DescDetail: <<
We build fltk-backend.oct separately to allow for variants that use Aqua and
X11. Install fltk-backend-aqua-oct%type_pkg[oct] if you want the Aqua
interface,
and fltk-backend-x11-oct%type_pkg[oct] if you want the X11 one.
<<
Source: mirror:gnu:octave/octave-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
SourceDirectory: octave-%v
BuildDepends: <<
(%type_pkg[ui] = x11) fltk-x11,
(%type_pkg[ui] = x11) x11-dev,
(%type_pkg[ui] = aqua) fltk13-aqua,
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, libftgl2, qhull6-dev, qrupdate,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev, freetype219, libftgl2
<<
Depends: <<
(%type_pkg[ui] = x11) fltk-x11-shlibs,
(%type_pkg[ui] = x11) x11,
(%type_pkg[ui] = aqua) fltk13-aqua-shlibs
<<
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
GCC: 4.0
Conflicts: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
Replaces: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
UseMaxBuildJobs: true
PatchFile: octave.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
PatchFile3: octave-10.7.patch
PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
PatchFile2: fltk-backend-x11.patch
PatchFile2-MD5: 6dd5be3b8d199fb76a72997ea50d05d4
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/octave.1 doc/interpreter/octave-%v.1
cp doc/interpreter/octave-bug.1 doc/interpreter/octave-bug-%v.1
cp doc/interpreter/octave-config.1 doc/interpreter/octave-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
sed -i -e 's|@FINKPREFIX@|%p|g' octave-forge* octaverc
doc/interpreter/*.1 mkoctfile.in
# fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
# wrong include dir for qhull6
for f in `grep -l -r "qhull_a\.h" src`
do sed -i.orig -e '/include/s|qhull/|lib&|' $f
done
# more patching by fangism
# silence some warnings
sed -i.orig -e '/ibasea/s|\*ibasea, ||' \
-e '/ibasea/s| ibasea =.*||' \
liboctave/oct-sort.cc
# should this accompany -D_THREAD_SAFE? in CFLAGS,CXXFLAGS
sed -i.orig '/#include.*Range\.h/i\
#define _REENTRANT' liboctave/lo-specfun.cc
# need size_t from <cstddef>
sed -i.orig -e '/#define octave_oct_alloc_h/a\
using std::size_t;' liboctave/oct-alloc.h
# needed by clang++, safe for g++: using-declaration as typedef
for f in liboctave/DiagArray2.h liboctave/intNDArray.h
do sed -i.orig -e '/using.*element_type;/s|using|& typename|' $f
done
# missing qualifier to dependent-name member-function
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
# Needed for 10.7 only, but may work on earlier OSes
if [ "%type_pkg[ui]" = "aqua" ]
then
patch -p1 < %{PatchFile3}
else
patch -p1 < %{PatchFile2}
fi
<<
SetLDFLAGS: -Wl,-dead_strip_dylibs
SetLIBS: -lGraphicsMagick -lmetis
ConfigureParams: <<
F77=%p/bin/gfortran-fsf-4.6 --host=%m-apple-darwin
--build=%m-apple-darwin \
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' \
--enable-shared --enable-dl --without-mpi --with-hdf5 --with-fftw \
(%type_pkg[ui] = x11 ) --with-x \
(%type_pkg[ui] = x11 ) --x-libraries=/usr/X11/lib \
(%type_pkg[ui] = x11 ) --x-includes=/usr/X11/include \
(%type_pkg[ui] = x11 ) --without-framework-carbon \
(%type_pkg[ui] = aqua ) --without-x \
(%type_pkg[ui] = aqua ) --with-framework-carbon \
--disable-static
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-O3'
export FFLAGS='-O3 -ff2c'
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
FLIBDIR="%p/lib/gcc4.6/lib"
./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=octave,octave-atlas,octave%type_raw[oct]-dev,octave%type_raw[oct]-atlas-dev,octave305-dev,octave305-atlas-dev
src
<<
InstallScript: <<
mkdir -p %i/lib/octave/%type_raw[oct]/oct/%m-apple-darwin
cp src/fltk_backend.oct %i/lib/octave/%type_raw[oct]/oct/%m-apple-darwin/
<<
DocFiles: COPYING
Homepage: http://www.octave.org/
License: GPL
DescPort: <<
Aqua variant:
Apply fix from
http://lukassen.wordpress.com/2010/01/18/taming-snow-leopard-cgdisplaybitsperpixel-deprication/
,
with improvements from Peter O'Gorman and Daniel Macks, to display.cc
to work around the lack of
CGDisplayBitsPerPixel on 10.7.
X11 variant:
Rip out #if defined ... #elif ... #endif branches in display.cc that
don't pertain to X11.
<<
DescPackaging: <<
Currently we build all of octave and then only install
fltk_backend.oct.
<<
<<
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
