diff --git a/files/d3d9-helper.patch b/files/d3d9-helper.patch --- a/files/d3d9-helper.patch +++ b/files/d3d9-helper.patch @@ -1,6 +1,6 @@ -From 4ab841665be1b0b924773b677be85e6ff82cc794 Mon Sep 17 00:00:00 2001 +From ee9b2c5e3eb1cd288b964f3f041e08b8191dad3b Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Mon, 29 May 2017 10:34:33 -0400 +Date: Sat, 29 Jul 2017 12:12:31 -0400 Subject: [PATCH] D3D9 Helper Signed-off-by: Nick Sarnie @@ -18,7 +18,7 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 518a99f590..d0f274e99c 100644 +index dd1f74c0fc..2616cd3a66 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -93,6 +93,7 @@ struct builtin_load_info @@ -622,7 +622,7 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 5e4c39e8bd..921f58e187 100644 +index ba296d25c3..9b1dd45fff 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -203,6 +203,7 @@ enum loadorder @@ -842,5 +842,5 @@ /* @makedep: winecfg.ico */ -- -2.13.0 +2.13.3 diff --git a/files/wine-d3d9.patch b/files/wine-d3d9.patch --- a/files/wine-d3d9.patch +++ b/files/wine-d3d9.patch @@ -1,6 +1,6 @@ -From 61860dfa0c46176de3d109c05578725c96cccf02 Mon Sep 17 00:00:00 2001 +From 609ea84211a2b8ebd81edb930c2068a615c6ede7 Mon Sep 17 00:00:00 2001 From: Nick Sarnie -Date: Mon, 29 May 2017 10:33:53 -0400 +Date: Sat, 29 Jul 2017 12:11:28 -0400 Subject: [PATCH] Wine D3D9 Signed-off-by: Nick Sarnie @@ -41,7 +41,7 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 01c425b221..3f454fea5f 100644 +index 5a920d6a3f..4319bed58f 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), @@ -59,7 +59,7 @@ 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(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), -@@ -388,6 +396,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) +@@ -390,6 +398,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -68,7 +68,7 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1219,6 +1229,183 @@ OpenGL and Direct3D won't be supported.]) +@@ -1249,6 +1259,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 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3020,6 +3207,7 @@ WINE_CONFIG_DLL(d3d8,,[implib]) +@@ -3089,6 +3276,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 @@ + +#endif -- -2.13.0 +2.13.3 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,16 +1,16 @@ name : wine -version : 2.11 -release : 19 +version : 2.14 +release : 20 source : - - https://dl.winehq.org/wine/source/2.x/wine-2.11.tar.xz : efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c + - https://dl.winehq.org/wine/source/2.x/wine-2.14.tar.xz : 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 license : LGPL-2.1 component : virt summary : Wine compatibility layer for Windows emulation. description: | Wine (originally an acronym for "Wine Is Not an Emulator") is a compatibility layer capable of running Windows applications on several POSIX-compliant operating systems, such as Linux, Mac OSX, & BSD. Instead of simulating internal Windows logic like a virtual machine or emulator, Wine translates Windows API calls into POSIX calls on-the-fly, eliminating the performance and memory penalties of other methods and allowing you to cleanly integrate Windows applications into your desktop. builddeps : - - pkgconfig(xproto) - pkgconfig(dri2proto) + - pkgconfig(xproto) - pkgconfig32(alsa) - pkgconfig32(dbus-1) - pkgconfig32(d3d) @@ -27,18 +27,18 @@ - pkgconfig32(libgphoto2) - pkgconfig32(libmpg123) - pkgconfig32(libpng) - - pkgconfig32(libtiff-4) - pkgconfig32(libpulse) - - pkgconfig32(libxml-2.0) + - pkgconfig32(libtiff-4) - pkgconfig32(libv4l1) + - pkgconfig32(libxml-2.0) - pkgconfig32(libxslt) - pkgconfig32(ocl-icd) - pkgconfig32(openal) - pkgconfig32(OpenCL) - pkgconfig32(x11) - - pkgconfig32(xcursor) - - pkgconfig32(xcomposite) - pkgconfig32(xcb-dri3) + - pkgconfig32(xcomposite) + - pkgconfig32(xcursor) - pkgconfig32(xext) - pkgconfig32(xi) - pkgconfig32(xinerama) @@ -49,9 +49,8 @@ - cups-32bit-devel - glibc-32bit-devel - libgcc-32bit - - libpcap-devel - - libpcap-32bit-devel - libjpeg-turbo-32bit-devel + - libpcap-32bit-devel - libpth-32bit-devel - ncurses-32bit-devel - openldap-32bit-devel @@ -63,10 +62,11 @@ - 32bit : - freetype2-32bit - harfbuzz-32bit - - libtxc_dxtn-32bit + - libgnutls-32bit + - libp11-kit-32bit - libpng-32bit - libtiff-32bit - - libgnutls-32bit + - libtxc_dxtn-32bit - ncurses-32bit setup : | # D3D9 support diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -100,6 +100,7 @@ /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-core-processthreads-l1-1-2.dll.so /usr/lib64/wine/api-ms-win-core-profile-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-core-psapi-ansi-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-psapi-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-core-quirks-l1-1-0.dll.so @@ -177,6 +178,7 @@ /usr/lib64/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-mm-misc-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-mm-mme-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-mm-time-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-power-base-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -192,6 +194,7 @@ /usr/lib64/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so /usr/lib64/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so /usr/lib64/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so + /usr/lib64/wine/api-ms-win-security-provider-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-security-sddl-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so /usr/lib64/wine/api-ms-win-service-core-l1-1-0.dll.so @@ -341,6 +344,7 @@ /usr/lib64/wine/dpwsockx.dll.so /usr/lib64/wine/drmclien.dll.so /usr/lib64/wine/dsound.dll.so + /usr/lib64/wine/dsquery.dll.so /usr/lib64/wine/dssenh.dll.so /usr/lib64/wine/dswave.dll.so /usr/lib64/wine/dwmapi.dll.so @@ -363,16 +367,21 @@ /usr/lib64/wine/ext-ms-win-gdi-draw-l1-1-1.dll.so /usr/lib64/wine/ext-ms-win-gdi-render-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so + /usr/lib64/wine/ext-ms-win-kernel32-package-l1-1-1.dll.so /usr/lib64/wine/ext-ms-win-ntuser-message-l1-1-1.dll.so /usr/lib64/wine/ext-ms-win-ntuser-private-l1-1-1.dll.so /usr/lib64/wine/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-ntuser-window-l1-1-1.dll.so + /usr/lib64/wine/ext-ms-win-ntuser-windowclass-l1-1-1.dll.so + /usr/lib64/wine/ext-ms-win-ras-rasapi32-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-rtcore-gdi-object-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll.so /usr/lib64/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so + /usr/lib64/wine/ext-ms-win-security-credui-l1-1-0.dll.so + /usr/lib64/wine/ext-ms-win-security-cryptui-l1-1-0.dll.so /usr/lib64/wine/extrac32.exe.so /usr/lib64/wine/fakedlls/acledit.dll /usr/lib64/wine/fakedlls/aclui.dll @@ -453,6 +462,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll /usr/lib64/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-core-psapi-ansi-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-psapi-obsolete-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll @@ -530,6 +540,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -545,6 +556,7 @@ /usr/lib64/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll /usr/lib64/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll + /usr/lib64/wine/fakedlls/api-ms-win-security-provider-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll /usr/lib64/wine/fakedlls/api-ms-win-service-core-l1-1-0.dll @@ -694,6 +706,7 @@ /usr/lib64/wine/fakedlls/dpwsockx.dll /usr/lib64/wine/fakedlls/drmclien.dll /usr/lib64/wine/fakedlls/dsound.dll + /usr/lib64/wine/fakedlls/dsquery.dll /usr/lib64/wine/fakedlls/dssenh.dll /usr/lib64/wine/fakedlls/dswave.dll /usr/lib64/wine/fakedlls/dwmapi.dll @@ -716,16 +729,21 @@ /usr/lib64/wine/fakedlls/ext-ms-win-gdi-draw-l1-1-1.dll /usr/lib64/wine/fakedlls/ext-ms-win-gdi-render-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-kernel32-package-current-l1-1-0.dll + /usr/lib64/wine/fakedlls/ext-ms-win-kernel32-package-l1-1-1.dll /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-message-l1-1-1.dll /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-private-l1-1-1.dll /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-1.dll + /usr/lib64/wine/fakedlls/ext-ms-win-ntuser-windowclass-l1-1-1.dll + /usr/lib64/wine/fakedlls/ext-ms-win-ras-rasapi32-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-rtcore-gdi-object-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0.dll /usr/lib64/wine/fakedlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll + /usr/lib64/wine/fakedlls/ext-ms-win-security-credui-l1-1-0.dll + /usr/lib64/wine/fakedlls/ext-ms-win-security-cryptui-l1-1-0.dll /usr/lib64/wine/fakedlls/extrac32.exe /usr/lib64/wine/fakedlls/faultrep.dll /usr/lib64/wine/fakedlls/findstr.exe @@ -917,6 +935,7 @@ /usr/lib64/wine/fakedlls/pidgen.dll /usr/lib64/wine/fakedlls/ping.exe /usr/lib64/wine/fakedlls/plugplay.exe + /usr/lib64/wine/fakedlls/powershell.exe /usr/lib64/wine/fakedlls/powrprof.dll /usr/lib64/wine/fakedlls/presentationfontcache.exe /usr/lib64/wine/fakedlls/printui.dll @@ -1006,6 +1025,7 @@ /usr/lib64/wine/fakedlls/twain_32.dll /usr/lib64/wine/fakedlls/ucrtbase.dll /usr/lib64/wine/fakedlls/uiautomationcore.dll + /usr/lib64/wine/fakedlls/uiribbon.dll /usr/lib64/wine/fakedlls/unicows.dll /usr/lib64/wine/fakedlls/uninstaller.exe /usr/lib64/wine/fakedlls/unlodctr.exe @@ -1503,6 +1523,7 @@ /usr/lib64/wine/pidgen.dll.so /usr/lib64/wine/ping.exe.so /usr/lib64/wine/plugplay.exe.so + /usr/lib64/wine/powershell.exe.so /usr/lib64/wine/powrprof.dll.so /usr/lib64/wine/presentationfontcache.exe.so /usr/lib64/wine/printui.dll.so @@ -1592,6 +1613,7 @@ /usr/lib64/wine/twain_32.dll.so /usr/lib64/wine/ucrtbase.dll.so /usr/lib64/wine/uiautomationcore.dll.so + /usr/lib64/wine/uiribbon.dll.so /usr/lib64/wine/unicows.dll.so /usr/lib64/wine/uninstaller.exe.so /usr/lib64/wine/unlodctr.exe.so @@ -1731,7 +1753,7 @@ emul32 - wine + wine /usr/bin/wine @@ -1746,8 +1768,8 @@ programming.devel - wine-32bit - wine-devel + wine-32bit + wine-devel /usr/lib32/lib*.so @@ -1760,7 +1782,7 @@ programming.devel - wine + wine /usr/include/ @@ -1768,12 +1790,12 @@ - - 2017-06-26 - 2.11 + + 2017-08-03 + 2.14 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file