Updated to version 1.9.2-1

3 files changed, 10 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b1f64537d0dd..c792cce9f37f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan 18 14:33:16 UTC 2016
+# Sat Jan 30 12:57:33 UTC 2016
 pkgbase = wine-gaming-nine
 	pkgdesc = Based off wine-staging, including the gallium-nine patches and some more hacks
-	pkgver = 1.9.1
+	pkgver = 1.9.2
 	pkgrel = 1
 	url = http://www.wine-staging.com
 	install = wine.install
@@ -130,25 +130,23 @@ pkgbase = wine-gaming-nine
 	optdepends = cups
 	optdepends = samba
 	optdepends = dosbox
-	provides = wine=1.9.1
-	provides = wine-wow64=1.9.1
-	provides = wine-staging=1.9.1
+	provides = wine=1.9.2
+	provides = wine-wow64=1.9.2
+	provides = wine-staging=1.9.2
 	conflicts = wine
 	conflicts = wine-wow64
 	conflicts = wine-staging
 	options = staticlibs
-	source = https://github.com/wine-compholio/wine-patched/archive/staging-1.9.1.tar.gz
+	source = https://github.com/wine-compholio/wine-patched/archive/staging-1.9.2.tar.gz
 	source = 30-win32-aliases.conf
-	source = hd7700m_support.patch
 	source = heap_perf.patch
 	source = keybindings.patch
 	source = mipmap.patch
 	source = nine-1.9.1.patch
 	source = steam.patch
 	source = wbemprox_query_v2.patch
-	sha1sums = d18ac6f55a1c6333cfe6961980685fad4404c695
+	sha1sums = 0caaea9075d73c2432aa7e91d77aaf79fcc3268a
 	sha1sums = 023a5c901c6a091c56e76b6a62d141d87cce9fdb
-	sha1sums = 8fa4b03f68f18b4de80f10c7a43c0e99a5cb017c
 	sha1sums = 0f4ac455436d5714a2cf0b537ed25f4fa5c1a7fd
 	sha1sums = f3febb8836f38320742a546c667106608d4c4395
 	sha1sums = c3096fccbac23e520d03f592db7f23350cbbc0bc
diff --git a/PKGBUILD b/PKGBUILD
index b5b6086ed42d..a75e452e1399 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,15 @@
 # Based on wine-staging PKGBUILD
 
 #Additional patches:
+# -Gallium Nine support
 # -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 )
 # -Steam patch, Crossover Hack version (see https://bugs.winehq.org/show_bug.cgi?id=39403 )
-# -HD7700M support (not referenced in Wine)
 
 pkgname=wine-gaming-nine
-pkgver=1.9.1
+pkgver=1.9.2
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
@@ -18,7 +18,6 @@ _winesrcdir="wine-patched-staging-$_pkgbasever"
 
 source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz"
         30-win32-aliases.conf
-        hd7700m_support.patch
         heap_perf.patch
         keybindings.patch
         mipmap.patch
@@ -26,9 +25,8 @@ source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbas
         steam.patch
         wbemprox_query_v2.patch
         )
-sha1sums=('d18ac6f55a1c6333cfe6961980685fad4404c695'
+sha1sums=('0caaea9075d73c2432aa7e91d77aaf79fcc3268a'
           '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
-          '8fa4b03f68f18b4de80f10c7a43c0e99a5cb017c'
           '0f4ac455436d5714a2cf0b537ed25f4fa5c1a7fd'
           'f3febb8836f38320742a546c667106608d4c4395'
           'c3096fccbac23e520d03f592db7f23350cbbc0bc'
@@ -137,7 +135,6 @@ prepare()
     patch -p1 < ../mipmap.patch
     patch -p1 < ../heap_perf.patch
     patch -p1 < ../wbemprox_query_v2.patch
-    patch -p1 < ../hd7700m_support.patch
 
     patch -p1 -R < ../keybindings.patch
 
diff --git a/hd7700m_support.patch b/hd7700m_support.patch
deleted file mode 100644
index db269ad2ca3c..000000000000
--- a/hd7700m_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
-index cbff989..f992f50 100644
---- a/dlls/wined3d/directx.c
-+++ b/dlls/wined3d/directx.c
-@@ -1881,6 +1881,7 @@ cards_amd_binary[] =
-     /* Southern Islands */
-     {"HD 7900",                     CARD_AMD_RADEON_HD7900},
-     {"HD 7800",                     CARD_AMD_RADEON_HD7800},
-+    {"HD 7700M",                    CARD_AMD_RADEON_HD7700M},
-     {"HD 7700",                     CARD_AMD_RADEON_HD7700},
-     /* Northern Islands */
-     {"HD 6970",                     CARD_AMD_RADEON_HD6900},
-diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 65f7a74..4800c59 100644
---- a/dlls/wined3d/wined3d_private.h
-+++ b/dlls/wined3d/wined3d_private.h
-@@ -1615,6 +1615,7 @@ enum wined3d_pci_device
-     CARD_AMD_RADEON_HD6900          = 0x6719,
-     CARD_AMD_RADEON_HD7660D         = 0x9901,
-     CARD_AMD_RADEON_HD7700          = 0x683d,
-+    CARD_AMD_RADEON_HD7700M         = 0x682d,
-     CARD_AMD_RADEON_HD7800          = 0x6819,
-     CARD_AMD_RADEON_HD7900          = 0x679a,
-     CARD_AMD_RADEON_HD8600M         = 0x6660,