diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-03-18 22:42:48 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-03-18 22:42:48 +0000 |
| commit | c54cb4e5c6fddcb9bf809bd37ee3c79b3cdb23cf (patch) | |
| tree | 39815a8d6c0c083b4d2bd6c24fcc8acc206ee751 /wine | |
| parent | 8e000606c043936f0c8782e8085efc174c8c59cd (diff) | |
| download | asb-c54cb4e5c6fddcb9bf809bd37ee3c79b3cdb23cf.tar.gz asb-c54cb4e5c6fddcb9bf809bd37ee3c79b3cdb23cf.tar.xz | |
Attempt tp add wine64
Diffstat (limited to 'wine')
| -rwxr-xr-x | wine/build/wine.SlackBuild | 62 |
1 files changed, 44 insertions, 18 deletions
diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild index 49ae404b..e6cab7ef 100755 --- a/wine/build/wine.SlackBuild +++ b/wine/build/wine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2006-2013 Eric Hameleers, Eindhoven, NL +# Copyright 2006-2014 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -93,6 +93,7 @@ # 1.5.5-1 28/may/2012 by Eric Hameleers <alien@slackware.com> # 1.5.26-1 20/mar/2013 by Eric Hameleers <alien@slackware.com> # 1.7.9-1 23/dec/2013 by Eric Hameleers <alien@slackware.com> +# 1.7.14-1 18/mar/2014 by Eric Hameleers <alien@slackware.com> # # Run 'sh wine.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -102,7 +103,7 @@ PRGNAM=wine -SRCVER=${SRCVER:-"1.7.9"} +SRCVER=${SRCVER:-"1.7.14"} VERSION=$(echo $SRCVER | tr '-' '.') BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -267,21 +268,44 @@ if [ "$ARCH" = "x86_64" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig:PKG_CONFIG_PATH" fi -./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --with-x \ - --with${do_opengl}-opengl \ - --program-prefix= \ - --program-suffix= \ - --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 +function wineconfigure () +{ + ../configure \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --with-x \ + --with${do_opengl}-opengl \ + --program-prefix= \ + --program-suffix= \ + --build=$TARGET \ + $* +} + +if [ "$ARCH" = "x86_64" ]; then +# First, wine64: + mkdir wine64 + cd wine64 + wineconfigure --enable-win64 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log + make depend 2>&1 | tee $OUTPUT/make64-${PRGNAM}.log + make 2>&1 | tee -a $OUTPUT/make64-${PRGNAM}.log + make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install64-${PRGNAM}.log + cd - + # Next, wine: + mkdir wine32 + cd wine32 + wineconfigure --with-win64=../wine64 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 + cd - +else + wineconfigure 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 +fi # Add the wine-gecko MSI installer to the Wine package: mkdir -p $PKG/usr/share/wine/gecko @@ -289,7 +313,9 @@ cp -a ${SOURCE[1]} $PKG/usr/share/wine/gecko/ # 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/{fnt2fon,sfnt2fnt} $PKG/usr/bin +if [ -e tools/fnt2fon -a -e tools/sfnt2fnt ]; then + install -m 755 tools/{fnt2fon,sfnt2fnt} $PKG/usr/bin +fi # Add a desktop menu for the winecfg program: mkdir -p $PKG/usr/share/{icons/hicolor/scalable/apps,pixmaps} |