summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <nobbutl@yahoo.co.uk>2010-05-13 00:32:14 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:32:14 +0200
commitdf94b19b090233d6fe8fd66d8bd6b6642b14f429 (patch)
treed3dde3eff65f67f11636c7271fb8a40e29b6d1ad
parent77b9dd70547f319793409876308cededb4eaaba2 (diff)
downloadslackbuilds-df94b19b090233d6fe8fd66d8bd6b6642b14f429.tar.gz
libraries/libxmi: Updated for version 1.2
-rw-r--r--libraries/libxmi/README11
-rw-r--r--libraries/libxmi/libxmi.SlackBuild33
-rw-r--r--libraries/libxmi/libxmi.info4
-rw-r--r--libraries/libxmi/slack-desc6
4 files changed, 37 insertions, 17 deletions
diff --git a/libraries/libxmi/README b/libraries/libxmi/README
index a6d6636ec3..34a820cf68 100644
--- a/libraries/libxmi/README
+++ b/libraries/libxmi/README
@@ -1,6 +1,5 @@
-GNU libxmi is a C/C++ function library for rasterizing 2-D vector
-graphics. It can draw 2-D graphical primitives, including wide
-polygonal lines and circular and elliptical arcs, into a user
-supplied matrix of pixels. Sophisticated line styles, such as
-multicolored dashing patterns, can be specified. There is also
-support for filling and texturing polygons.
+GNU libxmi is a C/C++ function library for rasterizing 2-D vector graphics.
+It can draw 2-D graphical primitives, including wide polygonal lines and
+circular and elliptical arcs, into a user supplied matrix of pixels.
+Sophisticated line styles, such as multicolored dashing patterns, can be
+specified. There is also support for filling and texturing polygons.
diff --git a/libraries/libxmi/libxmi.SlackBuild b/libraries/libxmi/libxmi.SlackBuild
index 3778bcbe8c..1fa51db449 100644
--- a/libraries/libxmi/libxmi.SlackBuild
+++ b/libraries/libxmi/libxmi.SlackBuild
@@ -7,7 +7,7 @@
PRGNAM=libxmi
VERSION=1.2
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -17,8 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -32,31 +37,45 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# Substitute newer automake files that know about x86_64
+# (as for SBo's soundtouch)
+am=$(automake --version | grep "1." | cut -d " " -f 4 | cut -d "." -f 2)
+for i in config.guess config.sub depcomp install-sh missing; do
+ rm -f $i
+ ln -s /usr/share/automake-1.$am/$i $i
+done
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib$LIBDIRSUFFIX \
--sysconfdir=/etc \
--localstatedir=/var \
- --disable-static
+ --disable-static \
+ --build=$ARCH-slackware-linux \
+ --host=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
)
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING CUSTOMIZE ChangeLog INSTALL NEWS README \
- README-X TODO VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING CUSTOMIZE ChangeLog INSTALL NEWS README* TODO VERSION \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libxmi/libxmi.info b/libraries/libxmi/libxmi.info
index 91799925ff..7f2ef2a9fc 100644
--- a/libraries/libxmi/libxmi.info
+++ b/libraries/libxmi/libxmi.info
@@ -3,6 +3,8 @@ VERSION="1.2"
HOMEPAGE="http://www.gnu.org/software/libxmi/"
DOWNLOAD="http://ftp.gnu.org/gnu/libxmi/libxmi-1.2.tar.gz"
MD5SUM="4e6935484f0ad71b531920bf4c546b47"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="David Spencer"
EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="rworkman,Erik Hanson"
+APPROVED="rworkman"
diff --git a/libraries/libxmi/slack-desc b/libraries/libxmi/slack-desc
index a85912e616..40d4e57108 100644
--- a/libraries/libxmi/slack-desc
+++ b/libraries/libxmi/slack-desc
@@ -7,13 +7,13 @@
|-----handy-ruler------------------------------------------------------|
libxmi: libxmi (library for rasterizing 2-D vector graphics)
-libxmi:
+libxmi:
libxmi: GNU libxmi is a C/C++ function library for rasterizing 2-D vector
libxmi: graphics. It can draw 2-D graphical primitives, including wide
libxmi: polygonal lines and circular and elliptical arcs, into a user
libxmi: supplied matrix of pixels. Sophisticated line styles, such as
libxmi: multicolored dashing patterns, can be specified. There is also
libxmi: support for filling and texturing polygons.
-libxmi:
+libxmi:
libxmi: Homepage: http://www.gnu.org/software/libxmi/
-libxmi:
+libxmi: