Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29582/10.7/stable/main/finkinfo/sci
Modified Files:
bundle-octave.info image-oct-1.0.15.info image-oct.info
image-oct305.info
Added Files:
image1.0.15-oct.info
Log Message:
image-oct360+: Missing dependency on gcc4N-shlibs
image-oct324|343: Change to a dummy upgrade package because the build
has been linking -atlas, lapack342 or
accelerate
based on what Octave was built with and
without
explicit dependencies.
image1.0.15-(|atlas|ref)-oct324|343: new package name with proper dependencies.
image-oct305: Update libversions of dependencies.
bundle-octave324|343*: switch to image1.0.15*-oct
Index: image-oct-1.0.15.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/image-oct-1.0.15.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- image-oct-1.0.15.info 28 May 2013 04:57:19 -0000 1.4
+++ image-oct-1.0.15.info 20 Jun 2013 05:39:48 -0000 1.5
@@ -1,202 +1,18 @@
Info2: <<
Package: image-oct%type_pkg[oct]
Version: 1.0.15
-Type: oct (3.2.4 3.4.3), forge (image), gcc (4.8)
-Revision: 7
+Type: oct (3.2.4 3.4.3), bundle
+Revision: 8
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Homepage: http://octave.sourceforge.net/image/index.html
-Description: Image tools for octave
-DescDetail: <<
-The Octave-forge Image package provides functions for processing images.
-The package supports almost all image formats through the use of
-GraphicsMagick. The package also provides functions for
-feature extraction, image statistics, spatial and geometric transformations,
-morphological operations, linear filtering, and much more.
-
-This package provides the following functions:
-Display:
- image
- imagesc
- imshow
- rgbplot
-Read/write:
- imfinfo
- imginfo
- bmpwrite
- readexif
- tiff_tag_read
-Reshape:
- imcrop
- imremap
- imperspectivewarp
- imresize
- imrotate
- imrotate_Fourier
- imtranslate
- imshear
- impad
- padarray
- rotate_scale
-Analysis and Statistics:
- fftconv2
- corr2
- imhist
- mean2
- std2
- entropy
- qtdecomp
- qtgetblk
- qtsetblk
- graycomatrix
- houghtf
- hough_line
- hough_circle
- graythresh
- immaximas
- phantom
-Filtering:
- imfilter
- colfilt
- fspecial
- imsmooth
- histeq
- imadjust
- imnoise
- medfilt2
- ordfilt2
- ordfiltn
- uintlut
- stretchlim
- makelut
- applylut
- deriche
- radon
- rho_filter
- iradon
- nonmax_supress
-Black and white image functions:
- bwarea
- bwboundaries
- bwconncomp
- bwdist
- bweuler
- bwfill
- bwlabel
- bwmorph
- bwperim
- bwselect
- dilate
- erode
- bwborder
- edge
- conndef
- bwhitmiss
- regionprops
- fchcode
-Morhophological Operations:
- imerode
- imdilate
- imopen
- imclose
- imtophat
-Colour controls:
- cmpermute
- cmunique
- imapprox
- rgb2ycbcr
- ycbcr2rgb
-Representation:
- dither
- gray2ind
- grayslice
- im2bw
- im2double
- im2uint8
- im2uint16
- ind2gray
- ind2rgb
- isbw
- isgray
- isind
- isrgb
- mat2gray
- rgb2gray
- rgb2ind
- label2rgb
- imcomplement
-Colour maps:
- flag
- lines
- colorcube
- vga
- contrast
- colorgradient
-Region-based and block processing:
- roicolor
- roifill
- roifilt2
- roipoly
- poly2mask
- bestblk
- blkproc
- nlfilter
- im2col
- col2im
- rangefilt
- stdfilt
- entropyfilt
-<<
-License: GPL2+
-
-BuildDepends: <<
- graphicsmagick-dev,
- liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
- fink-octave-scripts (>= 0.1.2),
- fftw3,
- hdf5.8,
- fink (>=0.32)
-<<
-RuntimeDepends: graphicsmagick-imagemagick-compat | imagemagick
+Description: OBSOLETE: use image-<variant>-oct%type_pkg[oct]
Depends: <<
- graphicsmagick-shlibs,
- octave%type_pkg[oct]-interpreter,
- fftw3-shlibs,
- ( %type_pkg[oct] = 324 ) hdf5.8-shlibs,
- ( %type_pkg[oct] = 324 ) libncurses5-shlibs,
- ( %type_pkg[oct] = 324 ) readline5-shlibs,
- gcc%type_pkg[gcc]-shlibs
-<<
-Conflicts: octave-forge
-
-Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
-Source-MD5: c80baf7e27a44a3366847012099df0d1
-
-SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
-UseMaxBuildJobs: false
-BuildAsNobody: false
-
-CompileScript: <<
-#!/bin/sh -ev
-export OCTAVE=%p/bin/octave-%type_raw[oct]
-pkgsrc=%type_raw[forge]-%v
-
-##### Invariant stuff begins here #####
-%p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v
%type_raw[oct] %b %i $pkgsrc
-./octave-forge-compile.sh
+ image1.0.15-oct%type_pkg[oct] | image1.0.15-atlas-oct%type_pkg[oct] |
image1.0.15-ref-oct%type_pkg[oct],
+ fink-obsolete-packages
<<
-
-InstallScript: ./octave-forge-install.sh
-PostInstScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-postinst.sh
-PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.sh
-
-DescPackaging: <<
-Common for all octave-forge packages:
-
-We read in postinst and prerm template scripts installed by octaveN and modify
-them to use the name of this package because Octave's package manager can't
-cope with non-literal arguments.
-
-The Type: forge (pkgname) is used to minimize what needs to be changed when
-using this .info file as a template.
+DescUsage: <<
+You will probably want to pick the image1.0.15* variant which matches the
+(-blas, -atlas, or nothing) option in your currently installed
+octave%type_pkg[oct]*
<<
<<
Index: image-oct305.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/image-oct305.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- image-oct305.info 28 May 2013 04:58:31 -0000 1.11
+++ image-oct305.info 20 Jun 2013 05:39:48 -0000 1.12
@@ -2,7 +2,7 @@
Package: image-oct305
Type: oct (3.0.5), forge (image), gcc (4.8)
Version: 1.0.8
-Revision: 22
+Revision: 23
Epoch: 1
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Homepage: http://octave.sourceforge.net/image/index.html
@@ -149,9 +149,9 @@
License: GPL2
BuildDepends: <<
- imagemagick2-dev,
- libjpeg8,
- libpng14,
+ imagemagick7-dev,
+ libjpeg9,
+ libpng15,
liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
fftw3,
hdf5.8-oldapi,
@@ -159,9 +159,9 @@
<<
RuntimeDepends: imagemagick | graphicsmagick-imagemagick-compat
Depends: <<
- imagemagick2-shlibs,
- libjpeg8-shlibs,
- libpng14-shlibs,
+ imagemagick7-shlibs,
+ libjpeg9-shlibs,
+ libpng15-shlibs,
octave%type_pkg[oct]-interpreter,
gcc%type_pkg[gcc]-shlibs
<<
@@ -185,7 +185,7 @@
CompileScript: <<
#!/bin/sh -ev
-export LDFLAGS=`mkoctfile-%type_raw[oct] -p 'LDFLAGS'`
+export LIBS=`Magick++-config --libs`
export OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
pkgsrc=%type_raw[forge]-%v
@@ -206,7 +206,7 @@
1.0.8-20: Apply patch inspired by
http://trac.macports.org/browser/ ts/octave-forge-compile.sh
%type_raw[forge]-%v st.sh type_pkg[oct], + réBª~+ Àº .ÿ 0» .ÿ ujBª~+ Cª~+
cª~+ x_«~+ 0» .ÿ «~+
° .ÿ ð® .ÿ kBª~+ 6
è è ! è ! Àº .ÿ 0» .ÿ x4_«~+
± .ÿ bBª~+ Bª~+ Àº .ÿ `bBª~+ ÿº .ÿ À/ë~+ ujBª~+
ë~+ Ø$ë~+ ¨)ë~+ Cª~+ x4_«~+
± .ÿ ð¯ .ÿ kBª~+ à! à! Àº .ÿ 0» .ÿ Hþ>«~+ ² .ÿ bBª~+ Bª~+ Àº .ÿ `bBª~+ ÿº .ÿ ðº .ÿ èº .ÿ 8cª~+ p 0» .ÿ ujBª~+ Cª~+ ² .ÿ а .ÿ kBª~+ G H I J K M N O P Àº .ÿ 0» .ÿ Hµ«~+
³ .ÿ bBª~+ Bª~+ Àº .ÿ 0/ë~+ ujBª~+ @_«~+
éòª~+ ë~+ Ø$ë~+ ¨)ë~+ Cª~+ Hµ«~+
³ .ÿ à± .ÿ kBª~+ 8µ«~+
³ .ÿ ² .ÿ kBª~+ (µ«~+
³ .ÿ @² .ÿ kBª~+ µ«~+ ³ .ÿ p² .ÿ kBª~+
¨.ë~+ ujBª~+ ¨)ë~+ ð¬ .ÿ 8óª~+ eiBª~+ Ø$ë~+ ³ .ÿ y8óª~+ eiBª~+
ë~+ @³ .ÿ Z8óª~+ eiBª~+ Øäòª~+ @_«~+ éòª~+
ë~+ ØD_«~+ Ø$ë~+ ¨)ë~+ Cª~+ 8cª~+ ¾ª~+ 0» .ÿ p{òª~+ ð´ .ÿ À³ .ÿ kBª~+ 5 6 7 8 : < = > ? @ B D Àº .ÿ 0» .ÿ
±»ª~+ 0» .ÿ ujBª~+
cª~+ p³ .ÿ ¾ª~+ eiBª~+
cª~+ Õ_@f ÆS
Qöl±í ìê~+ 0» .ÿ
±»ª~+ ¶ .ÿ д .ÿ kBª~+ u]ÞÓ 4Q
÷U^Qʧ ¶uª¹ñìò*ÄvÀº .ÿ 0» .ÿ Hþª~+ ¸ .ÿ bBª~+ Bª~+ Àº .ÿ `bBª~+ ÿº .ÿ ðº .ÿ èº .ÿ O_«~+ ujBª~+ ØD_«~+
I_«~+ Cª~+ ¸ .ÿ Àµ .ÿ kBª~+ 8þª~+ ¸ .ÿ ðµ .ÿ ktrunk/dports/math/octave-image/files/png14.patch?rev=91298
-to allow use of libpng14
+to allow use of libpng14+.
Common for all octave-forge packages:
Index: bundle-octave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/bundle-octave.info,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- bundle-octave.info 30 Apr 2013 23:32:32 -0000 1.47
+++ bundle-octave.info 20 Jun 2013 05:39:48 -0000 1.48
@@ -1,7 +1,7 @@
Info2: <<
Package: bundle-octave%type_pkg[oct]%type_pkg[-blas]
Version: 20130219
-Revision: 4
+Revision: 5
Type: bundle, oct (3.0.5 3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3 3.6.4), -blas
(-atlas -ref .)
Depends: <<
octave%type_pkg[oct]%type_pkg[-blas] |
octave%type_pkg[oct]%type_pkg[-blas]-x11,
@@ -42,7 +42,10 @@
( %type_pkg[oct] = 305 ) graceplot-oct%type_pkg[oct],
gnuplot-oct%type_pkg[oct],
gsl-oct%type_pkg[oct],
-image-oct%type_pkg[oct],
+( %type_pkg[oct] = 305 ) image-oct%type_pkg[oct],
+( %type_pkg[oct] = 324 ) image1.0.15%type_pkg[-blas]-oct%type_pkg[oct],
+( %type_pkg[oct] = 343 ) image1.0.15%type_pkg[-blas]-oct%type_pkg[oct],
+( %type_pkg[oct] >= 360 ) image-oct%type_pkg[oct],
informationtheory-oct%type_pkg[oct],
integration-oct%type_pkg[oct],
io-oct%type_pkg[oct],
Index: image-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/image-oct.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- image-oct.info 28 May 2013 04:58:31 -0000 1.16
+++ image-oct.info 20 Jun 2013 05:39:48 -0000 1.17
@@ -2,7 +2,7 @@
Package: image-oct%type_pkg[oct]
Version: 2.0.0
Type: oct (3.6.0 3.6.1 3.6.2 3.6.3 3.6.4), forge (image), gcc (4.8)
-Revision: 2
+Revision: 3
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Homepage: http://octave.sourceforge.net/image/index.html
Description: Image tools for octave
@@ -159,7 +159,7 @@
fink (>=0.32)
<<
RuntimeDepends: graphicsmagick-imagemagick-compat | imagemagick,
signal-oct%type_pkg[oct] (>= 1.2.0-1)
-Depends: octave%type_pkg[oct]-interpreter
+Depends: octave%type_pkg[oct]-interpreter, gcc%type_pkg[gcc]-shlibs
Conflicts: octave-forge
Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
--- NEW FILE: image1.0.15-oct.info ---
Info2: <<
Package: image1.0.15%type_pkg[-blas]-oct%type_pkg[oct]
Version: 1.0.15
Type: oct (3.2.4 3.4.3), forge (image), gcc (4.8), -blas (. -atlas -ref),
lapack (3.4.2)
Revision: 1
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
Homepage: http://octave.sourceforge.net/image/index.html
Description: Image tools for octave
DescDetail: <<
The Octave-forge Image package provides functions for processing images.
The package supports almost all image formats through the use of
GraphicsMagick. The package also provides functions for
feature extraction, image statistics, spatial and geometric transformations,
morphological operations, linear filtering, and much more.
This package provides the following functions:
Display:
image
imagesc
imshow
rgbplot
Read/write:
imfinfo
imginfo
bmpwrite
readexif
tiff_tag_read
Reshape:
imcrop
imremap
imperspectivewarp
imresize
imrotate
imrotate_Fourier
imtranslate
imshear
impad
padarray
rotate_scale
Analysis and Statistics:
fftconv2
corr2
imhist
mean2
std2
entropy
qtdecomp
qtgetblk
qtsetblk
graycomatrix
houghtf
hough_line
hough_circle
graythresh
immaximas
phantom
Filtering:
imfilter
colfilt
fspecial
imsmooth
histeq
imadjust
imnoise
medfilt2
ordfilt2
ordfiltn
uintlut
stretchlim
makelut
applylut
deriche
radon
rho_filter
iradon
nonmax_supress
Black and white image functions:
bwarea
bwboundaries
bwconncomp
bwdist
bweuler
bwfill
bwlabel
bwmorph
bwperim
bwselect
dilate
erode
bwborder
edge
conndef
bwhitmiss
regionprops
fchcode
Morhophological Operations:
imerode
imdilate
imopen
imclose
imtophat
Colour controls:
cmpermute
cmunique
imapprox
rgb2ycbcr
ycbcr2rgb
Representation:
dither
gray2ind
grayslice
im2bw
im2double
im2uint8
im2uint16
ind2gray
ind2rgb
isbw
isgray
isind
isrgb
mat2gray
rgb2gray
rgb2ind
label2rgb
imcomplement
Colour maps:
flag
lines
colorcube
vga
contrast
colorgradient
Region-based and block processing:
roicolor
roifill
roifilt2
roipoly
poly2mask
bestblk
blkproc
nlfilter
im2col
col2im
rangefilt
stdfilt
entropyfilt
<<
License: GPL2+
BuildDepends: <<
graphicsmagick-dev,
liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
( %type_pkg[oct] = 324 ) libncurses5,
( %type_pkg[oct] = 324 ) readline6,
( %type_raw[-blas] = -atlas ) atlas (>= 3.10.1-1),
( %type_raw[-blas] = . ) liboctave%type_pkg[oct]-accelerate-dev,
( %type_raw[-blas] = -atlas ) liboctave%type_pkg[oct]-newatlas-dev,
( %type_raw[-blas] = -ref ) lapack%type_pkg[lapack],
( %type_raw[-blas] = -ref) liboctave%type_pkg[oct]-ref-dev,
fink-octave-scripts (>= 0.1.2),
fftw3,
hdf5.8,
fink (>=0.32)
<<
RuntimeDepends: graphicsmagick-imagemagick-compat | imagemagick
Depends: <<
graphicsmagick-shlibs,
fftw3-shlibs,
( %type_pkg[oct] = 324 ) hdf5.8-shlibs,
( %type_pkg[oct] = 324 ) libncurses5-shlibs,
( %type_pkg[oct] = 324 ) readline6-shlibs,
( %type_raw[-blas] = -atlas ) atlas-shlibs (>= 3.10.1-1),
( %type_raw[-blas] = -atlas ) octave%type_pkg[oct]-interpreter-newatlas,
( %type_raw[-blas] = . ) octave%type_pkg[oct]-interpreter-accelerate,
( %type_raw[-blas] = -ref ) lapack%type_pkg[lapack]-shlibs,
( %type_raw[-blas] = -ref ) octave%type_pkg[oct]-interpreter-ref,
gcc%type_pkg[gcc]-shlibs
<<
Conflicts: <<
octave-forge,
image-oct%type_pkg[oct] (<< 1.0.15-8),
image1.0.15-oct%type_pkg[oct],
image1.0.15-atlas-oct%type_pkg[oct],
image1.0.15-ref-oct%type_pkg[oct]
<<
Replaces: <<
image-oct%type_pkg[oct] (<< 1.0.15-8),
image1.0.15-oct%type_pkg[oct],
image1.0.15-atlas-oct%type_pkg[oct],
image1.0.15-ref-oct%type_pkg[oct]
<<
Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
Source-MD5: c80baf7e27a44a3366847012099df0d1
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
UseMaxBuildJobs: false
BuildAsNobody: false
CompileScript: <<
#!/bin/sh -ev
export OCTAVE=%p/bin/octave-%type_raw[oct]
pkgsrc=%type_raw[forge]-%v
##### Invariant stuff begins here #####
%p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v
%type_raw[oct] %b %i $pkgsrc
./octave-forge-compile.sh
<<
InstallScript: ./octave-forge-install.sh
PostInstScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-postinst.sh
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.sh
DescPackaging: <<
We needed a new namespace because I found out that the builds link to whichever
BLAS/LAPACK provider Octave is built with, and it's simpler for the convenience
bundle
if we don't have an extra "syllable" for the version which uses
Accelerate.framework.
Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
<<
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
