diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-03-25 11:24:05 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-03-25 11:24:05 +0000 |
| commit | 187390d32a60c73df2f739dc864a1e8f522ee71d (patch) | |
| tree | 632b377fce3103ac113079087ac87a1fcf142097 /wine | |
| parent | 02ed202236a375b5bb1c5c5b35a644f17fc2e21c (diff) | |
| download | asb-187390d32a60c73df2f739dc864a1e8f522ee71d.tar.gz asb-187390d32a60c73df2f739dc864a1e8f522ee71d.tar.xz | |
Update to 1.4
Diffstat (limited to 'wine')
| -rwxr-xr-x | wine/build/wine.SlackBuild | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 1add0018..728b2bb7 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2006-2010 Eric Hameleers, Eindhoven, NL +# Copyright 2006-2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -86,6 +86,8 @@ # 1.2.rc2-1: 29/may/2010 by Eric Hameleers <alien@slackware.com> # 1.2-1: 17/jul/2010 by Eric Hameleers <alien@slackware.com> # 1.2.2-1: 20/dec/2010 by Eric Hameleers <alien@slackware.com> +# 1.3.37-1 18/jan/2012 by Eric Hameleers <alien@slackware.com> +# 1.4-1 25/mar/2012 by Eric Hameleers <alien@slackware.com> # # Run 'sh wine.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -93,10 +95,9 @@ # # ----------------------------------------------------------------------------- -# Set initial variables: PRGNAM=wine -SRCVER=${SRCVER:-"1.2.2"} +SRCVER=${SRCVER:-"1.4"} VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -121,19 +122,21 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SOURCE="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2" -SRCURL="http://ibiblio.org/pub/linux/system/emulators/${PRGNAM}/${PRGNAM}-${SRCVER}.tar.bz2" +SRCURL="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2" ## ## --- with a little luck, you won't have to edit below this point --- ## ## # 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 ;; + 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 @@ -146,6 +149,11 @@ case "$ARCH" in ;; 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 on line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -235,7 +243,11 @@ chmod -R u+w,go+r-w,a+X-s . echo Building ... -[ "${OPENGL}" = "YES" ] && do_opengl="" || do_opengl="out" +if [ "${OPENGL}" = "YES" -o "${OPENGL}" = "yes" ]; then + do_opengl="" +else + do_opengl="out" +fi LDFLAGS="-L/usr/lib -ldl" \ CFLAGS="$SLKCFLAGS" \ @@ -249,13 +261,14 @@ CXXFLAGS="$SLKCFLAGS" \ --with${do_opengl}-opengl \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log + make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log -# Add the font converter programs ifthey were created using fontforge: +# Add the font converter programs if they were created using fontforge: # (useful if you need to convert a Windows .fon file to UNIX .bdf) install -m 755 tools/{fnt2bdf,fnt2fon,sfnt2fnt} $PKG/usr/bin |