From 4ec7b560bb194b22dc2b9889a906c4ed74184ce7 Mon Sep 17 00:00:00 2001 From: "Edinaldo P. Silva" Date: Tue, 30 Aug 2016 11:42:36 +0100 Subject: system/wine-staging: Updated for version 1.9.17. Signed-off-by: David Spencer --- system/wine-staging/README | 21 ++++++--- system/wine-staging/slack-desc | 16 +++---- system/wine-staging/wine-staging.SlackBuild | 68 +++++++++++++++++------------ system/wine-staging/wine-staging.info | 16 +++---- 4 files changed, 69 insertions(+), 52 deletions(-) diff --git a/system/wine-staging/README b/system/wine-staging/README index f23c5209cd..eb66528647 100644 --- a/system/wine-staging/README +++ b/system/wine-staging/README @@ -1,8 +1,15 @@ -Wine is an Open Source implementation of the Windows API on top of X and Unix. +wine-staging (Wine Staging is the testing area of winehq.org) -This is Wine patched on the fly with the staging patches, which bring -experimental but useful new Wine features such as PhysX support, EAX, and -more. +It contains bug fixes and features, which have not been integrated +into the development branch yet. The idea of Wine Staging is to +provide experimental features faster to end users and to give +developers the possibility to discuss and improve their patches before +they are integrated into the main branch. + +Wine Staging is maintained as a set of patches which has to be applied +on top of the corresponding Wine development version. Package +maintainers can decide if they want to include our full patchset, or +only want to cherry-pick patches for specific bugs NOTE: At the moment, it only compiles a 32-bit version of Wine, this may change in the future with the ability to compile both 64-bit and 32-bit @@ -11,13 +18,13 @@ version of Wine. You'll need a multilib system in order to compile this. While this is list as a separate package, this WILL overwrite your normal Wine binaries! Please keep this in mind. -Compile options/Optional dependences (keep in mind, you need 32-bit libs of -each): +Compile options/Optional dependences (keep in mind, you need 32-bit libs +of each): See README.SLACKWARE for a giant list of dependencies. XORG=YES|NO (default: YES), enable or disable Xorg -ALSA=YES|NO (default: YES), enable or disable ALSA +ALSA=YES|NO (default: YES), enable or disable ALSA OSS=YES|NO (default: NO), requires oss PULSE=YES|NO (default: NO), requires PulseAudio CUPS=YES|NO (default: YES), enable or disable CUPS diff --git a/system/wine-staging/slack-desc b/system/wine-staging/slack-desc index 39d828e869..cc9ef06d62 100644 --- a/system/wine-staging/slack-desc +++ b/system/wine-staging/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -wine-staging: wine-staging (Wine Is Not an Emulator Staging) -wine-staging: -wine-staging: Wine is an Open Source implementation of the Windows API -wine-staging: on top of X and Unix. This version of Wine is patched with -wine-staging: experimental but useful new Wine features. -wine-staging: -wine-staging: Homepage: http://www.wine-staging.com/ + |-----handy-ruler------------------------------------------------------| +wine-staging: wine-staging (Wine Staging is the testing area of winehq.org) wine-staging: +wine-staging: It contains bug fixes and features, which have not been integrated +wine-staging: into the development branch yet. The idea of Wine Staging is to +wine-staging: provide experimental features faster to end users and to give +wine-staging: developers the possibility to discuss and improve their patches before +wine-staging: they are integrated into the main branch. wine-staging: +wine-staging: Homepage: http://www.wine-staging.com/ wine-staging: wine-staging: diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index 42ef431fbb..329692c673 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -1,14 +1,17 @@ #!/bin/sh - -# Slackware build script for wine-staging - +# +# Slackware build script for wine-staging. +# # Copyright 2015 Gethyn ThomasQuail +# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# # All rights reserved. - +# # Based on: # Wine SlackBuild by David Woodfall Copyright 2011 -# Some elements from Wine Slackbuilds by Eric Hameleers and Phantom X, Goiania, Brazil - +# Some elements from Wine Slackbuilds by Eric Hameleers < alien@slackware.com > +# and PhantomX, Goiania, Brazil < https://github.com/PhantomX >. +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -27,12 +30,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine-staging -VERSION=${VERSION:-1.9.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.17} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,22 +47,23 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Default compile options -XORG=${XORG:-YES} -ALSA=${ALSA:-YES} -OSS=${OSS:-NO} -PULSE=${PULSE:-YES} -CUPS=${CUPS:-YES} -DBUS=${DBUS:-YES} -GALLIUM=${GALLIUM:-NO} -OPENAL=${OPENAL:-NO} -OPENGL=${OPENGL:-YES} -JPEG=${JPEG:-NO} -PNG=${PNG:-NO} -MPG123=${MPG123:-NO} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# Default compile options: + + XORG=${XORG:-YES} + ALSA=${ALSA:-YES} + OSS=${OSS:-NO} + PULSE=${PULSE:-YES} + CUPS=${CUPS:-YES} + DBUS=${DBUS:-YES} + GALLIUM=${GALLIUM:-NO} + OPENAL=${OPENAL:-NO} + OPENGL=${OPENGL:-YES} + JPEG=${JPEG:-NO} + PNG=${PNG:-NO} + MPG123=${MPG123:-NO} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -81,7 +86,8 @@ rm -rf wine-$VERSION tar xvf $CWD/wine-$VERSION.tar.bz2 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz -# Apply Staging patches +# Apply Staging patches: + cd wine-staging-$VERSION/patches ./patchinstall.sh --all DESTDIR=$TMP/wine-$VERSION @@ -93,7 +99,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Various compile options +# Various compile options: + if [ "$XORG" = "YES" ]; then do_x="with" else @@ -166,7 +173,8 @@ if [ "$MPG123" = "YES" ]; then do_mpg123="without" fi -# All of the libraries produced are 32bit libs anyway +# All of the libraries produced are 32bit libs anyway: + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -203,8 +211,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION" + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 5f3461403d..92df331401 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,12 +1,12 @@ PRGNAM="wine-staging" -VERSION="1.9.0" -HOMEPAGE="http://www.winehq.com/" -DOWNLOAD="http://ftp.winehq.org/pub/wine/source/1.9/wine-1.9.0.tar.bz2 \ - https://github.com/wine-compholio/wine-staging/archive/v1.9.0.tar.gz" -MD5SUM="adbd370a1726d3ffd571936f46262c94 \ - e4580a384c51d691310ab60727ccf5a6" +VERSION="1.9.17" +HOMEPAGE="http://www.wine-staging.com/" +DOWNLOAD="https://dl.winehq.org/wine/source/1.9/wine-1.9.17.tar.bz2 \ + https://github.com/wine-compholio/wine-staging/archive/v1.9.17/wine-staging-1.9.17.tar.gz" +MD5SUM="79fe7f8f7dde35de10576c0809d39d4f \ + d7b1926a460c798d2f94cebce24d4a65" DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Gethyn ThomasQuail" -EMAIL="gethyn@bloodbathsoftworks.com" +MAINTAINER="Edinaldo P. Silva" +EMAIL="edps@mundognu@gmail.com" -- cgit v1.2.3