Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (36147d93623576314c697834fae99088429402b4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (36147d93623576314c697834fae99088429402b4)
  • Date: Wed, 10 Dec 2008 07:30:52 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/graphicsmagick/DETAILS | 20 ++++++++---------
graphics/graphicsmagick/HISTORY | 3 ++
libs/stlport/BUILD | 20 ++++++-----------
libs/stlport/DEPENDS | 1
libs/stlport/DETAILS | 6 ++---
libs/stlport/HISTORY | 6 +++++
libs/stlport/INSTALL | 7 ------
libs/stlport/PRE_BUILD | 3 --
libs/stlport/gcc43.patch | 46
----------------------------------------
9 files changed, 30 insertions(+), 82 deletions(-)

New commits:
commit 96ca75b810878a8ab72c6249efca861a02de4d21
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"stlport-5.2.1"

commit 5f3966a5095eec9cbd111e3067cf9c6d321e1035
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"graphicsmagick-1.3.3"

diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index 4896668..9fdd100 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -1,17 +1,17 @@
SPELL=graphicsmagick
-if [[ $GM_SNAP == y ]]
-then
- VERSION=1.3.2
-
SOURCE_HASH=sha512:7156ec7a0e67ef8f50d5c385f1214ba6022d159e560da810bae113a0b05a20c0f993d33caab6823fc84deca4807b779dc3e0824dddfb32e3d05b792ed5ffc408
- SOURCE=GraphicsMagick-${VERSION}.tar.bz2
-
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
-else
- VERSION=1.3.2
-
SOURCE_HASH=sha512:7156ec7a0e67ef8f50d5c385f1214ba6022d159e560da810bae113a0b05a20c0f993d33caab6823fc84deca4807b779dc3e0824dddfb32e3d05b792ed5ffc408
+#if [[ $GM_SNAP == y ]]
+#then
+# VERSION=1.3.3
+# SOURCE_HASH=sha512:
+# SOURCE=GraphicsMagick-${VERSION}.tar.bz2
+#
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
+#else
+ VERSION=1.3.3
+
SOURCE_HASH=sha512:93ccf36467112ecf2b334227e2440f22f7041ec210ed4f0d0b2d5f8d0f14f6302b3828b8c21092ec78ec0296d72474cb97651776428eae96656d35d96272c8e1
SOURCE=GraphicsMagick-${VERSION}.tar.bz2
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/${SOURCE}
SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-fi
+#fi
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/GraphicsMagick-${VERSION}
WEB_SITE=http://www.${SPELL}.org
ENTERED=20070216
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 9e92001..a0af2e9 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,6 @@
+2008-12-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.3
+
2008-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.2

diff --git a/libs/stlport/BUILD b/libs/stlport/BUILD
index 8eecbcc..82b74cb 100755
--- a/libs/stlport/BUILD
+++ b/libs/stlport/BUILD
@@ -1,14 +1,8 @@
-# Set compile to use STLport's headers before gcc's...
+# can't use default_build

-persistent_add PATH_HOLD &&
-PATH_HOLD=${PATH} &&
-export PATH=${SOURCE_DIRECTORY}/stlport:${PATH} &&
-sedit "s:../g++-v3:/usr/include/c++/`installed_version gcc`:g" \
- stlport/stl/config/_gcc.h &&
-
-cd build/lib &&
-cp gcc.mak Makefile &&
-sedit 's:\-O2:${CFLAGS}:' Makefile &&
-make_single &&
-make clean depend install &&
-make_normal
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --with-extra-cflags="$CFLAGS" \
+ --with-extra-cxxflags="$CXXFLAGS" \
+ --with-system-boost \
+$OPTS &&
+make all
diff --git a/libs/stlport/DEPENDS b/libs/stlport/DEPENDS
index c7bf3b8..ed60ef0 100755
--- a/libs/stlport/DEPENDS
+++ b/libs/stlport/DEPENDS
@@ -1,4 +1,5 @@
depends g++ &&
+depends boost &&
if [ "$STLPORT_LATEST" == "y" ]; then
depends CVS
fi
diff --git a/libs/stlport/DETAILS b/libs/stlport/DETAILS
index bb3d318..868f535 100755
--- a/libs/stlport/DETAILS
+++ b/libs/stlport/DETAILS
@@ -1,12 +1,12 @@
SPELL=stlport
if [[ "$STLPORT_LATEST" == y ]]; then
- VERSION=5.1
+ VERSION=5.2
SOURCE=STLport.tar.bz2

SOURCE_URL[0]=cvs://:pserver:cvs AT cvs.stlport.com:/stlport:STLport:STLPORT_${VERSION//./_}
SOURCE_IGNORE=volatile
else
- VERSION=5.1.5
-
SOURCE_HASH=sha512:46052ab83c9c3d707e8e4294c6a92e37511784f961402ce31c8769bfff8725c5693ab50ea327b9939c18e2b82af03d45a79bbea01fde737752e94d0be54cc345
+ VERSION=5.2.1
+
SOURCE_HASH=sha512:c619f1965e42a444714f6a2bcbade3428e09823ad056930b32bf8224b7b3e4b4ae82e25e4ba7b4584f73645a7838a677f314b7bc583d1d9bbcef6fcafc439141
SOURCE=STLport-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/stlport/$SOURCE
fi
diff --git a/libs/stlport/HISTORY b/libs/stlport/HISTORY
index c29b0a2..90b7e8e 100644
--- a/libs/stlport/HISTORY
+++ b/libs/stlport/HISTORY
@@ -1,3 +1,9 @@
+2008-12-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.1
+ * PRE_BUILD, gcc43.patch, INSTALL: deleted
+ * BUILD: complete replacement
+ * DEPENDS: add boost
+
2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gcc43.patch
* gcc43.patch: Patch from Javier <jevv.cr AT gmail.com> to fix
diff --git a/libs/stlport/INSTALL b/libs/stlport/INSTALL
deleted file mode 100755
index 76a5982..0000000
--- a/libs/stlport/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-cd $SOURCE_DIRECTORY &&
-tar cf - stlport | (cd /usr/include; tar xf -) &&
-chmod -R a+r /usr/include/stlport &&
-chown -R root:root /usr/include/stlport &&
-(cd lib; tar cf - --exclude=CVS --exclude=.cvsignore .) | (cd /usr/lib; tar
xf -) &&
-chown -R root:root /usr/lib/libstlport* &&
-export PATH=${PATH_HOLD}
diff --git a/libs/stlport/PRE_BUILD b/libs/stlport/PRE_BUILD
deleted file mode 100755
index 34cce88..0000000
--- a/libs/stlport/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/libs/stlport/gcc43.patch b/libs/stlport/gcc43.patch
deleted file mode 100644
index b36df60..0000000
--- a/libs/stlport/gcc43.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patch from Javier <jevv.cr AT gmail.com> to fix
http://bugs.sourcemage.org/show_bug.cgi?id=14448 (compilation with GCC 4.3.0)
---
-diff -Naur STLport-5.1.5-orig/build/Makefiles/gmake/gcc.mak
STLport-5.1.5/build/Makefiles/gmake/gcc.mak
---- STLport-5.1.5-orig/build/Makefiles/gmake/gcc.mak 2008-04-11
21:41:32.000000000 -0600
-+++ STLport-5.1.5/build/Makefiles/gmake/gcc.mak 2008-04-11
22:00:48.000000000 -0600
-@@ -29,6 +29,11 @@
- CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
-
- ifeq ($(CXX_VERSION),)
-+# Current g++-4.3
-+CXX_VERSION := $(shell ${CXX} --version | grep '^g++' | awk '{ print $$4;
}')
-+endif
-+
-+ifeq ($(CXX_VERSION),)
- # 2.95 report only version
- CXX_VERSION := $(shell ${CXX} --version)
- endif
-diff -Naur STLport-5.1.5-orig/stlport/limits.h STLport-5.1.5/stlport/limits.h
---- STLport-5.1.5-orig/stlport/limits.h 2008-04-11 21:41:32.000000000
-0600
-+++ STLport-5.1.5/stlport/limits.h 2008-04-11 21:39:51.000000000 -0600
-@@ -24,7 +24,11 @@
- struct _exception;
- #endif
-
--#include _STLP_NATIVE_C_HEADER(limits.h)
-+#if defined (_STLP_HAS_INCLUDE_NEXT)
-+# include_next <limits.h>
-+#else
-+# include _STLP_NATIVE_C_HEADER(limits.h)
-+#endif
-
- #if (_STLP_OUTERMOST_HEADER_ID == 0x201)
- # if ! defined (_STLP_DONT_POP_HEADER_ID)
-diff -Naur STLport-5.1.5-orig/stlport/stl/config/_gcc.h
STLport-5.1.5/stlport/stl/config/_gcc.h
---- STLport-5.1.5-orig/stlport/stl/config/_gcc.h 2008-04-11
21:41:32.000000000 -0600
-+++ STLport-5.1.5/stlport/stl/config/_gcc.h 2008-04-11 22:04:17.000000000
-0600
-@@ -4,6 +4,8 @@
-
- #define _STLP_COMPILER "gcc"
-
-+#define _STLP_HAS_INCLUDE_NEXT 1
-+
- /* Systems having GLIBC installed have different traits */
- #if defined (__linux__)
- # ifndef _STLP_USE_GLIBC
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (36147d93623576314c697834fae99088429402b4), Treeve Jelbert, 12/10/2008

Archive powered by MHonArc 2.6.24.

Top of Page