Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (38c038791a9d7f357558d01ae67c213ccb5822fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (38c038791a9d7f357558d01ae67c213ccb5822fa)
  • Date: Sat, 18 Apr 2015 04:37:24 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
graphics-libs/gd/DEPENDS | 49
+++++++++++++++++++++++++++++++++++++-------
graphics-libs/gd/HISTORY | 5 ++++
graphics-libs/gd/TRIGGERS | 4 ++-
perl-cpan/perl-gd/BUILD | 21 ++++++++++++++++++
perl-cpan/perl-gd/DEPENDS | 18 ++++++++++------
perl-cpan/perl-gd/DETAILS | 13 +++++------
perl-cpan/perl-gd/HISTORY | 7 ++++++
perl-cpan/perl-gd/INSTALL | 1
perl-cpan/perl-gd/PRE_BUILD | 5 ++++
10 files changed, 102 insertions(+), 21 deletions(-)

New commits:
commit 38c038791a9d7f357558d01ae67c213ccb5822fa
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

perl-gd: => 2.56

commit d79e8f7c1a5da1d8facfc9afdc56295cb55478ff
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gd: corrected dependencies

diff --git a/graphics-libs/gd/DEPENDS b/graphics-libs/gd/DEPENDS
index 637204b..484f45c 100755
--- a/graphics-libs/gd/DEPENDS
+++ b/graphics-libs/gd/DEPENDS
@@ -1,9 +1,44 @@
-depends zlib &&
+optional_depends zlib \
+ "--with-zlib" \
+ "--without-zlib" \
+ "for zlib support" &&

-optional_depends libxpm '--with-xpm' '--without-xpm' 'Enable xpm support'
+optional_depends libxpm \
+ "--with-xpm" \
+ "--without-xpm" \
+ "for XPM support" &&

-optional_depends libpng '--with-png' '--without-png' 'Enable png support'
&&
-optional_depends JPEG '--with-jpeg' '--without-jpeg' 'Enable jpeg support'
&&
-optional_depends freetype2 '--with-freetype' '--without-freetype' 'Enable
freetype support' &&
-optional_depends fontconfig '--with-fontconfig' '--without-fontconfig'
'Enable fontconfig support' &&
-optional_depends libx11 '--with-x' '--without-x' 'for using X11'
+optional_depends tiff \
+ "--with-tiff" \
+ "--without-tiff" \
+ "for TIFF support" &&
+
+optional_depends libpng \
+ "--with-png" \
+ "--without-png" \
+ "for PNG support" &&
+
+optional_depends JPEG \
+ "--with-jpeg" \
+ "--without-jpeg" \
+ "for JPEG support" &&
+
+optional_depends libvpx \
+ "--with-vpx" \
+ "--without-vpx" \
+ "for VPX support" &&
+
+optional_depends freetype2 \
+ "--with-freetype" \
+ "--without-freetype" \
+ "for FreeType support" &&
+
+optional_depends fontconfig \
+ "--with-fontconfig" \
+ "--without-fontconfig" \
+ "for fontconfig support" &&
+
+optional_depends libx11 \
+ "--with-x" \
+ "--without-x" \
+ "for using X11"
diff --git a/graphics-libs/gd/HISTORY b/graphics-libs/gd/HISTORY
index ef19f99..a7f3fa0 100644
--- a/graphics-libs/gd/HISTORY
+++ b/graphics-libs/gd/HISTORY
@@ -1,3 +1,8 @@
+2015-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: rewritten -- readability++, made zlib optional, added
missing
+ optional dependencies (tiff, libvpx), added missing "&&"
+ * TRIGGERS: made zlib trigger optional
+
2015-03-13 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, BUILD: Fixed SOURCE_URL[0]
call bootstrap.sh if configure script is missing
diff --git a/graphics-libs/gd/TRIGGERS b/graphics-libs/gd/TRIGGERS
index 0bff07e..2bc04d1 100755
--- a/graphics-libs/gd/TRIGGERS
+++ b/graphics-libs/gd/TRIGGERS
@@ -1 +1,3 @@
-on_cast zlib cast_self
+if is_depends_enabled $SPELL zlib; then
+ on_cast zlib cast_self
+fi
diff --git a/perl-cpan/perl-gd/BUILD b/perl-cpan/perl-gd/BUILD
new file mode 100755
index 0000000..a47715d
--- /dev/null
+++ b/perl-cpan/perl-gd/BUILD
@@ -0,0 +1,21 @@
+local GD_OPTIONS="GIF,ANIMGIF" &&
+
+if is_depends_enabled gd $(get_spell_provider gd JPEG) &&
+ is_depends_enabled $SPELL $(get_spell_provider $SPELL JPEG); then
+ GD_OPTIONS+=",JPEG"
+fi &&
+
+if is_depends_enabled gd freetype2 && is_depends_enabled $SPELL freetype2;
then
+ GD_OPTIONS+=",FT"
+fi &&
+
+if is_depends_enabled gd libpng && is_depends_enabled $SPELL libpng; then
+ GD_OPTIONS+=",PNG"
+fi &&
+
+if is_depends_enabled gd libxpm && is_depends_enabled $SPELL libxpm; then
+ GD_OPTIONS+=",XPM"
+fi &&
+
+perl Build.PL -options="$GD_OPTIONS" &&
+./Build
diff --git a/perl-cpan/perl-gd/DEPENDS b/perl-cpan/perl-gd/DEPENDS
index f700461..d224280 100755
--- a/perl-cpan/perl-gd/DEPENDS
+++ b/perl-cpan/perl-gd/DEPENDS
@@ -1,6 +1,12 @@
-depends perl &&
-depends gd &&
-depends libpng &&
-depends zlib &&
-optional_depends xorg-libs '-options="JPG,FT,XPM"' '-options="JPG,FT"' \
- "Enables support for the XPM image file format."
+# TODO: will require module-build after Perl 5.22
+depends perl &&
+depends gd &&
+depends zlib &&
+
+# TODO: create sub-depends for gd spell
+message "${MESSAGE_COLOR}NOTE: the following dependencies need to be
selected in ${SPELL_COLOR}gd${MESSAGE_COLOR} spell as well. Rebuild it if
they aren't.${DEFAULT_COLOR}" &&
+
+optional_depends libpng "" "" "for PNG support" &&
+optional_depends libxpm "" "" "for XPM support" &&
+optional_depends JPEG "" "" "for JPEG support" &&
+optional_depends freetype2 "" "" "for FreeType support"
diff --git a/perl-cpan/perl-gd/DETAILS b/perl-cpan/perl-gd/DETAILS
index b6aa720..b67d232 100755
--- a/perl-cpan/perl-gd/DETAILS
+++ b/perl-cpan/perl-gd/DETAILS
@@ -1,11 +1,10 @@
SPELL=perl-gd
- SNAME=GD
- VERSION=2.39
- SOURCE=$SNAME-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
- SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/L/LD/LDS/$SOURCE
-#
SOURCE_HASH=sha512:e5e52f9f9dd1a9515adf79850608e8419ad06a72bb05ef5a3a45a3c4be57b86d6cc61761c34181745496a8be5c70864517efb8cac8dba410d5f74bc057354b5c
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ SPELLX=GD
+ VERSION=2.56
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/L/LD/LDS/$SOURCE
+
SOURCE_HASH=sha512:51c4b46b199625a12ae1ad1003cafe4e66913d1e0c0b51d9bccbc7c14a86dfe29144caefbeca2927a66a44d4ba8b134550ee4a63eb86aceaa13513c46a4e71f4
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
LICENSE[0]=ART
WEB_SITE=http://search.cpan.org/~lds/GD-$VERSION/
ENTERED=20020324
diff --git a/perl-cpan/perl-gd/GD-2.39.tar.gz.sig
b/perl-cpan/perl-gd/GD-2.39.tar.gz.sig
deleted file mode 100644
index 9f92b60..0000000
Binary files a/perl-cpan/perl-gd/GD-2.39.tar.gz.sig and /dev/null differ
diff --git a/perl-cpan/perl-gd/HISTORY b/perl-cpan/perl-gd/HISTORY
index f299c40..5ad95e6 100644
--- a/perl-cpan/perl-gd/HISTORY
+++ b/perl-cpan/perl-gd/HISTORY
@@ -1,3 +1,10 @@
+2015-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.56; SNAME -> SPELLX; updated source url,
+ website; quoting paths
+ * DEPENDS: rewritten, made libpng optional, kill xorg-libs
+ * BUILD, INSTALL: added, for properl build/install phases
+ * PRE_BUILD: added, to prevent README from installing to /usr/bin
+
2008-04-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.39 (Fixes Bug #14484)

diff --git a/perl-cpan/perl-gd/INSTALL b/perl-cpan/perl-gd/INSTALL
new file mode 100755
index 0000000..6ddfd31
--- /dev/null
+++ b/perl-cpan/perl-gd/INSTALL
@@ -0,0 +1 @@
+./Build install
diff --git a/perl-cpan/perl-gd/PRE_BUILD b/perl-cpan/perl-gd/PRE_BUILD
new file mode 100755
index 0000000..1f8d584
--- /dev/null
+++ b/perl-cpan/perl-gd/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+mkdir doc &&
+mv bdf_scripts/README doc/README.BDF



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (38c038791a9d7f357558d01ae67c213ccb5822fa), Vlad Glagolev, 04/18/2015

Archive powered by MHonArc 2.6.24.

Top of Page