Updated to version 2.17-2

1 files changed, 69 insertions, 61 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4560bb55daf1..5d412c08ea6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,6 +2,7 @@
 # Based on wine-staging PKGBUILD
 
 #Additional patches:
+# -Overwatch patches
 # -Gallium Nine support
 # -Keybind patch reversion
 # -Heap allocation perfomance improvement patch
@@ -10,25 +11,27 @@
 
 pkgname=wine-gaming-nine
 pkgver=2.17
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 #_d3d9ver=$_pkgbasever
 _d3d9ver=2.16
-_winesrcdir="wine-patched-staging-$_pkgbasever"
+_winesrcdir="wine-overwatch-overwatch-$_pkgbasever"
 
-source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
+source=("https://github.com/gamax92/wine-overwatch/archive/overwatch-$_pkgbasever.tar.gz"
         "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_d3d9ver.tar.gz"
 	"https://github.com/laino/wine-patches/archive/master.tar.gz"
         30-win32-aliases.conf
+        freetype_2.8.1_fix.patch
 	keybindings.patch
         steam.patch
         wbemprox_query_v2.patch
         )
-sha1sums=('84b75de160d8eeb09670b201f19dc652392e07ab'
+sha1sums=('1e2a147a74195f0ebbf35028b33a7dce3e26abf8'
           '21ad1a8cf8f9151d1e81ffab36d7398927fd73e9'
 	  'SKIP'
           '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+	  'aabb80b412adc99fcc42b02fa2d6692321f1c3ac'
 	  'f3febb8836f38320742a546c667106608d4c4395'
           '74aae040fde9ff3c9e8da9c840557e87afdbc3a0'
           '644e141125a9f2407e64d23c85ec84a691c7caae'
@@ -37,80 +40,83 @@ sha1sums=('84b75de160d8eeb09670b201f19dc652392e07ab'
 pkgdesc="Based off wine-staging, including the gallium-nine patches and some more hacks"
 url="http://www.wine-staging.com"
 arch=(i686 x86_64)
-options=(staticlibs !upx)
+options=(staticlibs)
 license=(LGPL)
 
 _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
+  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
   lib32-libtxc_dxtn
   desktop-file-utils
 )
 
 makedepends=(autoconf ncurses bison perl fontforge flex
-  'gcc>=5.3.0-4'  'gcc-multilib>=5.3.0-4'
-  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
-  libgl           lib32-libgl
-  ocl-icd         lib32-ocl-icd
-  libxslt         lib32-libxslt
-  libpulse        lib32-libpulse
-  libva           lib32-libva
-  gtk3            lib32-gtk3
+  '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
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libpulse              lib32-libpulse
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
   samba
   opencl-headers
   dri2proto
   dri3proto
   xf86driproto
   pkg-config
+  'freetype2<2.8.1-1'
 )
 
 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
+  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
+  opencl-icd-loader     lib32-opencl-icd-loader
+  libxslt               lib32-libxslt
+  libva                 lib32-libva
+  gtk3                  lib32-gtk3
+  gst-plugins-base-libs lib32-gst-plugins-base-libs
+  vulkan-icd-loader     lib32-vulkan-icd-loader
   cups
-  samba
-  dosbox
+  samba           dosbox
 )
 
 if [[ $CARCH == i686 ]]; then
@@ -129,7 +135,7 @@ fi
 
 prepare()
 {
-    cd wine-patched-staging-$_pkgbasever
+    cd "$_winesrcdir"
 
     patch -p1 < "$srcdir/wine-d3d9-patches-wine-d3d9-$_d3d9ver/staging-helper.patch" #for wine-staging
     patch -p1 < "$srcdir/wine-d3d9-patches-wine-d3d9-$_d3d9ver/wine-d3d9.patch"
@@ -150,6 +156,8 @@ prepare()
 
     patch -p1 -R < ../keybindings.patch
 
+    patch -p1 < ../freetype_2.8.1_fix.patch
+
     autoreconf -f
 
     sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*