summaryrefslogtreecommitdiffstats
path: root/source/l/libjpeg
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/libjpeg')
-rw-r--r--source/l/libjpeg/jpeg-6b.diff59
-rwxr-xr-xsource/l/libjpeg/libjpeg.SlackBuild94
2 files changed, 56 insertions, 97 deletions
diff --git a/source/l/libjpeg/jpeg-6b.diff b/source/l/libjpeg/jpeg-6b.diff
deleted file mode 100644
index 8ad8bb5db..000000000
--- a/source/l/libjpeg/jpeg-6b.diff
+++ /dev/null
@@ -1,59 +0,0 @@
---- makefile.cfg.orig Sat Mar 21 13:08:57 1998
-+++ makefile.cfg Tue Oct 6 19:15:26 1998
-@@ -21,6 +21,8 @@
-
- # The name of your C compiler:
- CC= @CC@
-+SONAME=libjpeg.so.62
-+SHLIBNAME=libjpeg.so.62.0.0
-
- # You may need to adjust these cc options:
- CFLAGS= @CFLAGS@ @CPPFLAGS@ @INCLUDEFLAGS@
-@@ -125,6 +127,7 @@
- jdsample.$(O) jdcolor.$(O) jquant1.$(O) jquant2.$(O) jdmerge.$(O)
- # These objectfiles are included in libjpeg.a
- LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
-+SHLIBOBJECTS= $(LIBOBJECTS:%.o=%.so)
- # object files for sample applications (excluding library files)
- COBJECTS= cjpeg.$(O) rdppm.$(O) rdgif.$(O) rdtarga.$(O) rdrle.$(O) \
- rdbmp.$(O) rdswitch.$(O) cdjpeg.$(O)
-@@ -133,7 +136,7 @@
- TROBJECTS= jpegtran.$(O) rdswitch.$(O) cdjpeg.$(O) transupp.$(O)
-
-
--all: @A2K_DEPS@ libjpeg.$(A) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+all: @A2K_DEPS@ libjpeg.$(A) $(SHLIBNAME) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-
- # Special compilation rules to support ansi2knr and libtool.
- .SUFFIXES: .lo .la
-@@ -171,6 +174,11 @@
- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
- -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
-
-+# shared library
-+
-+$(SHLIBNAME): @A2K_DEPS@ $(SHLIBOBJECTS)
-+ gcc -o $(SHLIBNAME) -Wl,-soname,$(SONAME) -shared $(SHLIBOBJECTS)
-+
- # sample programs:
-
- cjpeg: $(COBJECTS) libjpeg.$(A)
-@@ -214,7 +222,7 @@
- clean:
- $(RM) *.o *.lo libjpeg.a libjpeg.la
- $(RM) cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-- $(RM) ansi2knr core testout* config.log config.status
-+ $(RM) ansi2knr core testout* config.log config.status $(SHLIBNAME)
- $(RM) -r knr .libs _libs
-
- distclean: clean
-@@ -289,6 +297,9 @@
- jidctfst.$(O): jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
- jidctint.$(O): jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
- jidctred.$(O): jidctred.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h
-+
-+%.so : %.c
-+ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@
- jquant1.$(O): jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
- jquant2.$(O): jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
- jutils.$(O): jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h
diff --git a/source/l/libjpeg/libjpeg.SlackBuild b/source/l/libjpeg/libjpeg.SlackBuild
index 5ec9f0164..9d43d22ea 100755
--- a/source/l/libjpeg/libjpeg.SlackBuild
+++ b/source/l/libjpeg/libjpeg.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,20 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=${VERSION:-6b}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-v8a}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
CWD=$(pwd)
TMP=${TMP:-/tmp}
@@ -38,51 +49,58 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
rm -rf $PKG
mkdir -p $TMP $PKG
-# Explode the package framework:
-cd $PKG
-explodepkg $CWD/_libjpeg.tar.gz
-if [ "$ARCH" = "x86_64" ]; then
- mv usr/lib usr/lib${LIBDIRSUFFIX}
- sed -i -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" install/doinst.sh
-fi
-
cd $TMP
-rm -rf jpeg-6b
-tar xzvf $CWD/jpegsrc.v6b.tar.gz
-cd jpeg-6b
+rm -rf jpeg-8
+tar xvf $CWD/jpegsrc.${VERSION}.tar.?z* || exit 1
+cd jpeg-$(echo $VERSION | cut -f 2 -d v)
+
chown -R root:root .
-zcat $CWD/jpeg-6b.diff.gz | patch -p0 -E
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
export CFLAGS="$SLKCFLAGS"
./configure \
+ --prefix=/usr \
+ --mandir=/usr/man \
--libdir=/usr/lib${LIBDIRSUFFIX}
-make -j3 || exit 1
-strip cjpeg djpeg rdjpgcom wrjpgcom jpegtran
-cat cjpeg > $PKG/usr/bin/cjpeg
-cat djpeg > $PKG/usr/bin/djpeg
-cat jpegtran > $PKG/usr/bin/jpegtran
-cat rdjpgcom > $PKG/usr/bin/rdjpgcom
-cat wrjpgcom > $PKG/usr/bin/wrjpgcom
-for page in cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 ; do
- cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz
-done
-strip --strip-unneeded libjpeg.so.62.0.0
-cat libjpeg.so.62.0.0 > $PKG/usr/lib${LIBDIRSUFFIX}/libjpeg.so.62.0.0
-cat libjpeg.a > $PKG/usr/lib${LIBDIRSUFFIX}/libjpeg.a
-cp -a jconfig.h jpeglib.h jmorecfg.h jerror.h $PKG/usr/include
-# KDE includes this complete header list, but the libjpeg source doesn't
-# suggest it, and we trust them. :)
-#for file in jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h \
-# jmorecfg.h jpegint.h jpeglib.h jversion.h cdjpeg.h cderror.h jconfig.h ; do
-# cp -a $file $PKG/usr/include
-#done
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
+
mkdir -p $PKG/usr/doc/libjpeg-$VERSION
-cp -a README *.doc $PKG/usr/doc/libjpeg-$VERSION
-chmod 644 $PKG/usr/doc/libjpeg-$VERSION/*
+cp -a README $PKG/usr/doc/libjpeg-$VERSION
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc