Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (c6bf1588576f0351949da3bfc9bd4bb6e4a71e8b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c6bf1588576f0351949da3bfc9bd4bb6e4a71e8b)
  • Date: Wed, 20 Jan 2010 18:37:44 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics/imagemagick/BUILD | 9 ++++
graphics/imagemagick/CONFIGURE | 2 +
graphics/imagemagick/DEPENDS | 82
++++++++++++++++++++++++++++++++++++-----
graphics/imagemagick/HISTORY | 24 ++++++++++++
graphics/imagemagick/TRIGGERS | 1
5 files changed, 107 insertions(+), 11 deletions(-)

New commits:
commit c6bf1588576f0351949da3bfc9bd4bb6e4a71e8b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on libxml2

commit f7b27a4695acacc10dc375f379e630ad06bbce05
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Query for High Dynamic Range Imagery support

commit 3711e994a5d86953f143714c532c63a00df713d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Pass GhostScript flags

commit 8f843cbda83e1ccd736e557584f67004a787d408
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Forgot to remove libexif trigger

commit a31c6f97dc2ba5807f364eb62b1c29ff06a3b3c2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Explicitly enable/disable X11 as requested

commit e2ff47d3546974f0506ede5ec114e571ae6ef549
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on g++

commit 2ae04863be022f3e6b91d5ca9400fc5aa095b75b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: fontconfig and freetype2 are optional

commit 829523bac7e23fa81be00bfa7ad4a5c0a98e2dac
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on djvulibre

commit 0e0f0de157962fdfccd0a2cce1f4930c00bb1756
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on fftw

commit ec1c9ff740a419bd9e95a8d5f09ce812ae0c3d31
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on librsvg2

commit f3abb4727f40bb79943a96356b19f8579a9a34e1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on bzip2

commit cbac3cee655be2168c9019ef68b3a5421d641319
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on zlib

commit 1c201ed31e44c63eb4da25237151b89b1b2bb6e3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Disable autotrace to avoid hidden circular dependency

commit 6dfb81bae3c9929d38250178b03fae6cc18c917a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on libpng

commit 8211b648ad7b1b18702cb49ba0ef5499cdf3a11b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on tiff

commit 2cfaf534003edecee68bb566c8ce247dbf9d48ac
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on openexr

commit 785a2e2e2cc96f0b1b5f1c7c510ead3c430e2a19
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on openjpeg

commit 7f9c93e62ed9abd8d01ec9405c20af0306db6dca
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Doesn't know libexif

commit 92f95fe586a2d2098f168867b2973dc3872593e3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

imagemagick: Optionally depends on jpeg

diff --git a/graphics/imagemagick/BUILD b/graphics/imagemagick/BUILD
index d772259..21956c3 100755
--- a/graphics/imagemagick/BUILD
+++ b/graphics/imagemagick/BUILD
@@ -1,2 +1,9 @@
-OPTS="--enable-shared $OPTS " &&
+if [[ "$IMAGEMAGICK_X" != "y" ]]; then
+ OPTS="--without-x $OPTS"
+fi &&
+
+OPTS="--enable-shared \
+ --without-autotrace \
+ $IMAGEMAGICK_HDRI \
+ $OPTS" &&
default_build
diff --git a/graphics/imagemagick/CONFIGURE b/graphics/imagemagick/CONFIGURE
index 8f41038..4002668 100755
--- a/graphics/imagemagick/CONFIGURE
+++ b/graphics/imagemagick/CONFIGURE
@@ -1 +1,3 @@
config_query IMAGEMAGICK_X "Do you want X support?" n
+config_query_option IMAGEMAGICK_HDRI "Enable High Dynamic Range Imagery?" n \
+ '--enable-hdri' '--disable-hdri'
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index 1172963..a644f35 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -1,8 +1,7 @@
-depends freetype2 &&
depends libtool "--disable-ltdl-install" &&

if [[ "$IMAGEMAGICK_X" == "y" ]]; then
- depends libx11 &&
+ depends libx11 '--with-x' &&
depends libxrender &&
depends libxext &&
depends libxt &&
@@ -10,6 +9,21 @@ if [[ "$IMAGEMAGICK_X" == "y" ]]; then
depends libsm
fi &&

