[SM-Commit] GIT changes to master grimoire by Robert Figura (249bc2c522791bc8cf835b3ac7caf993df043d65)

Robert Figura scm at sourcemage.org
Thu Jan 14 21:04:19 EST 2010


GIT changes to master grimoire by Robert Figura <template at sourcemage.org>:

 dev/null                                  |binary
 graphics-libs/vips/DEPENDS                |   37 +++++++++++++++++-------------
 graphics-libs/vips/DETAILS                |    4 +--
 graphics-libs/vips/HISTORY                |    5 ++++
 graphics-libs/vips/PRE_BUILD              |   26 ---------------------
 graphics-libs/vips/vips-7.12.5.tar.gz.sig |    0 
 graphics-libs/vips/vips-7.16.2.tar.gz.sig |    0 
 graphics/nip2/CONFIGURE                   |    2 -
 graphics/nip2/DEPENDS                     |    5 ++++
 graphics/nip2/DETAILS                     |    4 +--
 graphics/nip2/HISTORY                     |    5 ++++
 graphics/nip2/PRE_BUILD                   |   11 --------
 graphics/nip2/nip2-7.10.21.tar.gz.sig     |    0 
 graphics/nip2/nip2-7.16.1.tar.gz.sig      |    0 
 14 files changed, 42 insertions(+), 57 deletions(-)

New commits:
commit 249bc2c522791bc8cf835b3ac7caf993df043d65
Author: Robert Figura <template at sourcemage.org>
Commit: Robert Figura <template at sourcemage.org>

    nip2: version -> 7.20.7, removed PRE_BUILD, added optional dependencies

commit 678cdc4bd32a6542b9af0e6eeecf798bd371718b
Author: Robert Figura <template at sourcemage.org>
Commit: Robert Figura <template at sourcemage.org>

    vips: version -> 7.20.6, removed PRE_BUILD, more options

diff --git a/graphics-libs/vips/DEPENDS b/graphics-libs/vips/DEPENDS
index 8f6a765..02f5fad 100755
--- a/graphics-libs/vips/DEPENDS
+++ b/graphics-libs/vips/DEPENDS
@@ -1,17 +1,24 @@
-depends  g++  &&
-depends  gtk+2  &&
-depends  glib2  &&
-depends  pango  &&
-depends  libxml2  &&
-depends  gettext  &&
-depends  xorg-libs  &&
-depends  pkgconfig  &&
+depends  g++               &&
+depends  gtk+2             &&
+depends  glib2             &&
+depends  libxml2           &&
+depends  gettext           &&
+depends  xorg-libs         &&
+depends  pkgconfig         &&
 depends  xml-parser-expat  &&
 
-optional_depends  libpng       "" "--without-png"     "For PNG support"    &&
-optional_depends  tiff         "" "--without-tiff"    "For TIFF support"   &&
-optional_depends  zip          "" "--without-zip"     "For Zip support"    &&
-optional_depends  jpeg         "" "--without-jpeg"    "For JPEG support"   &&
-optional_depends  imagemagick  "" "--without-magick"  "For Magic support"  &&
-optional_depends  lcms         "" "--without-lcms"    "For LCMS support"   &&
-optional_depends  fftw         "" "--without-fftw"    "For FFT support"
+optional_depends  libexif      "--with-libexif"  "--without-libexif"  "For libexif support"    &&
+optional_depends  jpeg         "--with-jpeg"     "--without-jpeg"     "For JPEG support"       &&
+optional_depends  libpng       "--with-png"      "--without-png"      "For PNG support"        &&
+optional_depends  tiff         "--with-tiff"     "--without-tiff"     "For TIFF support"       &&
+optional_depends  openexr      "--with-openexr"  "--without-openexr"  "For openexr support"    &&
+optional_depends  libv4l       "--with-v4l"      "--without-v4l"      "For v4l support"        &&
+optional_depends  imagemagick  "--with-magick"   "--without-magick"   "For ImageMagic support" &&
+optional_depends  lcms         "--with-lcms"     "--without-lcms"     "For LCMS support"       &&
+optional_depends  cimg         "--with-cimg"     "--without-cimg"     "For cimg support"       &&
+optional_depends  fftw         "--with-fftw"     "--without-fftw"     "For FFT support"        &&
+optional_depends  liboil       "--with-liboil"   "--without-liboil"   "For liboil support"     &&
+optional_depends  zip          "--with-zip"      "--without-zip"      "For Zip support"        &&
+optional_depends  python       "--with-python"   "--without-python"   "For python bindings"    &&
+optional_depends  pango        "--with-pangoft2" "--without-pangoft2" "For pango support"
+
diff --git a/graphics-libs/vips/DETAILS b/graphics-libs/vips/DETAILS
index 0e9a44f..2e30d95 100755
--- a/graphics-libs/vips/DETAILS
+++ b/graphics-libs/vips/DETAILS
@@ -1,9 +1,9 @@
            SPELL=vips
