Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9d6229e51c3498471a84510d9ef3c91f8832f178)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9d6229e51c3498471a84510d9ef3c91f8832f178)
  • Date: Mon, 7 Mar 2016 00:18:44 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics/netpbm/BUILD | 4 ++--
graphics/netpbm/DETAILS | 12 ++++++++----
graphics/netpbm/HISTORY | 7 +++++++
graphics/netpbm/PRE_BUILD | 8 +-------
graphics/netpbm/netpbm-10.42.0-gcc43.patch | 16 ----------------
5 files changed, 18 insertions(+), 29 deletions(-)

New commits:
commit 9d6229e51c3498471a84510d9ef3c91f8832f178
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

netpbm: fixup and update to make it build again

diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index 906e808..e38e94b 100755
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -1,4 +1,4 @@
-if [[ "${NETPBM_SVN}" == 'y' ]]; then
+if test -e config.mk.in; then
CONFIGFILE=config.mk
else
CONFIGFILE=Makefile.config
@@ -35,4 +35,4 @@ if list_find "$OPTS" yes-svga; then
echo "LINUXSVGALIB = libvga.so" >> $CONFIGFILE
fi &&
sedit "s/^\(CFLAGS =\)/\1 ${CFLAGS} /" $CONFIGFILE &&
-make
+make CFLAGS_SHLIB=-fPIC
diff --git a/graphics/netpbm/DETAILS b/graphics/netpbm/DETAILS
index 009ee53..81d1361 100755
--- a/graphics/netpbm/DETAILS
+++ b/graphics/netpbm/DETAILS
@@ -6,10 +6,14 @@ if [[ $NETPBM_SVN == y ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=10.35.96
-
SOURCE_HASH=sha512:8f28242a1d355870b80a6d8d6ad7356158e09c2dde4b0939d6e11ec30c0bc19e849ce92d423c8b6d58aeb952cdcca0d4391e70cff97c5bf8bcf0edcb3f90f6ae
- SOURCE=$SPELL-$VERSION.tgz
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
+# Switched to an export tarball of stable since super stable does not build
with
+# current libpng.
+ NETPBM_RELEASE=stable
+ VERSION=10.73.00
+
SOURCE_HASH=sha512:28dfd5b32cb82bdd7821925e5e18ee1a1dbc3094827d90a626eaf737b4415be41fb3c69ba2589168b922c645219ba05bc32d47cea54c38f15db0aeeb5da060d7
+ SOURCE=$SPELL-$VERSION.sobukus.tar.bz2
+ SOURCE_URL[0]=http://sobukus.de/netpbm/$SOURCE
+# SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://netpbm.sourceforge.net/
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index d593e3d..a252e8a 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,10 @@
+2016-03-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to third-party export of stable 10.73.00 for
+ libpng compatibility
+ * PRE_BUILD: remove stuff from old branches that won't build anymore
+ * netpbm-10.42.0-gcc43.patch: gone
+ * BUILD: fixup for version change, build shlibs with -fPIC
+
2015-07-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated NETPBM_SVN=n to 10.35.96

diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 77b5d3c..0e7958b 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -1,16 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NETPBM_RELEASE == stable ]] || [[ $NETPBM_RELEASE == superstable ]];
then
- patch -p1 < "$SPELL_DIRECTORY/netpbm-10.42.0-gcc43.patch"
-fi &&
-
# create proper .so symlink
sed -i "s:/link:/lib:g" lib/Makefile &&

# fixing paths
-if [[ $NETPBM_RELEASE != advanced ]] && [[ $NETPBM_RELEASE != trunk ]]; then
- sed -i "s:misc:share/netpbm:;s:/man/:/share/man/:g" Makefile.common
-elif [[ $NETPBM_RELEASE == advanced ]]; then
+if [[ $NETPBM_RELEASE == advanced ]]; then
sed -i "s:misc:share/netpbm:;s:PKGMANDIR = man:PKGMANDIR = share/man:g"
common.mk
fi
diff --git a/graphics/netpbm/netpbm-10.42.0-gcc43.patch
b/graphics/netpbm/netpbm-10.42.0-gcc43.patch
deleted file mode 100644
index 1e61de8..0000000
--- a/graphics/netpbm/netpbm-10.42.0-gcc43.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 */



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9d6229e51c3498471a84510d9ef3c91f8832f178), Thomas Orgis, 03/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page