* Version 1.9.20.

6 files changed, 55 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05d8cd2d088d..aa830c8b8ea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Oct 21 11:06:34 UTC 2016
+# Tue Oct 25 16:22:43 UTC 2016
 pkgbase = wine-ivb
 	pkgdesc = A compatibility layer for running Windows programs: indexed vertex blending - https://bugs.winehq.org/show_bug.cgi?id=39057
-	pkgver = 1.9.11
-	pkgrel = 4
+	pkgver = 1.9.20
+	pkgrel = 1
 	url = http://www.winehq.com
-	install = wine.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -121,25 +120,25 @@ pkgbase = wine-ivb
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = bin32-wine=1.9.11
-	provides = wine=1.9.11
-	provides = wine-wow64=1.9.11
+	provides = bin32-wine=1.9.20
+	provides = wine=1.9.20
+	provides = wine-wow64=1.9.20
 	conflicts = bin32-wine
 	conflicts = wine
 	conflicts = wine-wow64
 	replaces = bin32-wine
 	replaces = wine
 	options = staticlibs
-	source = wine-ivb-1.9.11.tar.bz2::https://dl.winehq.org/wine/source/1.9/wine-1.9.11.tar.bz2
-	source = wine-ivb-1.9.11.tar.bz2.sign::https://dl.winehq.org/wine/source/1.9/wine-1.9.11.tar.bz2.sign
+	source = wine-ivb-1.9.20.tar.bz2::https://dl.winehq.org/wine/source/1.9/wine-1.9.20.tar.bz2
+	source = wine-ivb-1.9.20.tar.bz2.sign::https://dl.winehq.org/wine/source/1.9/wine-1.9.20.tar.bz2.sign
 	source = 30-win32-aliases.conf
-	source = patch-1.9.11-ivb.patch
+	source = patch-1.9.20-ivb.patch
 	source = patch_temp_constants.patch
-	sha512sums = 3c2037558b0e3dc833b68e18bee91642f22d19b201c604cd95c09a33ebe72ee1252139e2eb138efea666cf24bb727232b12d4c456459068ab228bfe951c793b2
+	sha512sums = 31841298104592eb615e0a3d70b06b69b5226f8c2b8865e639407399d8a19e20527779d76fe08fb913f6114c4908401f7efa9cfa56fc3360b832c30cc523e764
 	sha512sums = SKIP
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
-	sha512sums = dfc3491d015ca5fbd074290869fad296f168383aba57a2b26392b05570e37d84a939cae141107fed02a06589472da9505366cb97a894c9582c9492bec4b35a93
-	sha512sums = 83583553d8db60e671679adcddedb87a2f8a740d36e5cdffef4a0cf2b995e48be216e53a7d1ee3bbeafd5bf9d0938b4c32b42265620c8e7c5bba967da893be11
+	sha512sums = 42af4c34688119e38df40802d1450a7623749ea268ea25400ad6acddba11c55c4a3efc3a658bfcf071595e3ac7d45b9885b7efbd0eaebd22cb7ac1f7cc601529
+	sha512sums = 54e7927ea07137f2383734f65147ae18366a65a17c1970af06b13d5597f501ade3b2b435311bfae1759070895473f09382d75676e8b774c52ce540bc06cf5461
 
 pkgname = wine-ivb
 	depends = fontconfig
diff --git a/.gitignore b/.gitignore
index b6e1e8ac4628..a86686cee248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-wine-ivb-1.9.1-1-*.pkg.tar.xz
-wine-*.tar.*
\ No newline at end of file
+wine-ivb-*-*.pkg.tar.xz
+wine-*.tar.*
+*.log
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index f1829648451d..a49b74effb77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _basename=wine
 pkgname=wine-ivb
-pkgver=1.9.11
-pkgrel=4
+pkgver=1.9.20
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -17,11 +17,11 @@ source=(${pkgname}-${pkgver}.tar.bz2::https://dl.winehq.org/wine/source/1.9/$_ba
         30-win32-aliases.conf
         patch-$pkgver-ivb.patch
         patch_temp_constants.patch)
-sha512sums=('3c2037558b0e3dc833b68e18bee91642f22d19b201c604cd95c09a33ebe72ee1252139e2eb138efea666cf24bb727232b12d4c456459068ab228bfe951c793b2'
+sha512sums=('31841298104592eb615e0a3d70b06b69b5226f8c2b8865e639407399d8a19e20527779d76fe08fb913f6114c4908401f7efa9cfa56fc3360b832c30cc523e764'
             'SKIP'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            'dfc3491d015ca5fbd074290869fad296f168383aba57a2b26392b05570e37d84a939cae141107fed02a06589472da9505366cb97a894c9582c9492bec4b35a93'
-            '83583553d8db60e671679adcddedb87a2f8a740d36e5cdffef4a0cf2b995e48be216e53a7d1ee3bbeafd5bf9d0938b4c32b42265620c8e7c5bba967da893be11')
+            '42af4c34688119e38df40802d1450a7623749ea268ea25400ad6acddba11c55c4a3efc3a658bfcf071595e3ac7d45b9885b7efbd0eaebd22cb7ac1f7cc601529'
+            '54e7927ea07137f2383734f65147ae18366a65a17c1970af06b13d5597f501ade3b2b435311bfae1759070895473f09382d75676e8b774c52ce540bc06cf5461')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
@@ -30,7 +30,6 @@ url="http://www.winehq.com"
 arch=(i686 x86_64)
 options=(staticlibs)
 license=(LGPL)
