From 56dfecc1eb43d5ec1fb388f40578e6e642dbed00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Sat, 26 Aug 2017 22:20:55 +0300 Subject: [PATCH] Updated to 2.15 --- .abf.yml | 7 +++++-- staging-helper.patch | 6 +++--- wine-d3d9.patch | 12 ++++++------ wine.spec | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.abf.yml b/.abf.yml index ef98b3a..5aeb78c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,7 @@ -sources: +removed_sources: wine-2.13.tar.xz: 17410ab55225d03e3b97a34228779174163b65f2 - wine-2.13.tar.xz.sign: 8b6885192dfbd0b4123bc9c4a0b799e4113d0ac9 wine-staging-2.13.tar.gz: cc92c03124f1a55f7e64dc7abdced2fc12a7d05b +sources: + wine-2.15.tar.xz: 2a3a158d3ccb6b06d9d4c6a981195189fd582872 + wine-2.15.tar.xz.sign: 1b9afcbfe11b7d5adb0d16a53d4f02cd40ec912c + wine-staging-2.15.tar.gz: ee1af2b3acab0b13492c33de639b482ccdc2b16d diff --git a/staging-helper.patch b/staging-helper.patch index a3c3601..b19cfdc 100644 --- a/staging-helper.patch +++ b/staging-helper.patch @@ -1,6 +1,6 @@ -From 74273235ff2ea18292025fbc8d480dd07c0a2ff4 Mon Sep 17 00:00:00 2001 +From 4a813624e800ad8fef89e0b55a100bfea8d2529d Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 29 Jul 2017 12:11:13 -0400 +Date: Wed, 23 Aug 2017 20:12:37 -0400 Subject: [PATCH] Staging Helper Signed-off-by: Nick Sarnie @@ -119,5 +119,5 @@ index c375217d71..31cc9bae0d 100644 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.13.3 +2.14.1 diff --git a/wine-d3d9.patch b/wine-d3d9.patch index c41db2d..ffb1b0c 100644 --- a/wine-d3d9.patch +++ b/wine-d3d9.patch @@ -1,6 +1,6 @@ -From 609ea84211a2b8ebd81edb930c2068a615c6ede7 Mon Sep 17 00:00:00 2001 +From b3ae6362eae622e747cf8ad1ee076898e3536597 Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Sat, 29 Jul 2017 12:11:28 -0400 +Date: Wed, 23 Aug 2017 20:13:00 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie @@ -41,7 +41,7 @@ Signed-off-by: Nick Sarnie create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 5a920d6a3f..4319bed58f 100644 +index fd05212057..6b96bdd209 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -68,7 +68,7 @@ index 5a920d6a3f..4319bed58f 100644 dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1249,6 +1259,183 @@ OpenGL and Direct3D won't be supported.]) +@@ -1247,6 +1257,183 @@ OpenGL and Direct3D won't be supported.]) WINE_NOTICE_WITH(va,[test "x$ac_cv_lib_soname_va" = "x" -o "x$ac_cv_lib_soname_va_x11" = "x" -o "x$ac_cv_lib_soname_va_drm" = "x"], [libva ${notice_platform}development files not found, GPU video acceleration won't be supported.]) @@ -252,7 +252,7 @@ index 5a920d6a3f..4319bed58f 100644 CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3089,6 +3276,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) +@@ -3096,6 +3283,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) WINE_CONFIG_TEST(dlls/d3d9/tests) @@ -5736,5 +5736,5 @@ index 0000000000..15f26d491a + +#endif -- -2.13.3 +2.14.1 diff --git a/wine.spec b/wine.spec index 9d43c1f..d600a09 100644 --- a/wine.spec +++ b/wine.spec @@ -19,7 +19,7 @@ Summary: WINE Is Not An Emulator - runs MS Windows programs Name: wine -Version: 2.13 +Version: 2.15 Release: 1 Epoch: 2 License: LGPLv2+