Update to 2.10

This commit is contained in:
Алзим 2017-06-27 05:31:37 +03:00
parent d9b5a0d23c
commit ea4ba551a7
5 changed files with 1083 additions and 912 deletions

View file

@ -1,4 +1,4 @@
sources: sources:
wine-2.5.tar.xz: c18319018ae57f5f2c9b0f065984baad25f72289 wine-2.10.tar.xz: 886bc24c315b2accbc2ad41d921e92177768f3a5
wine-2.5.tar.xz.sign: 0d6ebe9d6e68085f20d0b68be2fdeb74b9656200 wine-2.10.tar.xz.sign: f56d09a7d2f97f84b06d94ad8fe86f4dfd647d5b
wine-staging-2.5.tar.gz: bb35c07cdb0bd2b2f6500fc8c48e2aa4d1f6d42c wine-staging-2.10.tar.gz: e81b50e85b1bd8a55264c7e0bbcba81c3e22d70e

View file

@ -1,6 +1,6 @@
From f2812bbb1bc22606c986dffaf40f206371c0ac14 Mon Sep 17 00:00:00 2001 From 1634d3ac068eafd3c40546178e164169656a8070 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsarnex@gmail.com> From: Nick Sarnie <commendsarnex@gmail.com>
Date: Mon, 10 Apr 2017 14:27:18 -0400 Date: Wed, 14 Jun 2017 14:47:34 -0400
Subject: [PATCH] Staging Helper Subject: [PATCH] Staging Helper
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
@ -119,5 +119,5 @@ index c375217d71..31cc9bae0d 100644
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-- --
2.12.2 2.13.1

View file

@ -1,6 +1,6 @@
From 5072300d16b403f4a972e2d872ed741a7527f497 Mon Sep 17 00:00:00 2001 From 9c48eded41bab77289c6a0679219df90ef8e6961 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <commendsarnex@gmail.com> From: Nick Sarnie <commendsarnex@gmail.com>
Date: Mon, 10 Apr 2017 14:32:56 -0400 Date: Wed, 14 Jun 2017 14:47:51 -0400
Subject: [PATCH] Wine D3D9 Subject: [PATCH] Wine D3D9
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
@ -41,10 +41,10 @@ Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
create mode 100644 dlls/d3d9-nine/wndproc.h create mode 100644 dlls/d3d9-nine/wndproc.h
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 7e3f643dd2..cb88e402af 100644 index ae9bb6bf0d..2725fc0562 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -65,6 +65,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -66,6 +66,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]),
AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
[if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
@ -59,7 +59,7 @@ index 7e3f643dd2..cb88e402af 100644
AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library]))
AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support]))
AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]),
@@ -374,6 +382,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) @@ -390,6 +398,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl)
AC_SUBST(OPENGL_LIBS,"") AC_SUBST(OPENGL_LIBS,"")
@ -68,9 +68,9 @@ index 7e3f643dd2..cb88e402af 100644
dnl **** Check for header files **** dnl **** Check for header files ****
AC_SYS_LARGEFILE() AC_SYS_LARGEFILE()
@@ -1157,6 +1167,183 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c @@ -1253,6 +1263,183 @@ OpenGL and Direct3D won't be supported.])
WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg 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"],
OpenGL and Direct3D won't be supported.]) [libva ${notice_platform}development files not found, GPU video acceleration won't be supported.])
+ dnl Check for d3d9-nine support + dnl Check for d3d9-nine support
+ if test "x$with_d3d9_nine" = "xauto" && (test "x$with_d3d9_nine_module" = "xauto" || test "x$with_d3d9_nine_headers_path" = "xauto") + if test "x$with_d3d9_nine" = "xauto" && (test "x$with_d3d9_nine_module" = "xauto" || test "x$with_d3d9_nine_headers_path" = "xauto")
@ -252,7 +252,7 @@ index 7e3f643dd2..cb88e402af 100644
CPPFLAGS="$ac_save_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS"
else else
X_CFLAGS="" X_CFLAGS=""
@@ -2906,6 +3093,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) @@ -3064,6 +3251,7 @@ WINE_CONFIG_DLL(d3d8,,[implib])
WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_TEST(dlls/d3d8/tests)
WINE_CONFIG_DLL(d3d9,,[implib]) WINE_CONFIG_DLL(d3d9,,[implib])
WINE_CONFIG_TEST(dlls/d3d9/tests) WINE_CONFIG_TEST(dlls/d3d9/tests)
@ -5736,5 +5736,5 @@ index 0000000000..15f26d491a
+ +
+#endif +#endif
-- --
2.12.2 2.13.1

View file

@ -19,8 +19,8 @@
Summary: WINE Is Not An Emulator - runs MS Windows programs Summary: WINE Is Not An Emulator - runs MS Windows programs
Name: wine Name: wine
Version: 2.5 Version: 2.10
Release: 2 Release: 1
Epoch: 2 Epoch: 2
License: LGPLv2+ License: LGPLv2+
Group: Emulators Group: Emulators

1899
winetricks

File diff suppressed because it is too large Load diff