Updated to 1.8-rc2

1 files changed, 93 insertions, 85 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c7ecea2f8ddc..90e1b4a89850 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,37 @@
 # Based on wine-staging PKGBUILD
 
 #Additional patches:
-# -Raw input fix
 # -Mip-Map fix (see https://bugs.winehq.org/show_bug.cgi?id=34480 )
 # -Keybind patch reversion
 # -Heap allocation perfomance improvement patch
 # -Wbemprox videocontroller query fix v2 (see https://bugs.winehq.org/show_bug.cgi?id=38879 )
-
+# -SNI support (see https://bugs.winehq.org/show_bug.cgi?id=38409 )
 
 pkgname=wine-gaming-nine
-pkgver=1.7.55
-pkgrel=2
+pkgver=1.8rc2
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
-_winesrcdir="wine-patched-staging-$pkgver"
+_winesrcdir="wine-patched-staging-$_pkgbasever"
 
-source=("https://github.com/wine-compholio/wine-patched/archive/staging-$pkgver.tar.gz"
+source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
         30-win32-aliases.conf
+        heap_perf.patch
         keybindings.patch
         mipmap.patch
-        heap_perf.patch
+        nine-1.7.53.patch
+        sni_support.patch
         wbemprox_query_v2.patch
-        nine-1.7.53.patch)
-sha1sums=('18317cfdc7a9a751910eb31df4996bd430a23c18'
+        )
+sha1sums=('ba8d5d97cad36728508ea9d7d1bb31af2f37a713'
           '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+          '0f4ac455436d5714a2cf0b537ed25f4fa5c1a7fd'
           'f3febb8836f38320742a546c667106608d4c4395'
           'c3096fccbac23e520d03f592db7f23350cbbc0bc'
-          '0f4ac455436d5714a2cf0b537ed25f4fa5c1a7fd'
+          '83d666e677b9ae3caed648de7c6107dfc080f9ec'
+          'd3684daae415ed2d481fe01443580cf1a2d556ef'
           'e26d369e9964657b481ac4b7b18c575786ec9c8c'
-          '83d666e677b9ae3caed648de7c6107dfc080f9ec')
+          )
 
 pkgdesc="Based off wine-staging, including the gallium-nine patches and some more hacks"
 url="http://www.wine-staging.com"
@@ -39,67 +42,70 @@ 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
+  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
-    libpulse        lib32-libpulse
-    alsa-lib        lib32-alsa-lib
-    libxcomposite   lib32-libxcomposite
-    mesa            lib32-mesa
-    #mesa-libgl      lib32-mesa-libgl
-    libcl           lib32-libcl
-    libxslt         lib32-libxslt
-    gtk3            lib32-gtk3
-    samba
-    opencl-headers
+  '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
-    cups
-    samba           dosbox
+  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
@@ -108,42 +114,45 @@ if [[ $CARCH == i686 ]]; then
     makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
     makedepends=(${makedepends[@]/*-multilib*/})
     optdepends=(${optdepends[@]/*32-*/})
-    provides=("wine=$pkgver" "wine-staging=$pkgver")
+    provides=("wine=$pkgver")
     conflicts=('wine')
 else
     makedepends=(${makedepends[@]} ${_depends[@]})
-    provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver" "wine-staging=$pkgver")
+    provides=("wine=$pkgver" "wine-wow64=$pkgver")
     conflicts=('wine' 'wine-wow64')
 fi
 
 prepare()
 {
-    cd wine-patched-staging-$pkgver
+    cd wine-patched-staging-$_pkgbasever
 
     patch -p1 < ../nine-1.7.53.patch
     patch -p1 < ../mipmap.patch
     patch -p1 < ../heap_perf.patch
     patch -p1 < ../wbemprox_query_v2.patch
+    patch -p1 < ../sni_support.patch
 
     patch -p1 -R < ../keybindings.patch
 
     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
+    # 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"
+
+    cd $srcdir
+
     # 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"
+build()
+{
+    cd "$srcdir"
 
     if [[ $CARCH == x86_64 ]]; then
         msg2 "Building Wine-64..."
@@ -158,7 +167,7 @@ build()
             --enable-win64 \
             --with-xattr \
             --disable-tests
-            # Gstreamer was disabled for FS#33655
+        # Gstreamer was disabled for FS#33655
 
         make
 
@@ -184,7 +193,8 @@ build()
     make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
 }
 
-package() {
+package()
+{
     depends=(${_depends[@]})
 
     msg2 "Packaging Wine-32..."
@@ -194,14 +204,14 @@ package() {
         make prefix="$pkgdir/usr" install
     else
         make prefix="$pkgdir/usr" \
-            libdir="$pkgdir/usr/lib32" \
-            dlldir="$pkgdir/usr/lib32/wine" install
+        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
+        libdir="$pkgdir/usr/lib" \
+        dlldir="$pkgdir/usr/lib/wine" install
     fi
 
     # Font aliasing settings for Win32 applications
@@ -209,5 +219,3 @@ package() {
     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: