Date: Tuesday, November 24, 2015 @ 06:26:14 Author: fyan Revision: 147589
archrelease: copy trunk to multilib-x86_64 Added: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 147588, wine-staging/trunk/30-win32-aliases.conf) wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 147588, wine-staging/trunk/PKGBUILD) wine-staging/repos/multilib-x86_64/wine.install (from rev 147588, wine-staging/trunk/wine.install) Deleted: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf wine-staging/repos/multilib-x86_64/PKGBUILD wine-staging/repos/multilib-x86_64/wine.install --------------+ PKGBUILD | 384 ++++++++++++++++++++++++++++----------------------------- wine.install | 24 +-- 2 files changed, 203 insertions(+), 205 deletions(-) Deleted: 30-win32-aliases.conf =================================================================== (Binary files differ) Copied: wine-staging/repos/multilib-x86_64/30-win32-aliases.conf (from rev 147588, wine-staging/trunk/30-win32-aliases.conf) =================================================================== (Binary files differ) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-11-24 05:25:46 UTC (rev 147588) +++ PKGBUILD 2015-11-24 05:26:14 UTC (rev 147589) @@ -1,193 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> -# Contributor: Eduardo Romero <edua...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> - -pkgname=wine-staging -pkgver=1.7.55 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=("https://github.com/wine-compholio/wine-patched/archive/staging-$pkgver.tar.gz" - 30-win32-aliases.conf) -sha1sums=('18317cfdc7a9a751910eb31df4996bd430a23c18' - '023a5c901c6a091c56e76b6a62d141d87cce9fdb') - -pkgdesc="A compatibility layer for running Windows programs - Staging branch" -url="http://www.wine-staging.com" -arch=(i686 x86_64) -options=(staticlibs) -license=(LGPL) -install=wine.install - -_depends=( - attr lib32-attr - fontconfig lib32-fontconfig - lcms2 lib32-lcms2 - libxml2 lib32-libxml2 - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - freetype2 lib32-freetype2 - glu lib32-glu - libsm lib32-libsm - gcc-libs lib32-gcc-libs - libpcap lib32-libpcap - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libldap lib32-libldap - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - mesa lib32-mesa - mesa-libgl lib32-mesa-libgl - libcl lib32-libcl - libxslt lib32-libxslt - libpulse lib32-libpulse - libva lib32-libva - gtk3 lib32-gtk3 - samba - opencl-headers -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - libxinerama lib32-libxinerama - ncurses lib32-ncurses - libcl lib32-libcl - libxslt lib32-libxslt - libva lib32-libva - gtk3 lib32-gtk3 - cups - samba dosbox -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - _depends=(${_depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/} ${_depends[@]}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) - provides=("wine=$pkgver") - conflicts=('wine') -else - makedepends=(${makedepends[@]} ${_depends[@]}) - provides=("wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('wine' 'wine-wow64') -fi - -prepare() { - cd wine-patched-staging-$pkgver - - sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* -} - -build() { - cd "$srcdir" - - # remove once https://bugs.winehq.org/show_bug.cgi?id=38653 is resolved - export CFLAGS="${CFLAGS/-O2/} -O0" - export CXXFLAGS="${CXXFLAGS/-O2/} -O0" - - # Allow ccache to work - mv wine-patched-staging-$pkgver $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - # These additional CPPFLAGS solve FS#27662 and FS#34195 - export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --with-x \ - --without-gstreamer \ - --enable-win64 \ - --with-xattr - # Gstreamer was disabled for FS#33655 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --with-x \ - --without-gstreamer \ - --with-xattr \ - "${_wine32opts[@]}" - - # These additional flags solve FS#23277 - make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2" -} - -package() { - depends=(${_depends[@]}) - - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi - - # Font aliasing settings for Win32 applications - install -d "$pkgdir"/etc/fonts/conf.{avail,d} - install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail" - ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf" -} - -# vim:set ts=8 sts=2 sw=2 et: Copied: wine-staging/repos/multilib-x86_64/PKGBUILD (from rev 147588, wine-staging/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-11-24 05:26:14 UTC (rev 147589) @@ -0,0 +1,191 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> +# Contributor: Eduardo Romero <edua...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> + +pkgname=wine-staging +pkgver=1.8rc1 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz" + 30-win32-aliases.conf) +sha1sums=('9e7171224002fa6d3bbf6d4a08e8e2b4e47d21de' + '023a5c901c6a091c56e76b6a62d141d87cce9fdb') + +pkgdesc="A compatibility layer for running Windows programs - Staging branch" +url="http://www.wine-staging.com" +arch=(i686 x86_64) +options=(staticlibs) +license=(LGPL) +install=wine.install + +_depends=( + attr lib32-attr + fontconfig lib32-fontconfig + lcms2 lib32-lcms2 + libxml2 lib32-libxml2 + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxi lib32-libxi + gettext lib32-gettext + freetype2 lib32-freetype2 + glu lib32-glu + libsm lib32-libsm + gcc-libs lib32-gcc-libs + libpcap lib32-libpcap + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libpng lib32-libpng + gnutls lib32-gnutls + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libldap lib32-libldap + mpg123 lib32-mpg123 + openal lib32-openal + v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib + libxcomposite lib32-libxcomposite + mesa lib32-mesa + mesa-libgl lib32-mesa-libgl + libcl lib32-libcl + libxslt lib32-libxslt + libpulse lib32-libpulse + libva lib32-libva + gtk3 lib32-gtk3 + samba + opencl-headers +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + gnutls lib32-gnutls + mpg123 lib32-mpg123 + openal lib32-openal + v4l-utils lib32-v4l-utils + libpulse lib32-libpulse + alsa-plugins lib32-alsa-plugins + alsa-lib lib32-alsa-lib + libjpeg-turbo lib32-libjpeg-turbo + libxcomposite lib32-libxcomposite + libxinerama lib32-libxinerama + ncurses lib32-ncurses + libcl lib32-libcl + libxslt lib32-libxslt + libva lib32-libva + gtk3 lib32-gtk3 + cups + samba dosbox +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + _depends=(${_depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/} ${_depends[@]}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) + provides=("wine=$pkgver") + conflicts=('wine') +else + makedepends=(${makedepends[@]} ${_depends[@]}) + provides=("wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('wine' 'wine-wow64') +fi + +prepare() { + # Allow ccache to work + mv wine-patched-staging-$_pkgbasever $pkgname + + sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure* + + # Remove once https://bugs.winehq.org/show_bug.cgi?id=38653 is resolved + export CFLAGS="${CFLAGS/-O2/} -O0" + export CXXFLAGS="${CXXFLAGS/-O2/} -O0" + + # These additional CPPFLAGS solve FS#27662 and FS#34195 + export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build +} + +build() { + cd "$srcdir" + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --with-x \ + --without-gstreamer \ + --enable-win64 \ + --with-xattr + # Gstreamer was disabled for FS#33655 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --with-x \ + --without-gstreamer \ + --with-xattr \ + "${_wine32opts[@]}" + + # These additional flags solve FS#23277 + make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2" +} + +package() { + depends=(${_depends[@]}) + + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi + + # Font aliasing settings for Win32 applications + install -d "$pkgdir"/etc/fonts/conf.{avail,d} + install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail" + ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf" +} + +# vim:set ts=8 sts=2 sw=2 et: Deleted: wine.install =================================================================== --- wine.install 2015-11-24 05:25:46 UTC (rev 147588) +++ wine.install 2015-11-24 05:26:14 UTC (rev 147589) @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} Copied: wine-staging/repos/multilib-x86_64/wine.install (from rev 147588, wine-staging/trunk/wine.install) =================================================================== --- wine.install (rev 0) +++ wine.install 2015-11-24 05:26:14 UTC (rev 147589) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + #echo "If you are on x86_64, the default WINEARCH will be win64." + #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + #echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +}