Update of /cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1550
Modified Files:
octave-10.7.patch octave-3.2.4.info
Added Files:
fltk-backend-x11.patch fltk-backend.info octave-3.2.4.patch
Log Message:
Closing in on octave-3.2.4 packaging for release.
--- 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
PatchFile2: octave-10.7.patch
PatchFile2-MD5: adf5439f08870b6f7ba0d9be7e85bb22
PatchFile3: fltk-backend-x11.patch
PatchFile3-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 < %{PatchFile2}
else
patch -p1 < %{PatchFile3}
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.
<<
<<
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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- octave-3.2.4.info 29 Aug 2011 21:24:46 -0000 1.5
+++ octave-3.2.4.info 31 Aug 2011 17:47:10 -0000 1.6
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.2.4)
Version: 3.2.4
-Revision: 0.8000
+Revision: 0.9000
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -12,9 +12,9 @@
BuildDepends: <<
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
- libcurl4, fltk13-aqua, x11-dev, libftgl2, qhull6-dev, qrupdate,
+ libcurl4, libftgl2, qhull6-dev, qrupdate,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
- graphicsmagick-dev,
+ graphicsmagick-dev, freetype219,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
@@ -30,8 +30,11 @@
PatchFile: %{ni}.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
-PatchFile2: %{ni}-10.7.patch
-PatchFile2-MD5: a04b8081dbe76972f823d098097a26a2
+PatchFile2: %{ni}-%v.patch
+PatchFile2-MD5: 28dea047c7b3e51539a35b76249c8f67
+PatchFile3: %{ni}-10.7.patch
+PatchFile3-MD5: 77c28648a021b821f7106b5cfa8757af
+
PatchScript: <<
#!/bin/sh -ev
@@ -64,8 +67,9 @@
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
+ # disable FLTK backend
patch -p1 < %{PatchFile2}
+ patch -p1 < %{PatchFile3}
<<
SetLDFLAGS: -Wl,-dead_strip_dylibs
@@ -74,7 +78,7 @@
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-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+ --x-libraries=/usr/X11/lib --x-headers=/usr/X11/include
<<
CompileScript: <<
#!/bin/sh -ev
@@ -125,6 +129,7 @@
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
Conflicts: <<
@@ -222,14 +227,16 @@
<<
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), fltk13-aqua-shlibs,
glpk-shlibs,
- graphicsmagick-shlibs, libcurl4-shlibs, octave324-shlibs, pcre-shlibs,
+ 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
+ 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],
@@ -355,19 +362,27 @@
<<
DescPort: <<
- Thanks to Per Persson for most (if not all) of the work on the macos X port.
+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.
-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
-
+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
@@ -384,6 +399,9 @@
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.
+
+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
Index: octave-10.7.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci/octave-10.7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave-10.7.patch 27 Aug 2011 21:29:48 -0000 1.1
+++ octave-10.7.patch 31 Aug 2011 17:47:10 -0000 1.2
@@ -1,15 +1,17 @@
---- 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");
+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"
- #elif defined (HAVE_FRAMEWORK_CARBON)
-+ /* for 10.7 */
-+ size_t displayBitsPerPixel (CGDirectDisplayID displayId);
-+
++/* for 10.7 */
++size_t displayBitsPerPixel (CGDirectDisplayID displayId);
+
+ display_info *display_info::instance = 0;
- CGDirectDisplayID display = CGMainDisplayID ();
+ void
+@@ -70,7 +73,9 @@
if (display)
{
@@ -20,28 +22,35 @@
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);
-@@ -150,6 +156,24 @@
- return retval;
- }
+@@ -85,6 +90,7 @@
-+ size_t displayBitsPerPixel (CGDirectDisplayID displayId) {
-+
-+ CGDisplayModeRef mode =
CGDisplayCopyDisplayMode(displayId);
-+ size_t depth = 0;
+ rx = wd * 25.4 / wd_mm;
+ ry = ht * 25.4 / ht_mm;
+
-+ 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;
+ }
+ 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;
+
-+ CFRelease(pixEnc);
-+ CFRelease(mode);
-+ return depth;
-+ }
++ 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++ ***
------------------------------------------------------------------------------
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
