Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (192e1a131917038b3f7afa71bd95229419d9e35b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (192e1a131917038b3f7afa71bd95229419d9e35b)
  • Date: Thu, 29 May 2008 12:37:46 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT stack.nl>:

graphics-libs/libcaca/DETAILS | 2
graphics-libs/libcaca/DOWNLOAD | 7 ---
graphics-libs/libcaca/HISTORY | 4 +
graphics/netpbm/BUILD | 62
++++++++++++++---------------
graphics/netpbm/DEPENDS | 13 +++---
graphics/netpbm/DETAILS | 6 +-
graphics/netpbm/DOWNLOAD | 8 +++
graphics/netpbm/HISTORY | 11 +++++
graphics/netpbm/PRE_BUILD | 15 +++++--
graphics/netpbm/netpbm-10.42.0-gcc43.patch | 16 +++++++
graphics/netpbm/netpbm.hash.bz2 |binary
net/ifstatus/HISTORY | 3 +
net/ifstatus/PRE_BUILD | 8 +++
13 files changed, 105 insertions(+), 50 deletions(-)

New commits:
commit bc7a93e8ac4e4515bd75f9f0a6fc91cec077a23e
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

graphics/netpbm: version 10.42.0 and gcc 4.3 patch, fixes bug 14504

commit c69fefc1520a8d2058e977c69af87fc9f7f33a2c
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

net/ifstatus: fixes bug 14503 (compiling with gcc 4.3)

commit a2ce0b6f1de19e1e0d6234cc094a2fa7010f47ce
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

graphics-libs/libcaca: new download link, custom DOWNLOAD not needed
anymore

diff --git a/graphics-libs/libcaca/DETAILS b/graphics-libs/libcaca/DETAILS
index 15c9e4f..78ffc3b 100755
--- a/graphics-libs/libcaca/DETAILS
+++ b/graphics-libs/libcaca/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.99.beta13b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://libcaca.zoy.org/attachment/wiki/libcaca/${SOURCE}\?format=raw
+ SOURCE_URL[0]=http://libcaca.zoy.org/files/libcaca/${SOURCE}
WEB_SITE=http://libcaca.zoy.org/
ENTERED=20031218

SOURCE_HASH=sha512:8838bf72bfe7f41b9f0469085e2cafe1f6910f56e254d06da0553d075b1ed1732ab8b64bd372bc45b0de0594d7747c76202844a15c63623a9942994dfdca49df
diff --git a/graphics-libs/libcaca/DOWNLOAD b/graphics-libs/libcaca/DOWNLOAD
deleted file mode 100755
index b54117e..0000000
--- a/graphics-libs/libcaca/DOWNLOAD
+++ /dev/null
@@ -1,7 +0,0 @@
-rm -f $SOURCE
-wget -O "$SOURCE" "${SOURCE_URL[0]}" 2>&1 &&
-if ! test -f "$SOURCE" ; then
- rm -f $SOURCE*
- false
-fi &&
-mv "$SOURCE" "$SOURCE_CACHE"
diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY
index a2c7427..756d98a 100644
--- a/graphics-libs/libcaca/HISTORY
+++ b/graphics-libs/libcaca/HISTORY
@@ -1,3 +1,7 @@
+2008-05-29 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: new SOURCE_URL, upstream provided better links
+ * DOWNLOAD: removed
+
2008-05-28 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: new SOURCE_URL, upstream now uses trac
* DOWNLOAD: custom wget to fix filename
diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index 49b2fd3..05cccc3 100755
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -1,35 +1,37 @@
-#sedit "s/^CFLAGS_SHLIB =/CFLAGS_SHLIB = ${CFLAGS}/" Makefile.config.in &&
-#sedit "s/^\(CFLAGS_FOR_BUILD = \)\$(CFLAGS)/\1${CFLAGS}/"
Makefile.config.in &&
-echo -e "\ngnu\nregular\nshared\ny\n\n\n\n\n\n\n\n\n\n\n\n\n\n" |
-# Ignores $OPTS
-# to get our OPTS and CFLAGS, etc we'll need to sed Makefile.config.in
-./configure &&
-# I have no idea how netpbm gets its standard set
-# of cflags, the entries in Makefile.config.in are all
-# commented out!
-sedit "s/^\(CFLAGS =\)/\1 ${CFLAGS} /" Makefile.config &&
-if list_find "$OPTS" no-x11
-then
- message "disabling X11 stuff" &&
- sedit 's/^\(X11LIB =\).*$/\1 NONE/' \
- Makefile.config &&
- sedit 's/^\(X11HDR_DIR =\).*$/\1/' \
- Makefile.config
+cp Makefile.config.in Makefile.config &&
+cat >> Makefile.config << EOF
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE=unixshared
+NETPBMLIBSUFFIX=so
+STATICLIB_TOO=n
+CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized
-Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
+CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
+LDRELOC = ld --reloc
+LINKER_CAN_DO_EXPLICIT_LIBRARY = Y
+LINKERISCOMPILER = Y
+CFLAGS_SHLIN += -fPIC
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+EOF
+if list_find "$OPTS" yes-jpeg; then
+ echo "JPEGLIB = libjpeg.so" >> Makefile.config
fi &&
-if list_find "$OPTS" no-svga
-then
- message "disabling svgalib stuff" &&
- sedit 's/^\(LINUXSVGALIB =\).*$/\1 NONE/' \
- Makefile.config &&
- sedit 's/^\(LINUXSVGAHDR_DIR =\).*$/\1/' \
- Makefile.config
+if list_find "$OPTS" yes-tiff; then
+ echo "TIFFLIB = libtiff.so" >> Makefile.config
fi &&
-make_single &&
-
-make &&
-
+if list_find "$OPTS" yes-zlib; then
+ echo "ZLIB = libz.so" >> Makefile.config
+fi &&
+if list_find "$OPTS" yes-x11; then
+ echo "X11LIB = /usr/lib/libX11.so" >> Makefile.config
+fi &&
+if list_find "$OPTS" yes-svga; then
+ echo "LINUXSVGALIB = libvga.so" >> Makefile.config
+fi &&
+sedit "s/^\(CFLAGS =\)/\1 ${CFLAGS} /" Makefile.config &&
+make_single &&
+make &&
if [ -e /tmp/netpbm ]; then
rm -rf /tmp/netpbm
-fi &&
-make package pkgdir=/tmp/netpbm &&
+fi &&
+make package pkgdir=/tmp/netpbm &&
make_normal
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index 3d4b4b4..103218f 100755
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,7 +1,8 @@
-depends perl &&
-depends libpng &&
-depends jpeg &&
+depends perl &&
+depends libpng &&
+depends libxml2 &&
+optional_depends jpeg yes-jpeg no-jpeg "jpeg support" &&
+optional_depends tiff yes-tiff no-tiff "tiff support" &&
+optional_depends zlib yes-zlib no-zlib "compression support" &&
optional_depends svgalib yes-svga no-svga "svgalib support" &&
-optional_depends X11-LIBS yes-x11 no-x11 "x11 support" &&
-depends libxml2 &&
-depends tiff
+optional_depends X11-LIBS yes-x11 no-x11 "x11 support"
diff --git a/graphics/netpbm/DETAILS b/graphics/netpbm/DETAILS
index 30c1aad..ea0589c 100755
--- a/graphics/netpbm/DETAILS
+++ b/graphics/netpbm/DETAILS
@@ -1,7 +1,7 @@
SPELL=netpbm
- VERSION=10.34
-
SOURCE_HASH=sha512:5d5a2ad223762725d195dae492463c115210ab04a528982bb2bb304ca17dfda817a6685e69b75755195b2b7a940fa9148494ad91bbf2ea63fcdbf5cc709de21a
- SOURCE=$SPELL-$VERSION.tgz
+ VERSION=10.42.0
+ SOURCE_IGNORE=volatile
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://netpbm.sourceforge.net
diff --git a/graphics/netpbm/DOWNLOAD b/graphics/netpbm/DOWNLOAD
new file mode 100755
index 0000000..5408a32
--- /dev/null
+++ b/graphics/netpbm/DOWNLOAD
@@ -0,0 +1,8 @@
+if [[ ! -f "$SOURCE_CACHE/$SOURCE" || $FORCE_DOWNLOAD ]]; then
+ message "${MESSAGE_COLOR}checking out release${DEFAULT_COLOR}" &&
+ svn co
http://netpbm.svn.sourceforge.net/svnroot/netpbm/release_number/$VERSION \
+ "${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//}" &&
+ message "${MESSAGE_COLOR}creating source tarball${DEFAULT_COLOR}" &&
+ tar -cjf "$SOURCE" "${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//}" &&
+ mv "$SOURCE" "$SOURCE_CACHE"
+fi
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index 5d2e8e0..520c06e 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,14 @@
+2008-05-29 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 10.42
+ * PRE_BUILD: custom source tree hash check
+ apply gcc 4.3.0 patch (fixes bug 14504)
+ * BUILD, DEPENDS: made more depends optional, added zlib optional
+ dependency, improved BUILD script.
+ * DOWNLOAD: custom download script to retreive the source tree from
the
+ subversion repository
+ * netpbm.hash.bz2: hashes of source tree
+ * netpbm-10.42.0-gcc43.patch: patch for gcc 4.3 compilation
+
2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: remove the X11-LIBS addition to make, it actually breaks the
compile with xorg modular instead of fixing it
diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 1c7aabe..08fbe06 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -1,3 +1,12 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit 's:/usr/man/web:/usr/share/man/web:' buildtools/installnetpbm.pl
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file_simple $SOURCE &&
+message "${MESSAGE_COLOR}hash checking
${SPELL_COLOR}${SPELL}${MESSAGE_COLOR} source tree...${DEFAULT_COLOR}" &&
+cd $SOURCE_DIRECTORY &&
+find . -type f ! -wholename '*/.svn/*' -exec gpg --print-md sha512 {} \; >
/tmp/netpbm.hash &&
+DIFF=$(bzcat "$SCRIPT_DIRECTORY/netpbm.hash.bz2" | diff /tmp/netpbm.hash -)
+if [[ $DIFF ]]; then
+ error_message "${PROBLEM_COLOR}hash check failed!${DEFAULT_COLOR}" &&
+ hash_user_query 1 "$SPELL" spell || false
+fi
+patch -p1 < $SCRIPT_DIRECTORY/netpbm-10.42.0-gcc43.patch &&
+sedit 's:/usr/man/web:/usr/share/man/web:' buildtools/installnetpbm.pl
diff --git a/graphics/netpbm/netpbm-10.42.0-gcc43.patch
b/graphics/netpbm/netpbm-10.42.0-gcc43.patch
new file mode 100644
index 0000000..1e61de8
--- /dev/null
+++ b/graphics/netpbm/netpbm-10.42.0-gcc43.patch
@@ -0,0 +1,16 @@
+Index: trunk/lib/libpbm3.c
+===================================================================
+--- trunk/lib/libpbm3.c (revision 608)
++++ trunk/lib/libpbm3.c (revision 609)
+@@ -116,7 +116,11 @@ packBitsWithMmxSse(FILE * const
+ ) ];
+ */
+
++#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)
++ typedef char v8qi __attribute__ ((vector_size(8)));
++#else
+ typedef int v8qi __attribute__ ((mode(V8QI)));
++#endif
+ typedef int di __attribute__ ((mode(DI)));
+
+ di const zero64 = 0; /* to clear with PXOR */
diff --git a/graphics/netpbm/netpbm.hash.bz2 b/graphics/netpbm/netpbm.hash.bz2
new file mode 100644
index 0000000..3e9cdb8
Binary files /dev/null and b/graphics/netpbm/netpbm.hash.bz2 differ
diff --git a/net/ifstatus/HISTORY b/net/ifstatus/HISTORY
index 58ecb3d..936d8f7 100644
--- a/net/ifstatus/HISTORY
+++ b/net/ifstatus/HISTORY
@@ -1,3 +1,6 @@
+2008-05-29 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD: fixes bug 14503 (cstdlib includes for gcc 4.3)
+
2007-02-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFLICTS: removed, deprecation complete

diff --git a/net/ifstatus/PRE_BUILD b/net/ifstatus/PRE_BUILD
new file mode 100755
index 0000000..efb69f9
--- /dev/null
+++ b/net/ifstatus/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sed -i -e '28i#include <cstdlib>' Config.cc &&
+sed -i -e '27i#include <cstdlib>' Email.cc &&
+sed -i -e '27i#include <cstdlib>' GraphDecorator.cc &&
+sed -i -e '37i#include <cstdlib>' IFStatus.cc &&
+sed -i -e '27i#include <cstdlib>' Interface.cc &&
+sed -i -e '28i#include <cstdlib>' Interfaces.cc



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (192e1a131917038b3f7afa71bd95229419d9e35b), Remko van der Vossen, 05/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page