summaryrefslogtreecommitdiffstats
path: root/gecko-mediaplayer
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2012-10-11 09:38:29 +0000
committer Eric Hameleers <alien@slackware.com>2012-10-11 09:38:29 +0000
commit7dcfa81987947d33cdc0da7b2703564510d76d3d (patch)
tree710db6ce2e152e866763d1c243e6f562b884101e /gecko-mediaplayer
parent84ed495abb2dafac10666c667ea9ed20e05c28f6 (diff)
downloadasb-7dcfa81987947d33cdc0da7b2703564510d76d3d.tar.gz
asb-7dcfa81987947d33cdc0da7b2703564510d76d3d.tar.xz
Update to 1.0.6 for Slackware 14
Diffstat (limited to 'gecko-mediaplayer')
-rwxr-xr-xgecko-mediaplayer/build/gecko-mediaplayer.SlackBuild35
1 files changed, 27 insertions, 8 deletions
diff --git a/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild b/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild
index b0d82ff7..15919766 100755
--- a/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild
+++ b/gecko-mediaplayer/build/gecko-mediaplayer.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
@@ -42,6 +42,8 @@
# * Upgrade.
# 1.0.4-1: 03/jul/2011 by Eric Hameleers <alien@slackware.com>
# * Upgrade.
+# 1.0.6-1: 11/oct/2012 by Eric Hameleers <alien@slackware.com>
+# * Upgrade for Slackware 14.
#
# Run 'sh gecko-mediaplayer.SlackBuild' to build a Slackware package.
# The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -52,7 +54,7 @@
# Set initial variables:
PRGNAM=gecko-mediaplayer
-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://gecko-mediaplayer.googlecode.com/files/${PRGNAM}-${VERSION}.tar.g
##
# 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
@@ -168,9 +188,8 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux \
+ --build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
- #--without-gconf \
# Still need the libdir explicitly here, to prevent installing unwantedly
# into /usr/lib${LIBDIRSUFFIX}/seamonkey...