system/wine-staging: Updated for version 2.3.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
Edinaldo P. Silva 2017-03-07 23:24:32 +00:00 committed by David Spencer
parent cf48ca8f50
commit c03b060fb1
4 changed files with 20 additions and 123 deletions

View File

@ -1,15 +1,13 @@
wine-staging (Wine Staging is the testing area of winehq.org)
It contains bug fixes and features, which have not been integrated
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
This is a current development branch of Wine appended with full
patches of Staging area.
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

View File

@ -8,7 +8,7 @@
|-----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: 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

View File

@ -30,7 +30,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wine-staging
VERSION=${VERSION:-2.1}
VERSION=${VERSION:-2.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -47,20 +47,10 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
# Default compile options:
# If your video card does not support hardware accelerated OpenGL,
# the run the script like: OPENGL=NO ./wine.SlackBuild
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"
@ -78,20 +68,15 @@ fi
set -e
SRCNAM="wine-patched-staging"
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
rm -rf wine-$VERSION
tar xvf $CWD/wine-$VERSION.tar.xz
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
cd $SRCNAM-$VERSION
# Apply Staging patches:
cd wine-staging-$VERSION/patches
./patchinstall.sh --all DESTDIR=$TMP/wine-$VERSION
cd $TMP/wine-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@ -99,55 +84,7 @@ 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:
if [ "$XORG" = "YES" ]; then
do_x="with"
else
do_x="without"
fi
if [ "$ALSA" = "YES" ]; then
do_alsa="with"
else
do_alsa="without"
fi
if [ "$OSS" = "YES" ]; then
do_oss="with"
else
do_oss="without"
fi
if [ "$PULSE" = "YES" ]; then
do_pulse="with"
else
do_pulse="without"
fi
if [ "$CUPS" = "YES" ]; then
do_cups="with"
else
do_cups="without"
fi
if [ "$DBUS" = "YES" ]; then
do_dbus="with"
else
do_dbus="without"
fi
if [ "$GALLIUM" = "YES" ]; then
do_gallium="with"
else
do_gallium="without"
fi
if [ "$OPENAL" = "YES" ]; then
do_openal="with"
else
do_openal="without"
fi
# If OPENGL=YES above, then enable opengl; otherwise, disable it.
if [ "$OPENGL" = "YES" ]; then
do_opengl="with"
@ -155,51 +92,14 @@ if [ "$OPENGL" = "YES" ]; then
do_opengl="without"
fi
if [ "$JPEG" = "YES" ]; then
do_jpeg="with"
else
do_jpeg="without"
fi
if [ "$PNG" = "YES" ]; then
do_png="with"
else
do_png="without"
fi
if [ "$MPG123" = "YES" ]; then
do_mpg123="with"
else
do_mpg123="without"
fi
# All of the libraries produced are 32bit libs anyway:
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--mandir=/usr/man \
--sysconfdir=/etc \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-gnutls=yes \
--${do_x}-x \
--x-includes=/usr/include \
--${do_alsa}-alsa \
--${do_oss}-oss \
--${do_pulse}-pulse \
--${do_cups}-cups \
--${do_dbus}-dbus \
--${do_openal}-openal \
--${do_gallium}-d3dadapter \
--${do_opengl}-opengl \
--${do_jpeg}-jpeg \
--${do_png}-png \
--${do_mpg123}-mpg123 \
--with-fontconfig \
--with-freetype \
--with-gstreamer \
--with-xattr \
--build=$ARCH-slackware-linux
make
@ -216,7 +116,7 @@ install -d $PKG/etc/fonts/conf.{avail,d}
install -m644 $CWD/30-win32-aliases.conf $PKG/etc/fonts/conf.avail
ln -sf /etc/fonts/conf.avail/30-win32-aliases.conf $PKG/etc/fonts/conf.d/30-win32-aliases.conf
# Add a desktop menu for the wine and winecfg programs:
# Add a desktop menu for winecfg:
mkdir -p $PKG/usr/share/{applications,icons/hicolor/scalable/apps,pixmaps}
convert $CWD/wine.svg -scale 64 $PKG/usr/share/pixmaps/wine.png
cp -a $CWD/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/
@ -225,9 +125,10 @@ cp -a programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
cp -a $CWD/winecfg.desktop $PKG/usr/share/applications/
DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times"
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install

View File

@ -1,10 +1,8 @@
PRGNAM="wine-staging"
VERSION="2.1"
VERSION="2.3"
HOMEPAGE="http://www.wine-staging.com/"
DOWNLOAD="https://dl.winehq.org/wine/source/2.x/wine-2.1.tar.xz \
https://github.com/wine-compholio/wine-staging/archive/v2.1/wine-staging-2.1.tar.gz"
MD5SUM="ff793738a8274af3ae71dc143dda89e8 \
642627da85a22f08f968c3b1ee5c7ec5"
DOWNLOAD="https://github.com/wine-compholio/wine-patched/archive/staging-2.3/wine-patched-staging-2.3.tar.gz"
MD5SUM="0f28988f92ce676bf8016444137b589d"
DOWNLOAD_x86_64="UNSUPPORTED"
MD5SUM_x86_64=""
REQUIRES=""