diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | gcc_7_fix.patch | 71 |
3 files changed, 18 insertions, 93 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jul 21 18:43:41 UTC 2017 +# Fri Jul 28 09:14:04 UTC 2017 pkgbase = wine-gaming-nine pkgdesc = Based off wine-staging, including the gallium-nine patches and some more hacks - pkgver = 2.12 - pkgrel = 4 + pkgver = 2.13 + pkgrel = 1 url = http://www.wine-staging.com arch = i686 arch = x86_64 @@ -131,29 +131,27 @@ pkgbase = wine-gaming-nine optdepends = cups optdepends = samba optdepends = dosbox - provides = wine=2.12 - provides = wine-wow64=2.12 - provides = wine-staging=2.12 + provides = wine=2.13 + provides = wine-wow64=2.13 + provides = wine-staging=2.13 conflicts = wine conflicts = wine-wow64 conflicts = wine-staging options = staticlibs options = !upx - source = https://github.com/wine-compholio/wine-patched/archive/staging-2.12.tar.gz + source = https://github.com/wine-compholio/wine-patched/archive/staging-2.13.tar.gz source = https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.12.tar.gz source = https://github.com/wine-compholio/wine-staging/raw/master/patches/ntdll-Heap_FreeLists/0001-ntdll-Improve-heap-allocation-performance-by-using-m.patch source = https://github.com/laino/wine-patches/archive/master.tar.gz source = 30-win32-aliases.conf - source = gcc_7_fix.patch source = keybindings.patch source = steam.patch source = wbemprox_query_v2.patch - sha1sums = 9f155f56c6d28d90733d2039a52aff4f6a744605 + sha1sums = 8af7b938a5e66101de316fc0c214fa79d9ff025c sha1sums = 83fa25468637a14878bb71e04ae411b581a08b38 sha1sums = 0c45c2e050a7642acd5c7dec6fd5b03f8b5cd658 sha1sums = SKIP sha1sums = 023a5c901c6a091c56e76b6a62d141d87cce9fdb - sha1sums = 0663651dd32b1537055bf560e6ec098623785238 sha1sums = f3febb8836f38320742a546c667106608d4c4395 sha1sums = 74aae040fde9ff3c9e8da9c840557e87afdbc3a0 sha1sums = 644e141125a9f2407e64d23c85ec84a691c7caae @@ -9,12 +9,12 @@ # -Steam patch, Crossover Hack version (see https://bugs.winehq.org/show_bug.cgi?id=39403 ) pkgname=wine-gaming-nine -pkgver=2.12 -pkgrel=4 +pkgver=2.13 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} -_d3d9ver=$_pkgbasever -#_d3d9ver=2.12 +#_d3d9ver=$_pkgbasever +_d3d9ver=2.12 _winesrcdir="wine-patched-staging-$_pkgbasever" source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz" @@ -22,17 +22,15 @@ source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbas "https://github.com/wine-compholio/wine-staging/raw/master/patches/ntdll-Heap_FreeLists/0001-ntdll-Improve-heap-allocation-performance-by-using-m.patch" "https://github.com/laino/wine-patches/archive/master.tar.gz" 30-win32-aliases.conf - gcc_7_fix.patch keybindings.patch steam.patch wbemprox_query_v2.patch ) -sha1sums=('9f155f56c6d28d90733d2039a52aff4f6a744605' +sha1sums=('8af7b938a5e66101de316fc0c214fa79d9ff025c' '83fa25468637a14878bb71e04ae411b581a08b38' '0c45c2e050a7642acd5c7dec6fd5b03f8b5cd658' 'SKIP' '023a5c901c6a091c56e76b6a62d141d87cce9fdb' - '0663651dd32b1537055bf560e6ec098623785238' 'f3febb8836f38320742a546c667106608d4c4395' '74aae040fde9ff3c9e8da9c840557e87afdbc3a0' '644e141125a9f2407e64d23c85ec84a691c7caae' @@ -139,15 +137,15 @@ prepare() patch -p1 < "$srcdir/wine-d3d9-patches-wine-d3d9-$_d3d9ver/wine-d3d9.patch" patch -p1 < ../steam.patch - patch -p1 -R < ../0001-ntdll-Improve-heap-allocation-performance-by-using-m.patch +# patch -p1 -R < ../0001-ntdll-Improve-heap-allocation-performance-by-using-m.patch - patch -p1 < ../wine-patches-master/0001-ntdll-improve-heap-allocation-performance.patch - patch -p1 < ../wine-patches-master/0002-ntdll-heap.c-align-everything-to-64-byte-to-reduce-f.patch +# patch -p1 < ../wine-patches-master/0001-ntdll-improve-heap-allocation-performance.patch +# patch -p1 < ../wine-patches-master/0002-ntdll-heap.c-align-everything-to-64-byte-to-reduce-f.patch patch -p1 < ../wine-patches-master/0003-wine-list.h-linked-list-cache-line-prefetching.patch - patch -p1 < ../wine-patches-master/0004-ntdll-heap.c-freelist_balance-prefetch-next-entry-ca.patch +# patch -p1 < ../wine-patches-master/0004-ntdll-heap.c-freelist_balance-prefetch-next-entry-ca.patch # This patch has been upstreamed # patch -p1 < ../wine-patches-master/0005-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch - patch -p1 < ../wine-patches-master/0006-Ensure-16-byte-alignment-of-data.patch +# patch -p1 < ../wine-patches-master/0006-Ensure-16-byte-alignment-of-data.patch # patch -p1 < ../wine-patches-master/0007-wined3d-use-SwitchToThread-waits-in-wined3d_pause.patch patch -p1 < ../wbemprox_query_v2.patch diff --git a/gcc_7_fix.patch b/gcc_7_fix.patch deleted file mode 100644 index fb338edf1efc..000000000000 --- a/gcc_7_fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 55a09f3c3c3b90e74bcd26cd537396fd2e4ad58e Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <sebastian@fds-team.de> -Date: Sun, 4 Jun 2017 16:26:03 +0200 -Subject: ntdll: Do not cast unaligned pointer to M128A in set_context_reg. - ---- - dlls/ntdll/signal_x86_64.c | 48 +++++++++++++++++++++++----------------------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c -index 61bb2ddce6f..86034c00a50 100644 ---- a/dlls/ntdll/signal_x86_64.c -+++ b/dlls/ntdll/signal_x86_64.c -@@ -1154,30 +1154,30 @@ static void set_context_reg( CONTEXT *context, ULONG_PTR dw_reg, void *val ) - case 14: context->R14 = *(ULONG64 *)val; break; - case 15: context->R15 = *(ULONG64 *)val; break; - case 16: context->Rip = *(ULONG64 *)val; break; -- case 17: context->u.s.Xmm0 = *(M128A *)val; break; -- case 18: context->u.s.Xmm1 = *(M128A *)val; break; -- case 19: context->u.s.Xmm2 = *(M128A *)val; break; -- case 20: context->u.s.Xmm3 = *(M128A *)val; break; -- case 21: context->u.s.Xmm4 = *(M128A *)val; break; -- case 22: context->u.s.Xmm5 = *(M128A *)val; break; -- case 23: context->u.s.Xmm6 = *(M128A *)val; break; -- case 24: context->u.s.Xmm7 = *(M128A *)val; break; -- case 25: context->u.s.Xmm8 = *(M128A *)val; break; -- case 26: context->u.s.Xmm9 = *(M128A *)val; break; -- case 27: context->u.s.Xmm10 = *(M128A *)val; break; -- case 28: context->u.s.Xmm11 = *(M128A *)val; break; -- case 29: context->u.s.Xmm12 = *(M128A *)val; break; -- case 30: context->u.s.Xmm13 = *(M128A *)val; break; -- case 31: context->u.s.Xmm14 = *(M128A *)val; break; -- case 32: context->u.s.Xmm15 = *(M128A *)val; break; -- case 33: context->u.s.Legacy[0] = *(M128A *)val; break; -- case 34: context->u.s.Legacy[1] = *(M128A *)val; break; -- case 35: context->u.s.Legacy[2] = *(M128A *)val; break; -- case 36: context->u.s.Legacy[3] = *(M128A *)val; break; -- case 37: context->u.s.Legacy[4] = *(M128A *)val; break; -- case 38: context->u.s.Legacy[5] = *(M128A *)val; break; -- case 39: context->u.s.Legacy[6] = *(M128A *)val; break; -- case 40: context->u.s.Legacy[7] = *(M128A *)val; break; -+ case 17: memcpy( &context->u.s.Xmm0, val, sizeof(M128A) ); break; -+ case 18: memcpy( &context->u.s.Xmm1, val, sizeof(M128A) ); break; -+ case 19: memcpy( &context->u.s.Xmm2, val, sizeof(M128A) ); break; -+ case 20: memcpy( &context->u.s.Xmm3, val, sizeof(M128A) ); break; -+ case 21: memcpy( &context->u.s.Xmm4, val, sizeof(M128A) ); break; -+ case 22: memcpy( &context->u.s.Xmm5, val, sizeof(M128A) ); break; -+ case 23: memcpy( &context->u.s.Xmm6, val, sizeof(M128A) ); break; -+ case 24: memcpy( &context->u.s.Xmm7, val, sizeof(M128A) ); break; -+ case 25: memcpy( &context->u.s.Xmm8, val, sizeof(M128A) ); break; -+ case 26: memcpy( &context->u.s.Xmm9, val, sizeof(M128A) ); break; -+ case 27: memcpy( &context->u.s.Xmm10, val, sizeof(M128A) ); break; -+ case 28: memcpy( &context->u.s.Xmm11, val, sizeof(M128A) ); break; -+ case 29: memcpy( &context->u.s.Xmm12, val, sizeof(M128A) ); break; -+ case 30: memcpy( &context->u.s.Xmm13, val, sizeof(M128A) ); break; -+ case 31: memcpy( &context->u.s.Xmm14, val, sizeof(M128A) ); break; -+ case 32: memcpy( &context->u.s.Xmm15, val, sizeof(M128A) ); break; -+ case 33: memcpy( &context->u.s.Legacy[0], val, sizeof(M128A) ); break; -+ case 34: memcpy( &context->u.s.Legacy[1], val, sizeof(M128A) ); break; -+ case 35: memcpy( &context->u.s.Legacy[2], val, sizeof(M128A) ); break; -+ case 36: memcpy( &context->u.s.Legacy[3], val, sizeof(M128A) ); break; -+ case 37: memcpy( &context->u.s.Legacy[4], val, sizeof(M128A) ); break; -+ case 38: memcpy( &context->u.s.Legacy[5], val, sizeof(M128A) ); break; -+ case 39: memcpy( &context->u.s.Legacy[6], val, sizeof(M128A) ); break; -+ case 40: memcpy( &context->u.s.Legacy[7], val, sizeof(M128A) ); break; - } - } - --- -2.13.0 - |