diff options
| author | David Woodfall <dave@dawoodfall.net> | 2013-04-15 22:57:21 -0500 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2013-04-28 12:23:17 -0300 |
| commit | 1ea0a9e3d3b33c0a2d44c0f0bf8a70e37ea1c3cf (patch) | |
| tree | 92df291f32866b22c8232610a34536591f2bddaf /system/wine/wine.SlackBuild | |
| parent | c8f00d9d0c84b963dc8745ce68b9469cede770e2 (diff) | |
| download | slackbuilds-1ea0a9e3d3b33c0a2d44c0f0bf8a70e37ea1c3cf.tar.gz | |
system/wine: Updated for version 1.5.25.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/wine/wine.SlackBuild')
| -rw-r--r-- | system/wine/wine.SlackBuild | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild index 13c6a76c12..8fd9e1df53 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wine -# Copyright 2011- David Woodfall +# Copyright 2011 David Woodfall # All rights reserved. # Uses patches supplied by Robby Workman's previous slackbuild. @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine -VERSION=${VERSION:-1.5.13} +VERSION=${VERSION:-1.5.25} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -49,9 +49,6 @@ IEFIX=${IEFIX:-NO} # the run the script like: OPENGL=NO ./wine.SlackBuild OPENGL=${OPENGL:-YES} -# Apply LOTRO patch. -LOTRO=${LOTRO:-NO} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -93,19 +90,17 @@ if [ "$OPENGL" = "YES" ]; then do_opengl="without" fi -# Thanks to Branden for supplying the patch -# If LOTRO = YES above, then apply the patch -if [ "$LOTRO" = "YES" ]; then - patch -p1 --verbose < $CWD/LOTRO.patch -fi +patch -p1 --verbose < $CWD/configure_asm.patch # All of the libraries produced are 32bit libs anyway +CCAS="/usr/bin/as" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-gnutls=yes \ --${do_opengl}-opengl \ --build=$ARCH-slackware-linux |