Update of /cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv19644
Modified Files:
octave-3.2.4.info
Added Files:
octave-10.7.patch
Log Message:
Update 10.7-only octave
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- octave-3.2.4.info 19 Aug 2011 21:44:49 -0000 1.2
+++ octave-3.2.4.info 27 Aug 2011 21:29:48 -0000 1.3
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
-Revision: 0.0002
+Revision: 0.0009
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -11,9 +11,10 @@
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
BuildDepends: <<
- glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7), libcurl4,
- pcre, gcc46, suitesparse, qhull, fink (>= 0.28),
fink-package-precedence, sed,
- graphicsmagick-dev,
+ arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
+ libcurl4, fltk-x11, x11-dev, libftgl2, qhull6-dev, qrupdate,
+ pcre, gcc46-compiler, suitesparse, fink (>= 0.30.0),
fink-package-precedence, sed,
+ graphicsmagick-dev,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
@@ -29,6 +30,9 @@
PatchFile: %{ni}.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
+PatchFile2: %{ni}-10.7.patch
+PatchFile2-MD5: a04b8081dbe76972f823d098097a26a2
+
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
@@ -37,19 +41,46 @@
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' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
+ perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
+ # 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
+ # wrong namespace?
+ # sed -i.orig -e '/Quantum/s|Magick|&Lib|g'
src/DLD-FUNCTIONS/__magick_read__.cc
+ # wrong include dir for qhull
+ for f in `grep -l -r "qhull_a\.h" src`
+ do sed -i.orig -e '/include/s|qhull/|lib&|' $f
+ done
+ # 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
+ patch -p1 < %{PatchFile2}
<<
-SetLDFLAGS: -Wl,-dead_strip_dylibs
+# SetLDFLAGS: -Wl,-dead_strip_dylibs
ConfigureParams: <<
- F77=%p/bin/gfortran --host=%m-apple-darwin --build=%m-apple-darwin \
+ 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 --disable-static --without-mpi --with-hdf5
--with-fftw
+ --enable-shared --enable-dl --disable-static --without-mpi --with-hdf5
--with-fftw \
+ --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-O3'
- export FFLAGS='-O3'
+ export FFLAGS='-O3 -ff2c'
if [ "%type_pkg[-atlas]" == "" ]
then
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'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
@@ -57,11 +88,17 @@
FLIBDIR="%p/lib/gcc4.6/lib"
./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
- fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev
src
+ fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev
src
<<
+
InfoTest: <<
- TestScript: make check || exit 2
+ TestScript: <<
+# mv src/DLD-FUNCTIONS/qr.cc src/DLD-FUNCTIONS/qr.broken
+ make check || exit 2
+# mv src/DLD-FUNCTIONS/qr.broken src/DLD-FUNCTIONS/qr.cc
+ <<
<<
+
InstallScript: <<
#!/bin/sh -ev
export MAKEFLAGS=-j1
@@ -80,8 +117,6 @@
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
- # remove TeX stuff which may have been generated:
- rm %i/share/%{Ni}/ls-R %i/lib/%{Ni}/ls-R
# remove autogenerated freedesktop.org desktop file
rm -f %i/share/applications/www.%{Ni}.org-%{Ni}.desktop
mkdir -p %i/share/%{Ni}/%v/scripts
@@ -109,14 +144,14 @@
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
Shlibs: <<
- %p/lib/%{Ni}-%v/libcruft.dylib 0.0.0 %n (>=3.0.5-5)
- %p/lib/%{Ni}-%v/lib%{Ni}.dylib 0.0.0 %n (>=3.0.5-5)
- %p/lib/%{Ni}-%v/liboctinterp.dylib 0.0.0 %n (>=3.0.5-5)
+ %p/lib/%{Ni}-%v/libcruft.dylib 0.0.0 %n (>=3.2.4-0)
+ %p/lib/%{Ni}-%v/lib%{Ni}.dylib 0.0.0 %n (>=3.2.4-0)
+ %p/lib/%{Ni}-%v/liboctinterp.dylib 0.0.0 %n (>=3.2.4-0))
<<
DescDetail: <<
This package contains shared libraries which are used by the Octave
@@ -195,10 +230,8 @@
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
- glpk-shlibs, gnuplot (>=4.2.0) | gnuplot-nox | gnuplot-nogtk,
- fftw3-shlibs (>= 3.1.1-7),
- ncurses, aquaterm, libcurl4-shlibs,
- pcre-shlibs,
+ arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), fltk-x11-shlibs, glpk-shlibs,
+ libcurl4-shlibs, octave324-shlibs, pcre-shlibs, ncurses,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
<<
Conflicts: <<
--- NEW FILE: octave-10.7.patch ---
--- octave-3.2.4/src/display.cc 2009-08-13 01:56:02.000000000 -0400
+++ octave-3.2.4.patched/src/display.cc 2011-08-27 15:08:31.000000000 -0400
@@ -65,12 +65,18 @@
warning ("no graphical display found");
#elif defined (HAVE_FRAMEWORK_CARBON)
+ /* for 10.7 */
+ size_t displayBitsPerPixel (CGDirectDisplayID displayId);
+
+
CGDirectDisplayID display = CGMainDisplayID ();
if (display)
{
- dp = CGDisplayBitsPerPixel (display);
+
+ /*dp = CGDisplayBitsPerPixel (display);*/
+ dp = displayBitsPerPixel (display);
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);
@@ -150,6 +156,24 @@
return retval;
}
+ size_t displayBitsPerPixel (CGDirectDisplayID displayId) {
+
+ CGDisplayModeRef mode =
CGDisplayCopyDisplayMode(displayId);
+ size_t depth = 0;
+
+ CFStringRef pixEnc =
CGDisplayModeCopyPixelEncoding(mode);
+ if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels),
kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 32;
+ else if(CFStringCompare(pixEnc,
CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 16;
+ else if(CFStringCompare(pixEnc,
CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 8;
+
+ CFRelease(pixEnc);
+ CFRelease(mode);
+ return depth;
+ }
+
/*
;;; Local Variables: ***
;;; mode: C++ ***
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