-install=wine.install
 
 _depends=(
   fontconfig      lib32-fontconfig
diff --git a/patch-1.9.11-ivb.patch b/patch-1.9.20-ivb.patch
index ca171526acca..78dc16754d6f 100644
--- a/patch-1.9.11-ivb.patch
+++ b/patch-1.9.20-ivb.patch
@@ -1,25 +1,3 @@
-From 216435ed4aeb6fbc7b055913e4a9959bb4de6617 Mon Sep 17 00:00:00 2001
-From: Paul Gofman <gofmanp@gmail.com>
-Date: Thu, 19 Nov 2015 13:20:35 +0300
-Subject: [PATCH] wined3d: Indexed Vertex Blending support d3d9/tests: Indexed
- Vertex Blending test
-
-Fixes https://bugs.winehq.org/show_bug.cgi?id=39057
-
-Signed-off-by: Paul Gofman <gofmanp@gmail.com>
----
- dlls/d3d9/tests/visual.c         | 256 ++++++++++++++++++++++++
- dlls/wined3d/context.c           |   2 +
- dlls/wined3d/cs.c                |   3 +-
- dlls/wined3d/device.c            |   6 +-
- dlls/wined3d/directx.c           |   1 +
- dlls/wined3d/glsl_shader.c       | 419 +++++++++++++++++++++++++++++++++++++--
- dlls/wined3d/state.c             |   3 +-
- dlls/wined3d/utils.c             |   4 +
- dlls/wined3d/vertexdeclaration.c |  10 +
- dlls/wined3d/wined3d_private.h   |   8 +-
- 10 files changed, 691 insertions(+), 21 deletions(-)
-
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
 index a308311..3afa992 100644
 --- a/dlls/d3d9/tests/visual.c
@@ -450,14 +428,14 @@ index 898cabf..25992b5 100644
  
      string_buffer_clear(buffer);
  
-     shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL));
+     shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL));
 +    use_ubo = settings->vertexblends > 0 && settings->vb_indices && priv->ivb_use_ubo;
 +    TRACE("settings->vb_indices: %d, use_ubo: %d\n",settings->vb_indices, use_ubo);
 +    if (use_ubo)
 +        shader_addline(buffer,"#extension GL_ARB_uniform_buffer_object : enable\n");
  
-     for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i)
-     {
+     if (shader_glsl_use_explicit_attrib_location(gl_info))
+         shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n");
 @@ -6325,7 +6363,16 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr
      }
      shader_addline(buffer, "\n");
diff --git a/patch_temp_constants.patch b/patch_temp_constants.patch
index 62fde61a54b3..904d2cf73711 100644
--- a/patch_temp_constants.patch
+++ b/patch_temp_constants.patch
@@ -1,5 +1,17 @@
+From ccf2b6aa11966ec2a95fdbdb310ddd63cbe704da Mon Sep 17 00:00:00 2001
+From: swswine <swswine@gmail.com>
+Date: Thu, 19 Nov 2015 13:41:29 +0300
+Subject: [PATCH] Maximum shader constants increase (temp fix)
+
+Signed-off-by: Paul Gofman <gofmanp@gmail.com>
+---
+ dlls/d3d9/d3d9_private.h       | 2 +-
+ dlls/wined3d/shader.c          | 6 +++---
+ dlls/wined3d/wined3d_private.h | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
 diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
-index 6e84faf..e90b43a 100644
+index b618ff4..e8d64d7 100644
 --- a/dlls/d3d9/d3d9_private.h
 +++ b/dlls/d3d9/d3d9_private.h
 @@ -315,7 +315,7 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader,
@@ -12,10 +24,10 @@ index 6e84faf..e90b43a 100644
  
  struct d3d9_pixelshader
 diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
-index 7e85988..cdc25a2 100644
+index ef2f70b..47e5618 100644
 --- a/dlls/wined3d/shader.c
 +++ b/dlls/wined3d/shader.c
