Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv8181
Modified Files:
physicalconstants-oct.info zenity-oct.info
Added Files:
fltk-backend-x11.patch fltk-backend.info octave-10.7.patch
octave-3.2.4.info octave-3.2.4.patch
Log Message:
Octave 3.2.4
New upstream Octave zenity package + 324 variant
324 variant of physicalconstants
--- NEW FILE: octave-3.2.4.patch ---
diff -Nurd octave-3.2.4.orig/src/Makefile.in octave-3.2.4/src/Makefile.in
--- octave-3.2.4.orig/src/Makefile.in 2009-06-03 08:32:49.000000000 -0400
+++ octave-3.2.4/src/Makefile.in 2011-08-30 18:51:07.000000000 -0400
@@ -67,7 +67,7 @@
cellfun.cc chol.cc ccolamd.cc colamd.cc colloc.cc \
conv2.cc convhulln.cc daspk.cc dasrt.cc dassl.cc det.cc \
dispatch.cc dlmread.cc dmperm.cc eig.cc eigs.cc fft.cc \
- fft2.cc fftn.cc fftw.cc filter.cc find.cc fltk_backend.cc \
+ fft2.cc fftn.cc fftw.cc filter.cc find.cc \
gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc \
lsode.cc lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc \
@@ -327,9 +327,6 @@
$(DLD_PICOBJ): \
ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS))
-fltk_backend.o pic/fltk_backend.o: \
- ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS)
$(GRAPHICS_CFLAGS))
-
XERBLA = ../libcruft/blas-xtra/xerbla.o
ifdef FPICFLAG
PIC_XERBLA = ../libcruft/blas-xtra/pic/xerbla.o
@@ -669,7 +666,6 @@
regexp.oct: OCT_LINK_DEPS += $(REGEX_LIBS)
urlwrite.oct: OCT_LINK_DEPS += $(CURL_LIBS)
__glpk__.oct: OCT_LINK_DEPS += $(GLPK_LIBS)
-fltk_backend.oct: OCT_LINK_DEPS += $(GRAPHICS_LIBS) $(FT2_LIBS)
check: all
.PHONY: check
--- NEW FILE: fltk-backend-x11.patch ---
diff -Nurd octave-3.2.4.orig/src/display.cc octave-3.2.4/src/display.cc
--- octave-3.2.4.orig/src/display.cc 2009-08-13 01:56:02.000000000 -0400
+++ octave-3.2.4/src/display.cc 2011-08-30 15:15:37.000000000 -0400
@@ -26,13 +26,7 @@
#include <cstdlib>
-#if defined (OCTAVE_USE_WINDOWS_API)
-#include <Windows.h>
-#elif defined (HAVE_FRAMEWORK_CARBON)
-#include <Carbon/Carbon.h>
-#elif defined (HAVE_X_WINDOWS)
#include <X11/Xlib.h>
-#endif
#include "display.h"
#include "error.h"
@@ -44,52 +38,6 @@
{
if (query)
{
-#if defined (OCTAVE_USE_WINDOWS_API)
-
- HDC hdc = GetDC (0);
-
- if (hdc)
- {
- dp = GetDeviceCaps (hdc, BITSPIXEL);
-
- ht = GetDeviceCaps (hdc, VERTRES);
- wd = GetDeviceCaps (hdc, HORZRES);
-
- double ht_mm = GetDeviceCaps (hdc, VERTSIZE);
- double wd_mm = GetDeviceCaps (hdc, HORZSIZE);
-
- rx = wd * 25.4 / wd_mm;
- ry = ht * 25.4 / ht_mm;
- }
- else
- warning ("no graphical display found");
-
-#elif defined (HAVE_FRAMEWORK_CARBON)
-
- CGDirectDisplayID display = CGMainDisplayID ();
-
- if (display)
- {
- dp = CGDisplayBitsPerPixel (display);
-
- ht = CGDisplayPixelsHigh (display);
- wd = CGDisplayPixelsWide (display);
-
- CGSize sz_mm = CGDisplayScreenSize (display);
-
- // On modern Mac systems (>= 10.5) CGSize is a struct keeping 2
- // CGFloat values, but the CGFloat typedef is not present on
- // older systems, so use double instead.
- double ht_mm = sz_mm.height;
- double wd_mm = sz_mm.width;
-
- rx = wd * 25.4 / wd_mm;
- ry = ht * 25.4 / ht_mm;
- }
- else
- warning ("no graphical display found");
-
-#elif defined (HAVE_X_WINDOWS)
const char *display_name = getenv ("DISPLAY");
@@ -124,11 +72,6 @@
}
else
warning ("X11 DISPLAY environment variable not set");
-#else
-
- warning ("no graphical display found");
-
-#endif
}
}
--- NEW FILE: fltk-backend.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: 0.9000
Maintainer: Alexander Hansen <[email protected]>
Description: X11-based graphics backend for octave%type_pkg[oct]
DescDetail: <<
We build fltk-backend.oct separately to allow for variants that use Aqua and
X11.
<<
# disable atlas on 10.7 distro file until atlas is available
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,
octave%type_pkg[oct]-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.
<<
<<
--- NEW FILE: octave-3.2.4.info ---
Info2: <<
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
Revision: 0.9000
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
BuildDepends: <<
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,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}, (%type_raw[-atlas] != -atlas)
%{Ni}-atlas,
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
UseMaxBuildJobs: true
PatchFile: %{ni}.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
PatchFile2: %{ni}-%v.patch
PatchFile2-MD5: 28dea047c7b3e51539a35b76249c8f67
PatchFile3: %{ni}-10.7.patch
PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
cp doc/interpreter/%{Ni}-bug.1 doc/interpreter/%{Ni}-bug-%v.1
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-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' %{Ni}-forge* %{Ni}rc
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
# disable FLTK backend
patch -p1 < %{PatchFile2}
# fix lack of CGDisplayBitsPerPixel
patch -p1 < %{PatchFile3}
<<
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 --disable-static --without-mpi --with-hdf5
--with-fftw \
--x-libraries=/usr/X11/lib --x-includes=/usr/X11/include
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-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'
fi
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,%{Ni}305-dev,%{Ni}305-atlas-dev
src
<<
InfoTest: <<
TestScript: make check || exit 2
<<
InstallScript: <<
#!/bin/sh -ev
export MAKEFLAGS=-j1
make install DESTDIR=%d
# install Fink-specific octaverc which points at our oct-versioned
# package directory
cp %b/%{Ni}rc %i/share/%{Ni}/%v/m/startup
mkdir -p %i/var/%{Ni}/%v/
# install examples
mkdir -p %i/share/%{Ni}/%v/doc/examples
cp -R examples %i/share/%{Ni}/%v/doc/examples
pushd %i/bin
# clear out hardcoded Fink sed
for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
# remove autogenerated freedesktop.org desktop file
rm -f %i/share/applications/www.%{Ni}.org-%{Ni}.desktop
mkdir -p %i/share/%{Ni}/%v/scripts
# install the octave-forge helper scripts
cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts
chmod a+x %i/share/%{Ni}/%v/scripts/*
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-shlibs,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-shlibs,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-shlibs,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-shlibs,
%{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, qrupdate-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.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
interpreter itself, as well as for packages that build against Octave,
such as the various octave-forge packages.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
to install the hdf5-oldapi and fftw3 packages, as well as
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
It cannot Depend on them since they are BuildDependsOnly.
Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
SplitOff2: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
%{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{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),
%{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev
<<
BuildDependsOnly: true
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
bin/octave-config*
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
PostInstScript: <<
os_version=`sw_vers -productVersion | cut -d. -f2`
case $os_version in
7) sed -i -e 's|@WRAPPER@|clang|' %p/bin/mkoctfile-%v ;;
6) sed -i -e 's|@WRAPPER@|10.6|' %p/bin/mkoctfile-%v ;;
5) sed -i -e 's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v
;;
esac
<<
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
Note: mkoctfile encodes the compiler wrappers that Fink uses.
Use "fink reinstall %n" if you update your OS in-place
and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
to install the hdf5-oldapi and fftw3 packages, as well as
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
It cannot Depend on them since they are BuildDependsOnly.
Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
hdf5-oldapi and fftw3.
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
Splitoff3: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), glpk-shlibs,
graphicsmagick-shlibs, libcurl4-shlibs,
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs, pcre-shlibs,
qhull6-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
ncurses, gnuplot | gnuplot-nox | gnuplot-nogtk,
fltk-backend-aqua-oct%type_pkg[oct] | fltk-backend-x11-oct%type_pkg[oct]
<<
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct],
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{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)
<<
Files: <<
share/%{Ni}/%v
lib/%{Ni}/%v
bin/%{Ni}-%v
bin/%{Ni}-bug-%v
var/%{Ni}/%v
<<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
core functionality of the Octave interpreter. Note that the GNU info
file,
which provides the core documentation, is installed as part of the %{Ni}
package.
Octave provides a convenient command line interface for solving linear
and
nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab.
It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating ordinary
functions, manipulating polynomials, and integrating ordinary
differential
and differential-algebraic equations. It is easily extensible and
customizable via user-defined functions written in Octave's own
language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
<<
DescUsage: <<
By default the plotting output (via gnuplot) is directed to AquaTerm.
This can be overidden in your startup scripts, e.g.
export GNUTERM=x11
in bash
or
setenv GNUTERM x11
in tcsh.
Note: Fink's Octave implementation modifies one of the startup files,
%p/share/%{Ni}/%v/m/startup/octaverc,
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
You'll need torun the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
Description: MATLAB-like language for computations
DescDetail: <<
The %{Ni}%type_pkg[-atlas] package contains unversioned executables and an
unversioned directory tree.
Octave provides a convenient command line interface for solving linear and
nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab.
It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating ordinary
functions, manipulating polynomials, and integrating ordinary differential
and differential-algebraic equations. It is easily extensible and
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
Note: mkoctfile encodes the compiler wrappers that Fink uses.
Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
and it will be updated for your new OS version.
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
to install the hdf5-oldapi and fftw3 packages, as well as
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
It cannot Depend on them since they are BuildDependsOnly.
Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need to
BuildDepend on hdf5-oldapi and fftw3.
By default the plotting output (via gnuplot) is directed to AquaTerm.
This can be overidden in your startup scripts, e.g.
export GNUTERM=x11
in bash
or
setenv GNUTERM x11
in tcsh.
Note: Fink's Octave implementation modifies one of the startup files,
%p/share/%{Ni}/%v/m/startup/octaverc,
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc' or '-f'
flags in your Octave script, these packages won't be visible. You'll need to
run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
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.
Cleanups from David Fang to get the package to build using clang.
<<
DescPackaging: <<
Not sane (and now not even compilable) to use private code
from glpk. Import the functions needed so can still use it
even when glpk stops exporting its internals. See:
http://octave.1599824.n4.nabble.com/GLPK-interface-was-Re-Multithreaded-Atlas-td1654632.html
Set the GNUTERM environment variable to AquaTerm because autodetection
of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
AquaTerm seems to be a sensible default, particularly since gnuplot-nox is also
a
legal dependency.
Create manpages for the versioned executables.
Remove a desktop file that gets generated only for users with GNOME/KDE
installed.
Patch mkoctfile.in so that it uses Fink's compiler wrappers
when building octave packages by hand. This is critical for 10.6/i386 users.
We have split the package up into runtime, development, and library packages,
to make upgrades easier for us and for users.
We generate common octave-forge bash and octave scripts,
based on the ones by Johnathan Stickel in the original octave-forge-foo
packages, in _this_ package, so that any required changes can be made in
a common location rather than spread out over many packages.
Unfortunately, Octave's 'pkg' tool doesn't seem to know how to deal with
variables, and the individual octave-forge packages have to make copies
of the octave scripts during their build process and edit them to use the
package's name.
We don't build the FLTK backend since we are allowing for Aqua and X11 variants
of that bundle in the fltk-backend-{aqua|x11}.
<<
Homepage: http://www.octave.org/
License: GPL
<<
--- NEW FILE: octave-10.7.patch ---
diff -Nurd octave-3.2.4.orig/src/display.cc octave-3.2.4/src/display.cc
--- octave-3.2.4.orig/src/display.cc 2009-08-13 01:56:02.000000000 -0400
+++ octave-3.2.4/src/display.cc 2011-08-31 10:55:44.000000000 -0400
@@ -37,6 +37,9 @@
#include "display.h"
#include "error.h"
+/* for 10.7 */
+size_t displayBitsPerPixel (CGDirectDisplayID displayId);
+
display_info *display_info::instance = 0;
void
@@ -70,7 +73,9 @@
if (display)
{
- dp = CGDisplayBitsPerPixel (display);
+
+ /*dp = CGDisplayBitsPerPixel (display);*/
+ dp = displayBitsPerPixel (display);
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);
@@ -85,6 +90,7 @@
rx = wd * 25.4 / wd_mm;
ry = ht * 25.4 / ht_mm;
+
}
else
warning ("no graphical display found");
@@ -149,6 +155,23 @@
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: ***
Index: physicalconstants-oct.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/physicalconstants-oct.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- physicalconstants-oct.info 17 Aug 2011 22:44:53 -0000 1.2
+++ physicalconstants-oct.info 1 Sep 2011 00:47:57 -0000 1.3
@@ -1,6 +1,6 @@
Info2: <<
Package: physicalconstants-oct%type_pkg[oct]
-Type: oct (3.0.5), forge (physicalconstants)
+Type: oct (3.0.5 3.2.4), forge (physicalconstants)
Version: 0.1.7
Revision: 2
Maintainer: Alexander Hansen <[email protected]>
Index: zenity-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/zenity-oct.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- zenity-oct.info 17 Aug 2011 22:44:53 -0000 1.4
+++ zenity-oct.info 1 Sep 2011 00:47:57 -0000 1.5
@@ -1,8 +1,8 @@
Info2: <<
Package: zenity-oct%type_pkg[oct]
-Version: 0.5.6
-Type: oct (3.0.5), forge (zenity)
-Revision: 3
+Version: 0.5.7
+Type: oct (3.0.5 3.2.4), forge (zenity)
+Revision: 1
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/zenity/index.html
@@ -40,7 +40,7 @@
Conflicts: octave-forge, octave-forge-%type_raw[forge] (<< 0.5.6-999)
Replaces: octave-forge-%type_raw[forge] (<< 0.5.6-999)
-Source-MD5: 683906514f32df59a6e02c399e4c2d7b
+Source-MD5: 2833e5048c25ff5440f1a67435c25dcd
# You do not change anything from this point down, unless absolutely necessary,
# since all of the foo-oct%type_pkg[oct] packages are designed to be
built/installed
------------------------------------------------------------------------------
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
