diff options
author | Eric Hameleers <alien@slackware.com> | 2013-04-06 19:43:55 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-04-06 19:43:55 +0200 |
commit | 55bce4decbbdde684c63507f88f4f33694579f4f (patch) | |
tree | 409994b26efea8c2a9f65206de616bed4f931d25 /source.local/l/gdk-pixbuf2 | |
parent | b100c7c57e8a1363adfffe22f68b6429b9576dd3 (diff) | |
download | alienarm-55bce4decbbdde684c63507f88f4f33694579f4f.tar.gz alienarm-55bce4decbbdde684c63507f88f4f33694579f4f.tar.xz |
Update to Alien's ARM which allows XFCE to run on an ARM ChromeBook.
This large update brings Alien's ARM repository almost to the same level
of package versions in slackware-current. THese updates were needed to
make it possible to start a functional XFCE session on Samsung's ARM
ChromeBook (XE303C12).
Diffstat (limited to 'source.local/l/gdk-pixbuf2')
-rwxr-xr-x | source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild | 86 | ||||
-rw-r--r-- | source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders | 4 |
2 files changed, 57 insertions, 33 deletions
diff --git a/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild index 272ee27..aff19c8 100755 --- a/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild +++ b/source.local/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild @@ -1,8 +1,6 @@ #!/bin/sh -# Slackware build script for gdk-pixbuf - -# Copyright 2010 Robby Workman, Northport, Alabama, USA +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA # Copyright 2010, 2011 Patrick Volkerding, Sebeka, Minnesota, USA # All rights reserved. # @@ -27,38 +25,39 @@ PKGNAM=gdk-pixbuf -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-2.26.5} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -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" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" +if [ -e $CWD/machine.conf ]; then + . $CWD/machine.conf ] +elif [ -e /etc/slackbuild/machine.conf ]; then + . /etc/slackbuild/machine.conf ] else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + # 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 + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: + if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + fi fi case "$ARCH" in @@ -96,7 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-introspection \ + --enable-introspection \ + --with-x11 \ --build=$TARGET make $NUMJOBS || make || exit 1 @@ -128,14 +128,34 @@ chmod 0755 $PKG/usr/bin/update-gdk-pixbuf-loaders find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# 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/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders b/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders index b19d368..5848db8 100644 --- a/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders +++ b/source.local/l/gdk-pixbuf2/update-gdk-pixbuf-loaders @@ -21,6 +21,10 @@ case "$host" in /usr/bin/gdk-pixbuf-query-loaders-64 --update-cache # Check for x86_64 multilib: if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then + for d in $(ls -d /etc/pango/i?86*); do + mlhost=$(basename $d) + break + done if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gdk-pixbuf.loaders for ${mlhost}:" |