-@@ -427,14 +427,14 @@ static void shader_set_limits(struct wined3d_shader *shader)
+@@ -527,14 +527,14 @@ static void shader_set_limits(struct wined3d_shader *shader)
      vs_limits[] =
      {
          /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */
@@ -31,84 +43,21 @@ index 7e85988..cdc25a2 100644
 -        {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, 256, 16, 12,  0}},
 +        {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, /*256*/1024, 16, 12,  0}},
          {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16,  0,   0,  0, 16,  0}},
+         {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16,  0,   0,  0, 32,  0}},
          {0}
-     },
-@@ -743,8 +743,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
-                         break;
-                     }
-                     if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL && shader_version.major == 3
--                            && semantic->usage == WINED3D_DECL_USAGE_POSITION && !semantic->usage_idx)
-+                            && semantic->usage == WINED3D_DECL_USAGE_POSITION && !semantic->usage_idx) {
-+			WARN("shader_version.type == WINED3D_SHADER_TYPE_PIXEL && shader_version.major == 3 ...\n");
-                         return WINED3DERR_INVALIDCALL;
-+		    }
-                     reg_maps->input_registers |= 1u << reg_idx;
-                     shader_signature_from_semantic(&input_signature_elements[reg_idx], semantic);
-                     break;
-@@ -886,8 +888,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
-             for (i = 0; i < ins.dst_count; ++i)
-             {
-                 if (!shader_record_register_usage(shader, reg_maps, &ins.dst[i].reg,
--                        shader_version.type, constf_size))
-+                        shader_version.type, constf_size)) {
-+                    WARN("!shader_record_register_usage\n");
-                     return WINED3DERR_INVALIDCALL;
-+		}
- 
-                 if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX)
-                 {
-@@ -1061,8 +1065,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
- 
-             if (ins.predicate)
-                 if (!shader_record_register_usage(shader, reg_maps, &ins.predicate->reg,
--                        shader_version.type, constf_size))
-+                        shader_version.type, constf_size)) {
-+		    WARN("!shader_record_register_usage (2)");
-                     return WINED3DERR_INVALIDCALL;
-+		}
- 
-             for (i = 0; i < ins.src_count; ++i)
-             {
-@@ -1070,14 +1076,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
-                 struct wined3d_shader_register reg = ins.src[i].reg;
- 
-                 if (!shader_record_register_usage(shader, reg_maps, &ins.src[i].reg,
--                        shader_version.type, constf_size))
-+                        shader_version.type, constf_size)) {
-+                    WARN("!shader_record_register_usage (3)\n");
-                     return WINED3DERR_INVALIDCALL;
-+		}
-                 while (count)
-                 {
-                     ++reg.idx[0].offset;
-                     if (!shader_record_register_usage(shader, reg_maps, &reg,
--                            shader_version.type, constf_size))
-+                            shader_version.type, constf_size)) {
-+			WARN("!shader_record_register_usage (4)");  
-                         return WINED3DERR_INVALIDCALL;
-+		    }
-                     --count;
-                 }
- 
-@@ -1090,7 +1100,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
-                         shader->u.ps.color0_reg = ins.src[i].reg.idx[0].offset;
-                     }
-                 }
--            }
-+            } //for (i = 0; i < ins.src_count; ++i)
-         }
-     }
-     reg_maps->loop_depth = max_loop_depth;
-@@ -2071,8 +2081,10 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b
- 
-     /* Second pass: figure out which registers are used, what the semantics are, etc. */
-     if (FAILED(hr = shader_get_registers_used(shader, fe, reg_maps, &shader->input_signature,
--            &shader->output_signature, byte_code, float_const_count)))
--        return hr;
-+            &shader->output_signature, byte_code, float_const_count))) {
-+	    	WARN("Error shader_get_registers_used\n");
-+        	return hr;
-+	}
- 
-     if (reg_maps->shader_version.type != type)
-     {
+diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
+index 0b376b6..b384469 100644
+--- a/dlls/wined3d/wined3d_private.h
++++ b/dlls/wined3d/wined3d_private.h
+@@ -530,7 +530,7 @@ enum wined3d_shader_conditional_op
+ #define WINED3D_MAX_CBS 15
+ #define WINED3D_MAX_CONSTS_B 16
+ #define WINED3D_MAX_CONSTS_I 16
+-#define WINED3D_MAX_VS_CONSTS_F 256
++#define WINED3D_MAX_VS_CONSTS_F 1024
+ #define WINED3D_MAX_PS_CONSTS_F 224
+ 
+ /* FIXME: This needs to go up to 2048 for
+-- 
+2.5.5
+
diff --git a/wine.install b/wine.install
deleted file mode 100644
index 78682174975b..000000000000
--- a/wine.install
+++ /dev/null
@@ -1,13 +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."
-        #echo "This version include the patches in https://bugs.winehq.org/show_bug.cgi?id=39057."
-}
-
-post_remove() {
-	update-desktop-database -q
-}