-         VERSION=7.16.2
+         VERSION=7.20.6
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://www.vips.ecs.soton.ac.uk/supported/${VERSION:0:4}/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+     SOURCE_HASH=sha512:6fe6413f984b9ab50c4f2b0259f311fad4a4ac242f43a7e5a8f9936d0cdad9e6635a9e7018674fe805813fed1262e82e70d1a1031a22c2d3a69fc2b0aa4671c3
         WEB_SITE=http://www.vips.ecs.soton.ac.uk/index.php
          ENTERED=20041230
       LICENSE[0]=LGPL
diff --git a/graphics-libs/vips/HISTORY b/graphics-libs/vips/HISTORY
index 1c7bd38..a8843fb 100644
--- a/graphics-libs/vips/HISTORY
+++ b/graphics-libs/vips/HISTORY
@@ -1,3 +1,8 @@
+2010-01-02 Robert Figura <template at sourcemage.org>
+	* DETAILS: Updated to version 7.20.6
+	* PRE_BUILD: removed since it builds better without
+	* DEPENDS: added optional_depends
+
 2008-10-01 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 7.16.2
 
diff --git a/graphics-libs/vips/PRE_BUILD b/graphics-libs/vips/PRE_BUILD
deleted file mode 100755
index 179e9e6..0000000
--- a/graphics-libs/vips/PRE_BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-default_pre_build  &&
-cd ${SOURCE_DIRECTORY}  &&
-
-# there must be a better way of doing this.
-# need to find out what option the fftw lib was compiled with.
-# And update the suffix accordingly
-
-sedit "s/fftw3/fftw3f/" configure.in  &&
-
-sedit "s/fftw_plan_dft_c2r_2d/fftwf_plan_dft_c2r_2d/"   libsrc/freq_filt/im_invfftr.c  &&
-sedit "s/fftw_execute_dft_c2r/fftwf_execute_dft_c2r/"   libsrc/freq_filt/im_invfftr.c  &&
-sedit "s/fftw_destroy_plan/fftwf_destroy_plan/"         libsrc/freq_filt/im_invfftr.c  &&
-
-sedit "s/fftw_plan_dft_2d/fftwf_plan_dft_2d/"    libsrc/freq_filt/im_invfft.c  &&
-sedit "s/fftw_execute_dft/fftwf_execute_dft/"    libsrc/freq_filt/im_invfft.c  &&
-sedit "s/fftw_destroy_plan/fftwf_destroy_plan/"  libsrc/freq_filt/im_invfft.c  &&  
-
-sedit "s/fftw_execute_dft_r2c/fftwf_execute_dft_r2c/"  libsrc/freq_filt/im_fwfft.c  &&
-sedit "s/fftw_execute_dft/fftwf_execute_dft/"          libsrc/freq_filt/im_fwfft.c  &&
-sedit "s/fftw_plan_dft_r2c_2d/fftwf_plan_dft_r2c_2d/"  libsrc/freq_filt/im_fwfft.c  &&
-sedit "s/fftw_draft_dft_r2d/fftwf_draft_dft_r2d/"      libsrc/freq_filt/im_fwfft.c  &&
-sedit "s/fftw_plan_dft_2d/fftwf_plan_dft_2d/"          libsrc/freq_filt/im_fwfft.c  &&
-sedit "s/fftw_destroy_plan/fftwf_destroy_plan/"        libsrc/freq_filt/im_fwfft.c  &&
-
-aclocal &&
-autoconf
diff --git a/graphics-libs/vips/vips-7.12.5.tar.gz.sig b/graphics-libs/vips/vips-7.12.5.tar.gz.sig
deleted file mode 100644
index 7a6fe5d..0000000
Binary files a/graphics-libs/vips/vips-7.12.5.tar.gz.sig and /dev/null differ
diff --git a/graphics-libs/vips/vips-7.16.2.tar.gz.sig b/graphics-libs/vips/vips-7.16.2.tar.gz.sig
deleted file mode 100644
index 971cd8a..0000000
Binary files a/graphics-libs/vips/vips-7.16.2.tar.gz.sig and /dev/null differ
diff --git a/graphics/nip2/CONFIGURE b/graphics/nip2/CONFIGURE
index 502d033..eb70b7e 100755
--- a/graphics/nip2/CONFIGURE
+++ b/graphics/nip2/CONFIGURE
@@ -1 +1 @@
-config_query ENABLE_FFTW "Enable FFT support ?" n
+config_query ENABLE_FFTW "Enable FFTw support?" y
diff --git a/graphics/nip2/DEPENDS b/graphics/nip2/DEPENDS
index 2266505..fc84d56 100755
--- a/graphics/nip2/DEPENDS
+++ b/graphics/nip2/DEPENDS
@@ -3,6 +3,11 @@
 depends  vips                 &&
 depends  flex                 &&
 depends  bison                &&
