diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-10-11 09:33:33 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-10-11 09:33:33 +0000 |
| commit | 84ed495abb2dafac10666c667ea9ed20e05c28f6 (patch) | |
| tree | c8c5d866760195f1754e0ddfe86f2e46bf776e93 /gnome-mplayer | |
| parent | 84de86c06f8febaa30c10ed88084475650528910 (diff) | |
| download | asb-84ed495abb2dafac10666c667ea9ed20e05c28f6.tar.gz asb-84ed495abb2dafac10666c667ea9ed20e05c28f6.tar.xz | |
Update to 1.0.6 for Slackare 14
Diffstat (limited to 'gnome-mplayer')
| -rwxr-xr-x | gnome-mplayer/build/gnome-mplayer.SlackBuild | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/gnome-mplayer/build/gnome-mplayer.SlackBuild b/gnome-mplayer/build/gnome-mplayer.SlackBuild index 0dc0b178..90a1cb71 100755 --- a/gnome-mplayer/build/gnome-mplayer.SlackBuild +++ b/gnome-mplayer/build/gnome-mplayer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2009, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -41,6 +41,8 @@ # 1.0.4-1: 03/jul/2011 by Eric Hameleers <alien@slackware.com> # * Update. Removed "--without-gconf" from configure, so that # an existing GConf installation will be used. +# 1.0.6-1: 11/oct/2012 by Eric Hameleers <alien@slackware.com> +# * Update for Slackware 14. # # Run 'sh gnome-mplayer.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -51,7 +53,7 @@ # Set initial variables: PRGNAM=gnome-mplayer -VERSION=${VERSION:-1.0.4} +VERSION=${VERSION:-1.0.6} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -75,12 +77,16 @@ SRCURL="http://gnome-mplayer.googlecode.com/files/${PRGNAM}-${VERSION}.tar.gz" ## # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + armv6hl) export ARCH=$MARCH ;; + armv5hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -91,11 +97,25 @@ case "$ARCH" in x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv5hl) SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; esac +case "ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -170,7 +190,7 @@ CFLAGS="$SLKCFLAGS" \ --with-alsa \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log |