+optional_depends 'g++' \
+ '--with-magick-plus-plus' \
+ '--without-magick-plus-plus' \
+ 'for C++ API' &&
+
+optional_depends 'fontconfig' \
+ '--with-fontconfig' \
+ '--without-fontconfig' \
+ 'for customized font support' &&
+
+optional_depends 'freetype2' \
+ '--with-freetype' \
+ '--without-freetype' \
+ 'for portable font engine' &&
+
optional_depends perl \
"--with-perl" \
"--without-perl" \
@@ -20,22 +34,72 @@ optional_depends graphviz \
"--without-gvc" \
"for dot file support" &&

-optional_depends libexif \
- "--with-exif" \
- "--without-exif" \
- "for EXIF jpeg tag support" &&
+optional_depends 'fftw' \
+ '--with-fftw' \
+ '--without-fftw' \
+ 'for Fast Fourier Transform support' &&
+
+optional_depends 'libpng' \
+ '--with-png' \
+ '--without-png' \
+ 'for PNG image support' &&
+
+optional_depends 'jpeg' \
+ '--with-jpeg' \
+ '--without-jpeg' \
+ 'for JPEG image support' &&
+
+optional_depends 'openjpeg' \
+ '--with-jp2' \
+ '--without-jp2' \
+ 'for JPEG-2000 image support' &&
+
+optional_depends 'tiff' \
+ '--with-tiff' \
+ '--without-tiff' \
+ 'for TIFF image support' &&
+
+optional_depends 'openexr' \
+ '--with-openexr' \
+ '--without-openexr' \
+ 'for high dynamic-range image format' &&
+
+optional_depends 'librsvg2' \
+ '--with-rsvg' \
+ '--without-rsvg' \
+ 'for Scalable Vector Graphics support' &&

optional_depends POSTSCRIPT-INTERPRETER \
- "" \
- "" \
+ "--with-gslib" \
+ "--without-gslib" \
"for generating Postscript and PDF output" &&

+optional_depends 'djvulibre' \
+ '--with-djvu' \
+ '--without-djvu' \
+ 'for generating DejaVu files' &&
+
optional_depends libwmf \
"--with-wmf=yes" \
"--with-wmf=no" \
"for Windows Metafile Format support" &&

+optional_depends 'libxml2' \
+ '--with-xml' \
+ '--without-xml' \
+ 'for XML file support' &&
+
optional_depends lcms \
"--with-lcms=yes" \
"--with-lcms=no" \
- "for speed optimized color management"
+ "for speed optimized color management" &&
+
+optional_depends 'zlib' \
+ '--with-zlib' \
+ '--without-zlib' \
+ 'for basic zlib compression support' &&
+
+optional_depends 'bzip2' \
+ '--with-bzlib' \
+ '--without-bzlib' \
+ 'for bZip2 compression support'
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 5d0224e..23963f9 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,27 @@
+2010-01-20 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Query for High Dynamic Range Imagery support
+ * DEPENDS: Optionally depends on jpeg
+ Removed optional libexif, doesn't know about it anymore
+ Optionally depends on openjpeg
+ Optionally depends on openexr
+ Optionally depends on tiff
+ Optionally depends on libpng
+ Optionally depends on zlib
+ Optionally depends on bzip2
+ Optionally depends on librsvg2
+ Optionally depends on fftw
+ Optionally depends on djvulibre
+ freetype2 is optional
+ Optionally depends on fontconfig
+ Optionally depends on g++
+ Pass '--with-x' when enabling X11
+ Pass GhostScript flags
+ Optionally depends on libxml2
+ * BUILD: Disable autotrace to avoid circular dependency
+ Disable X11 if requested
+ Pass IMAGEMAGICK_HDRI flag to OPTS
+ * TRIGGERS: No longer needs a trigger on libexif
+
2010-01-16 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.5.9-0

diff --git a/graphics/imagemagick/TRIGGERS b/graphics/imagemagick/TRIGGERS
deleted file mode 100755
index af2b690..0000000
--- a/graphics/imagemagick/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast libexif check_self



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c6bf1588576f0351949da3bfc9bd4bb6e4a71e8b), Eric Sandall, 01/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page