+depends  goffice              &&
+
+optional_depends  goffice  "" "--without-libgoffice" "For using goffice for spreadsheets"  &&
+optional_depends  gsl      "" "--without-gsl"        "For using gsl"                       &&
+
 if  [ $ENABLE_FFTW == "y" ]; then
 	sub_depends vips FFTW
 else
diff --git a/graphics/nip2/DETAILS b/graphics/nip2/DETAILS
index c6ba1d6..a5f2090 100755
--- a/graphics/nip2/DETAILS
+++ b/graphics/nip2/DETAILS
@@ -1,9 +1,9 @@
            SPELL=nip2
-         VERSION=7.16.1
+         VERSION=7.20.7
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
    SOURCE_URL[0]=http://www.vips.ecs.soton.ac.uk/supported/${VERSION:0:4}/${SOURCE}
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+     SOURCE_HASH=sha512:520e2683fd4f4b4a7a81ca5841ec3e7b9bb55f403e45dd6edfc78bcb6070d672347e176f4f5b48478e97f6f568b6b925e12c11a91ba8fc5ce9ebf456fb6d892f
    SOURCE_URL[1]=${SOURCEFORGE_URL}/vips/${SOURCE}
         WEB_SITE=http://www.vips.ecs.soton.ac.uk/index.php
          ENTERED=20041230
diff --git a/graphics/nip2/HISTORY b/graphics/nip2/HISTORY
index 072c132..85161bb 100644
--- a/graphics/nip2/HISTORY
+++ b/graphics/nip2/HISTORY
@@ -1,3 +1,8 @@
+2010-01-15 Robert Figura <template at sourcemage.org>
+	* DETAILS: Updated to version 7.20.7
+	* PRE_BUILD: removed since it builds better without
+	* DEPENDS: added optional depends
+
 2008-10-01 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 7.16.1
 
diff --git a/graphics/nip2/PRE_BUILD b/graphics/nip2/PRE_BUILD
deleted file mode 100755
index 96cb892..0000000
--- a/graphics/nip2/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build  &&
-cd  ${SOURCE_DIRECTORY}  &&
-
-sedit  "s/fftw3/fftw3f/" configure.in  &&
-
-sedit  "s/fftw_import_system_wisdom/fftwf_import_system_wisdom/" src/main.c  &&
-sedit  "s/fftw_import_wisdom_from_file/fftwf_import_wisdom_from_file/" src/main.c  && 
-sedit  "s/fftw_export_wisdom_to_file/fftwf_export_wisdom_to_file/" src/main.c  &&
-
-aclocal  &&
-autoconf
diff --git a/graphics/nip2/nip2-7.10.21.tar.gz.sig b/graphics/nip2/nip2-7.10.21.tar.gz.sig
deleted file mode 100644
index 607cb52..0000000
Binary files a/graphics/nip2/nip2-7.10.21.tar.gz.sig and /dev/null differ
diff --git a/graphics/nip2/nip2-7.16.1.tar.gz.sig b/graphics/nip2/nip2-7.16.1.tar.gz.sig
deleted file mode 100644
index 1f5820e..0000000
Binary files a/graphics/nip2/nip2-7.16.1.tar.gz.sig and /dev/null differ



More information about the SM-Commit mailing list