summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'libraries')
-rw-r--r--libraries/imlib2/README7
-rw-r--r--libraries/imlib2/imlib2.SlackBuild30
-rw-r--r--libraries/imlib2/imlib2.info8
3 files changed, 25 insertions, 20 deletions
diff --git a/libraries/imlib2/README b/libraries/imlib2/README
index 4d3513f9f4..8ecf5496cf 100644
--- a/libraries/imlib2/README
+++ b/libraries/imlib2/README
@@ -1,4 +1,4 @@
-Imlib2 is the successor to Imlib.
+Imlib2 is the (intended) successor to Imlib.
Imlib2 can load image files from disk in one of many formats, save
images to disk in one of many formats, render image data onto other
@@ -6,8 +6,7 @@ images, render images to an X-Windows drawable, produce pixmaps and
pixmap masks of images, apply filters to images, rotate images,
accept RGBA data for images, scale images, and more.
-Slackware 12 comes with Imlib 1.9.x - from the imlib2 website:
-
+Slackware 12.1 comes with Imlib 1.9.x - Note that the imlib2 site says:
"Imlib2 can be installed alongside Imlib 1.x without any problems since
-they are effectively different libraries - but they Have very similar
+they are effectively different libraries - but they have very similar
functionality."
diff --git a/libraries/imlib2/imlib2.SlackBuild b/libraries/imlib2/imlib2.SlackBuild
index cdcc0c5176..ad3669cdc5 100644
--- a/libraries/imlib2/imlib2.SlackBuild
+++ b/libraries/imlib2/imlib2.SlackBuild
@@ -1,15 +1,16 @@
#!/bin/sh
-# Slackware build script for Imlib2
+# Slackware build script for Imlib2
# Written by Chess Griffin <chess at chessgriffin dot com>
# Modified by the SlackBuilds.org project
-PRGNAM=imlib2
-VERSION=1.4.0
+PRGNAM=imlib2
+VERSION=1.4.2
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -19,14 +20,18 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -36,16 +41,17 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- || exit 1
+ --enable-static=no \
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING COPYING-PLAIN README README.in \
-INSTALL NEWS TODO Doxyfile doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc -name "Makefile*" -exec rm {} \;
+cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO doc/* \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/Makefile*
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/imlib2/imlib2.info b/libraries/imlib2/imlib2.info
index 28e3d6f026..bd6b1089ca 100644
--- a/libraries/imlib2/imlib2.info
+++ b/libraries/imlib2/imlib2.info
@@ -1,8 +1,8 @@
PRGNAM="imlib2"
-VERSION="1.4.0"
+VERSION="1.4.2"
HOMEPAGE="http://www.enlightenment.org"
-DOWNLOAD="http://dl.sourceforge.net/enlightenment/imlib2-1.4.0.tar.gz"
-MD5SUM="69f7ee996c943142332b4c98597b095c"
+DOWNLOAD="http://downloads.sourceforge.net/enlightenment/imlib2-1.4.2.tar.gz"
+MD5SUM="0c866a7e696ad5ac58bc9312149f15f0"
MAINTAINER="Chess Griffin"
EMAIL="chess@chessgriffin.com"
-APPROVED="rworkman"
+APPROVED="Michiel"