Hello community, here is the log from the commit of package wine for openSUSE:Leap:15.2 checked in at 2020-06-04 16:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/wine (Old) and /work/SRC/openSUSE:Leap:15.2/.wine.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Thu Jun 4 16:02:30 2020 rev:67 rq:810712 version:5.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/wine/wine.changes 2020-01-15 16:29:17.756782939 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.wine.new.3606/wine.changes 2020-06-04 16:03:51.739558171 +0200 @@ -1,0 +2,622 @@ +Tue Jun 2 05:58:37 UTC 2020 - Marcus Meissner <meiss...@suse.com> + +- add ocl-icd-devel for opencl enablement. +- add vkd3d fore direct3d12 + +------------------------------------------------------------------- +Wed Jan 22 06:53:38 UTC 2020 - Marcus Meissner <meiss...@suse.com> + +- Updated to 5.0 release + - Builtin modules in PE format. + - Multi-monitor support. + - XAudio2 reimplementation. + - Vulkan 1.1 support. +- update staging to 5.0 release + +------------------------------------------------------------------- +Sun Jan 19 10:22:06 UTC 2020 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc6 release candidate + - Bug fixes only, we are in code freeze. +- updated staging to 5.0-rc5 + +------------------------------------------------------------------- +Sun Jan 12 08:13:29 UTC 2020 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc5 release candidate + - Bug fixes only, we are in code freeze. +- updated staging to 5.0-rc5 +- adjust mono / gecko recommends / conflicts + +------------------------------------------------------------------- +Sat Jan 4 16:41:26 UTC 2020 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc4 release candidate + - Bug fixes only, we are in code freeze. +- updated staging to 5.0-rc4 + +------------------------------------------------------------------- +Sat Dec 28 07:56:30 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc3 release candidate + - Bug fixes only, we are in code freeze. +- updated staging to 5.0-rc3 + +------------------------------------------------------------------- +Sat Dec 21 15:20:52 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc2 release candidate + - Bug fixes only, we are in code freeze. +- updated staging to 5.0-rc2 + +------------------------------------------------------------------- +Mon Dec 16 06:54:49 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 5.0-rc1 release candidate + - Gecko update, with support for running from a global location. + - Unicode data updated to Unicode version 12.1. + - Initial version of the MSADO (ActiveX Data Objects) library. + - Update installation support in the WUSA (Windows Update Standalone) tool. + - More progress on the kernel32/kernelbase restructuring. + - Support for signing with ECDSA keys. + - Various bug fixes. +- updated staging to 5.0-rc1 + +------------------------------------------------------------------- +Sat Nov 30 06:54:48 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.21 development release + - HTTP proxy configuration through DHCP. + - Parameter block support in D3DX9. + - A few more dlls converted to PE. + - Various bug fixes. +- updated staging to 4.21 + +------------------------------------------------------------------- +Sat Nov 16 13:53:33 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.20 development release + - New version of the Mono engine with an FNA update. + - Code persistence in VBScript and JScript. + - Vulkan spec updates. + - Improved support for LLVM MinGW. + - Various bug fixes. +- updated staging to 4.20 + +------------------------------------------------------------------- +Fri Nov 1 20:40:38 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.19 development release + - A number of additional VBScript features. + - More stateblock support in WineD3D. + - Some fixes for ARM64 support. + - Various bug fixes. +- updated staging to 4.19 + +------------------------------------------------------------------- +Sat Oct 19 06:37:25 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.18 development release + - Many new VBScript functions. + - A number of cleanups and improvements in Quartz. + - Fixes for several test failures. + - Various bug fixes. +- updated staging to 4.18 + +------------------------------------------------------------------- +Sat Sep 28 08:46:05 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.17 development release + - New version of the Mono engine with upstream fixes. + - Support for DXTn compressed textures. + - Initial version of the Windows Script runtime library. + - Support for XRandR device change notifications. + - Support for generating RSA keys. + - Stubless proxies support on ARM64. + - Various bug fixes. +- updated staging to 4.17 + +------------------------------------------------------------------- +Thu Sep 26 07:24:09 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- filter out LTO warnings about our data-only .a files. + +------------------------------------------------------------------- +Sat Sep 14 07:04:58 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.16 development release + - More reliable mouse grabbing in games. + - Better cross-compilation support in WineGCC. + - Improved compatibility with Windows debuggers. + - Various bug fixes. +- updated staging to 4.16 + +------------------------------------------------------------------- +Sat Aug 31 08:07:08 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.15 development release + - Initial implementation of the HTTP service. + - Stack unwinding support on ARM64. + - Better multi-monitor support on macOS. + - RichEdit control optimizations. + - Various bug fixes. +- updated staging to 4.15 + +------------------------------------------------------------------- +Sat Aug 17 09:23:43 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.14 development release + - New version of the Mono engine with upstream updates. + - PE dlls no longer rely on the MinGW runtime. + - Exception handling fixes on ARM64. + - Various bug fixes. +- updated staging to 4.14 + +------------------------------------------------------------------- +Thu Aug 15 10:52:54 UTC 2019 - Andreas Schwab <sch...@suse.de> + +- Drop build dependency on gcc8 + +------------------------------------------------------------------- +Sun Aug 11 09:24:26 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.13 development release + - Support for Passport HTTP redirects. + - A bunch of header updates. + - Various bug fixes. +- updated staging to 4.13 + +------------------------------------------------------------------- +Sun Jul 7 13:18:54 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.12.1 development release + - Fixes for broken 64-bit prefix initialization. + +------------------------------------------------------------------- +Sat Jul 6 08:58:29 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.12 development release + - Still more DLLs are built as PE files by default. + - Support for Plug & Play device drivers. + - Better support for the Visual Studio remote debugger. + - More support for enumerating display devices. + - Various bug fixes. +- updated staging to 4.12 + +------------------------------------------------------------------- +Sun Jun 23 11:55:34 UTC 2019 - Marcus Meissner <meiss...@suse.com> + +- updated to 4.11 development release + - Updated version of the Mono engine, including Windows.Forms. + - More DLLs are built as PE files by default. + - Faster implementation of Slim Reader/Writer locks on Linux. + - Initial support for enumerating display devices. + - Various bug fixes. +- updated staging to 4.11 +- removed wine49-include-Avoid-compound-literals-for-WCHAR-strings.patch: upstream + ++++ 425 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/wine/wine.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.wine.new.3606/wine.changes Old: ---- wine-3.7.tar.xz wine-3.7.tar.xz.sign wine-d3d9-patches-3.6.tar.xz wine-staging-3.7.tar.xz winetricks winetricks.1 New: ---- wine-5.0.tar.xz wine-5.0.tar.xz.sign wine-d3d9-patches-4.1.tar.xz wine-rpmlintrc wine-staging-5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.OCa8qN/_old 2020-06-04 16:03:52.383560326 +0200 +++ /var/tmp/diff_new_pack.OCa8qN/_new 2020-06-04 16:03:52.387560340 +0200 @@ -1,7 +1,7 @@ # # spec file for package wine # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,9 +28,14 @@ %define nine 1 %endif +# needs to be on top due to usage of %version macro below +%define realver 5.0 +Version: 5.0 +Release: 0 + %if "%{flavor}" != "" Name: wine%{?flavor:-}%{?flavor} -Provides: wine = %{version} +Provides: wine = %{version}-%{release} %else Name: wine %endif @@ -39,7 +44,15 @@ BuildRequires: autoconf BuildRequires: bison BuildRequires: capi4linux-devel +%ifarch aarch64 +BuildRequires: clang >= 5 +%endif BuildRequires: cups-devel +%if 0%{?suse_version} >= 1520 +BuildRequires: vkd3d-devel +%endif +BuildRequires: ocl-icd-devel +BuildRequires: FAudio-devel BuildRequires: dbus-1-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -50,6 +63,7 @@ BuildRequires: giflib-devel BuildRequires: glib2-devel BuildRequires: gstreamer-plugins-base-devel +BuildRequires: krb5-devel BuildRequires: libgnutls-devel BuildRequires: libgphoto2-devel BuildRequires: libgsm-devel @@ -101,46 +115,42 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.7 -Version: 3.7 -Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later Group: System/Emulators/PC Url: http://www.winehq.org/ -Source0: https://dl.winehq.org/wine/source/3.x/%{projectname}-%{realver}.tar.xz +Source0: https://dl.winehq.org/wine/source/5.0/%{projectname}-%{realver}.tar.xz Source41: wine.keyring -Source42: https://dl.winehq.org/wine/source/3.x/%{projectname}-%{realver}.tar.xz.sign -Source1: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -Source11: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.1 +Source42: https://dl.winehq.org/wine/source/5.0/%{projectname}-%{realver}.tar.xz.sign Source2: http://kegel.com/wine/wisotool Source3: README.SUSE Source4: wine.desktop Source6: wine-msi.desktop Source5: ubuntuwine.tar.bz2 Source7: baselibs.conf +Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here #Patch0: susepatches.patch -Recommends: wine-gecko >= 2.47 +Recommends: wine-gecko >= 2.47.1 +Conflicts: wine-gecko < 2.47.1 +Recommends: wine-mono >= 4.9.2 +Conflicts: wine-mono < 4.9.2 # not packaged in distro... Recommends: wine-mono Recommends: dosbox Recommends: alsa-plugins Recommends: alsa-plugins-pulse +Recommends: winetricks Requires: samba-winbind -Conflicts: wine-gecko < 1.3 %ifarch x86_64 Requires: %{name}-32bit = %{version} %endif -# some recommends for winetricks: -Recommends: cabextract -Recommends: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.7 +%define staging_version 5.0 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -148,10 +158,11 @@ %endif %if %{nine} # upstream patch target version -%define nine_version 3.6 +%define nine_version 4.1 BuildRequires: Mesa-libd3d-devel -BuildRequires: dri2proto-devel +Requires: Mesa-libd3d BuildRequires: libOSMesa-devel +BuildRequires: pkgconfig(dri2proto) Source110: wine-d3d9-patches-%{nine_version}.tar.xz %endif @@ -163,6 +174,15 @@ penalties of other methods and allowing you to cleanly integrate Windows applications into your desktop. +%if %{staging} +This WINE flavor contains the "staging" development patchset +on top of the regular Wine release. +%endif + +%if %{nine} +This WINE flavor contains Direct3D9 enhancements patches for Gallium Nine support. +%endif + You can run your Windows executables with it and write your Windows programs under Linux and link against the WINE libraries. It is not necessary to have a Windows installation to run WINE. @@ -174,7 +194,6 @@ You can invoke wine by entering 'wine program.exe'. Configure it by running 'winecfg'. - %package devel Summary: Files for Wine development Group: Development/Libraries/C and C++ @@ -189,7 +208,7 @@ %prep %setup -q -n wine-%{realver} -#%%patch0 -p1 +#patch0 -p1 # cp %{S:3} . # @@ -210,6 +229,8 @@ %endif %build +# currently not building with LTO +%define _lto_cflags %{nil} cat VERSION export WIDL_TIME_OVERRIDE="0" # for reproducible builds. %ifarch %ix86 @@ -217,6 +238,12 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'` %endif +%ifarch aarch64 +# ARM64 now requires clang +# https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95 +export CC="/usr/bin/clang" +%endif + %if %{staging} || %{nine} autoreconf -i -f %endif @@ -226,7 +253,10 @@ CFLAGS="$RPM_OPT_FLAGS" \ %configure \ --with-x \ -%ifarch x86_64 +%ifarch %{arm} + --with-float-abi=hard \ +%endif +%ifarch x86_64 aarch64 --enable-win64 \ %endif %if %{nine} @@ -244,6 +274,7 @@ echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7 grep SONAME_ config.log grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7 +echo " recommends \"libpulse0-32bit\"" >> %SOURCE7 echo " recommends \"alsa-plugins-pulse-32bit\"" >> %SOURCE7 echo " recommends \"alsa-plugins-32bit\"" >> %SOURCE7 echo " recommends \"Mesa-libGL1-32bit\"" >> %SOURCE7 @@ -255,6 +286,9 @@ %if 0%{?suse_version} >= 1310 echo " requires \"p11-kit-32bit\"" >> %SOURCE7 %endif +%if %{nine} +echo " requires \"Mesa-libd3d-32bit\"" >> %SOURCE7 +%endif %if "%{flavor}" != "" echo " provides \"wine-<targettype> = <version>\"" >> %SOURCE7 %endif @@ -277,14 +311,12 @@ install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/ install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/ -install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/ install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/ mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr -%ifnarch x86_64 +%ifnarch x86_64 aarch64 mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl %endif -install -pm0644 -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/ tar -xjf %{SOURCE5} # Copied from Ubuntu Wine out of debian.diff @@ -341,11 +373,10 @@ %files %defattr(-,root,root) -%doc ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* +%license LICENSE LICENSE.OLD +%doc ANNOUNCE AUTHORS README* %{_bindir}/function_grep.pl -%if %{staging} %{_bindir}/msidb -%endif %{_bindir}/msiexec %{_bindir}/notepad %{_bindir}/regedit @@ -358,16 +389,15 @@ %{_bindir}/winemine %{_bindir}/winepath %{_bindir}/wineserver -%{_bindir}/winetricks %{_bindir}/wisotool %{_datadir}/wine %{_datadir}/applications/wine.desktop -%ifnarch x86_64 +%ifnarch x86_64 aarch64 %doc %{_mandir}/man1/wine.1* %endif %doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/wineserver.1* -%ifnarch x86_64 +%ifnarch x86_64 aarch64 %doc %dir %doc %{_mandir}/pl %doc %dir %doc %{_mandir}/pl/man1 %doc %{_mandir}/*/man1/wine.1* @@ -384,7 +414,6 @@ %doc %{_mandir}/man1/winecpp.1.* %doc %{_mandir}/man1/winefile.1.* %doc %{_mandir}/man1/winemine.1.* -%doc %{_mandir}/man1/winetricks.1.* %doc %{_mandir}/man1/winepath.1.* %dir %{_sysconfdir}/xdg/menus/ %dir %{_sysconfdir}/xdg/menus/applications-merged @@ -396,14 +425,14 @@ %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps %{_datadir}/icons/hicolor/scalable/apps/*.svg -%ifarch %ix86 aarch64 +%ifarch %ix86 %{_bindir}/wine %{_bindir}/wine-preloader %endif %ifarch ppc %arm %{_bindir}/wine %endif -%ifarch x86_64 +%ifarch x86_64 aarch64 %{_bindir}/wine64 %{_bindir}/wine64-preloader %endif @@ -437,6 +466,6 @@ %doc %{_mandir}/man1/wmc.1* %doc %{_mandir}/man1/wrc.1* -# %{_datadir}/aclocal/wine.m4 +# {_datadir}/aclocal/wine.m4 %changelog ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.OCa8qN/_old 2020-06-04 16:03:52.427560474 +0200 +++ /var/tmp/diff_new_pack.OCa8qN/_new 2020-06-04 16:03:52.431560487 +0200 @@ -1,5 +1,5 @@ <multibuild> - <package>nine</package> + <!-- <package>nine</package> --> <package>staging</package> - <package>staging-nine</package> + <!-- <package>staging-nine</package> --> </multibuild> ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OCa8qN/_old 2020-06-04 16:03:52.447560540 +0200 +++ /var/tmp/diff_new_pack.OCa8qN/_new 2020-06-04 16:03:52.447560540 +0200 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v3.7</param> + <param name="revision">refs/tags/v5.0</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> @@ -11,7 +11,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">wined3d9(.*)</param> <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param> - <param name="revision">refs/tags/wine-d3d9-3.6</param> + <param name="revision">refs/tags/wine-d3d9-4.1</param> <param name="scm">git</param> </service> <service name="recompress" mode="disabled"> ++++++ wine-3.7.tar.xz -> wine-5.0.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/wine/wine-3.7.tar.xz /work/SRC/openSUSE:Leap:15.2/.wine.new.3606/wine-5.0.tar.xz differ: char 26, line 1 ++++++ wine-d3d9-patches-3.6.tar.xz -> wine-d3d9-patches-4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.6/d3d9-helper.patch new/wine-d3d9-patches-4.1/d3d9-helper.patch --- old/wine-d3d9-patches-3.6/d3d9-helper.patch 2018-04-14 17:56:48.000000000 +0200 +++ new/wine-d3d9-patches-4.1/d3d9-helper.patch 2019-02-18 16:05:39.000000000 +0100 @@ -1,9 +1,9 @@ -From 00aa62a47250f4a0655784eb1a22e7ee7816a3bc Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <commendsar...@gmail.com> -Date: Sat, 14 Apr 2018 11:53:44 -0400 +From bb6e2b7f609fda55b58dfe05a74f16d69ab65bc8 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie <sar...@gentoo.org> +Date: Mon, 18 Feb 2019 10:00:15 -0500 Subject: [PATCH] D3D9 Helper -Signed-off-by: Nick Sarnie <commendsar...@gmail.com> +Signed-off-by: Nick Sarnie <sar...@gentoo.org> --- dlls/ntdll/loader.c | 205 ++++++++++++++++++++---- dlls/ntdll/loadorder.c | 298 ++++++++++++++++++++++++++--------- @@ -18,10 +18,10 @@ create mode 100644 programs/winecfg/staging.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 1a3dd801a1..9276b5b17d 100644 +index a47dfe0aa1..fe3edb569c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -100,6 +100,7 @@ struct builtin_load_info +@@ -110,6 +110,7 @@ struct builtin_load_info { const WCHAR *load_path; const WCHAR *filename; @@ -29,7 +29,7 @@ NTSTATUS status; WINE_MODREF *wm; }; -@@ -125,7 +126,8 @@ static WINE_MODREF *cached_modref; +@@ -134,7 +135,8 @@ static WINE_MODREF *cached_modref; static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; @@ -39,7 +39,7 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, DWORD ordinal, LPCWSTR load_path ); -@@ -478,7 +480,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS +@@ -510,7 +512,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); @@ -48,7 +48,7 @@ !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) -@@ -649,7 +651,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -681,7 +683,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP { ascii_to_unicode( buffer, name, len ); buffer[len] = 0; @@ -57,7 +57,7 @@ } else /* need to allocate a larger buffer */ { -@@ -657,7 +659,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP +@@ -689,7 +691,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; @@ -66,7 +66,7 @@ RtlFreeHeap( GetProcessHeap(), 0, ptr ); } -@@ -943,7 +945,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * +@@ -975,7 +977,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * prev = current_modref; current_modref = wm; @@ -75,7 +75,7 @@ current_modref = prev; if (status) { -@@ -1031,7 +1033,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) +@@ -1063,7 +1065,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) * Allocate a WINE_MODREF structure and add it to the process list * The loader_section must be locked while calling this function. */ @@ -84,7 +84,7 @@ { WINE_MODREF *wm; const WCHAR *p; -@@ -1045,7 +1047,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) +@@ -1077,7 +1079,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; @@ -93,7 +93,7 @@ if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++; else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); -@@ -1657,7 +1659,7 @@ static void load_builtin_callback( void *module, const char *filename ) +@@ -1744,7 +1746,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } @@ -102,7 +102,7 @@ RtlFreeHeap( GetProcessHeap(), 0, fullname ); if (!wm) { -@@ -1867,8 +1869,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) +@@ -2007,8 +2009,8 @@ static BOOL is_valid_binary( HMODULE module, const pe_image_info_t *info ) /****************************************************************************** * load_native_dll (internal) */ @@ -113,7 +113,7 @@ { void *module; HANDLE mapping; -@@ -1911,7 +1913,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2051,7 +2053,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /* create the MODREF */ @@ -122,7 +122,7 @@ { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_NO_MEMORY; -@@ -1979,8 +1981,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, +@@ -2119,8 +2121,8 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, /*********************************************************************** * load_builtin_dll */ @@ -133,7 +133,7 @@ { char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; -@@ -2000,6 +2002,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, +@@ -2140,6 +2142,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, */ info.load_path = load_path; info.filename = NULL; @@ -141,7 +141,7 @@ info.status = STATUS_SUCCESS; info.wm = NULL; -@@ -2198,6 +2201,108 @@ done: +@@ -2338,6 +2341,108 @@ done: return status; } @@ -250,7 +250,7 @@ /*********************************************************************** * open_dll_file -@@ -2244,7 +2349,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct +@@ -2384,7 +2489,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, WCHAR *filename, ULONG *size, WINE_MODREF **pwm, @@ -259,7 +259,7 @@ { UNICODE_STRING nt_name; WCHAR *file_part, *ext, *dllname; -@@ -2289,20 +2394,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, +@@ -2429,20 +2534,41 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { @@ -305,7 +305,7 @@ } /* not found */ -@@ -2350,8 +2476,10 @@ overflow: +@@ -2490,8 +2616,10 @@ overflow: * Load a PE style module according to the load order. * The loader_section must be locked while calling this function. */ @@ -317,7 +317,7 @@ enum loadorder loadorder; WCHAR buffer[64]; WCHAR *filename; -@@ -2368,7 +2496,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2508,7 +2636,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ size = sizeof(buffer); for (;;) { @@ -326,7 +326,7 @@ if (nts == STATUS_SUCCESS) break; if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (nts != STATUS_BUFFER_TOO_SMALL) return nts; -@@ -2388,6 +2516,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2528,6 +2656,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ } main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -352,7 +352,7 @@ loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); if (handle && is_fake_dll( handle )) -@@ -2410,22 +2557,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2550,22 +2697,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ if (!handle) nts = STATUS_DLL_NOT_FOUND; else { @@ -380,7 +380,7 @@ if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { -@@ -2435,7 +2582,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ +@@ -2575,7 +2722,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) @@ -389,7 +389,7 @@ break; } -@@ -2468,7 +2615,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, +@@ -2608,7 +2755,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, RtlEnterCriticalSection( &loader_section ); if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -398,7 +398,7 @@ if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { -@@ -2507,7 +2654,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S +@@ -2647,7 +2794,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S size = sizeof(buffer); for (;;) { @@ -407,7 +407,7 @@ if (handle) NtClose( handle ); if (filename != buffer) RtlFreeHeap( GetProcessHeap(), 0, filename ); if (status != STATUS_BUFFER_TOO_SMALL) break; -@@ -3429,7 +3576,7 @@ void __wine_process_init(void) +@@ -3582,7 +3729,7 @@ void __wine_process_init(void) /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -805,10 +805,10 @@ + return ret; +} diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 85bdd9ed05..0eb5ae6241 100644 +index 1630978f0a..b24b39a8b3 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -214,6 +214,7 @@ enum loadorder +@@ -217,6 +217,7 @@ enum loadorder }; extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; @@ -817,7 +817,7 @@ struct debug_info { diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in -index d516778834..dd847307cd 100644 +index 4e66e04e31..1cf70310d5 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ @@ -859,7 +859,7 @@ * Fill out the (General) PROPSHEETPAGE data structure * for the property sheet diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 0c0b038ff9..f0e370ecd6 100644 +index 2760e92c00..0584422ab5 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -45,6 +45,7 @@ @@ -878,7 +878,7 @@ #define IDC_WINVER 1012 #define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_HEIGHT 1024 -@@ -218,3 +220,6 @@ +@@ -219,3 +221,6 @@ #define IDC_ABT_TITLE_TEXT 8436 #define IDC_ABT_WEB_LINK 8437 #define IDC_ABT_LICENSE_TEXT 8438 @@ -997,7 +997,7 @@ /* Drive management */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index 5908b491d4..a2da7e6b3a 100644 +index 33f54d43b2..d12522e758 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -39,6 +39,7 @@ BEGIN @@ -1008,7 +1008,7 @@ IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" IDS_WINECFG_TITLE_APP "Wine configuration for %s" -@@ -308,6 +309,15 @@ BEGIN +@@ -312,6 +313,15 @@ BEGIN PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED END @@ -1025,5 +1025,5 @@ /* @makedep: winecfg.ico */ -- -2.17.0 +2.20.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.6/staging-helper.patch new/wine-d3d9-patches-4.1/staging-helper.patch --- old/wine-d3d9-patches-3.6/staging-helper.patch 2018-04-14 17:56:48.000000000 +0200 +++ new/wine-d3d9-patches-4.1/staging-helper.patch 2019-02-18 16:05:39.000000000 +0100 @@ -1,15 +1,15 @@ -From e85e98ed34ed9009e7f380955da0e4a5d82e17ac Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <commendsar...@gmail.com> -Date: Sat, 14 Apr 2018 11:56:11 -0400 +From 5d144635348cb686f89593311bd6218aa99b5dc3 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie <sar...@gentoo.org> +Date: Mon, 18 Feb 2019 10:04:44 -0500 Subject: [PATCH] Staging Helper -Signed-off-by: Nick Sarnie <commendsar...@gmail.com> +Signed-off-by: Nick Sarnie <sar...@gentoo.org> --- dlls/ntdll/loadorder.c | 2 ++ programs/winecfg/resource.h | 1 + - programs/winecfg/staging.c | 29 +++++++++++++++++++++++++++++ + programs/winecfg/staging.c | 25 +++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + - 4 files changed, 33 insertions(+) + 4 files changed, 29 insertions(+) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index d05d7b321e..7945d2a599 100644 @@ -27,10 +27,10 @@ /* and last the hard-coded default */ ret = NULL; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index b94e773b60..028dbb730b 100644 +index 96f2429090..06f41f5c70 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -218,6 +218,7 @@ +@@ -219,6 +219,7 @@ #define IDC_ENABLE_EAX 9003 #define IDC_ENABLE_HIDEWINE 9004 #define IDC_ENABLE_GTK3 9005 @@ -39,7 +39,7 @@ /* About tab */ #define IDC_ABT_OWNER 8432 diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c -index df9bf0f1ad..e010be1c73 100644 +index df9bf0f1ad..cccfa02957 100644 --- a/programs/winecfg/staging.c +++ b/programs/winecfg/staging.c @@ -121,6 +121,23 @@ static void gtk3_set(BOOL status) @@ -84,33 +84,22 @@ } INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -162,6 +183,8 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar - { - case IDC_ENABLE_CSMT: - csmt_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_CSMT) == BST_CHECKED); -+ nine_set(FALSE); -+ CheckDlgButton(hDlg, IDC_ENABLE_NATIVE_D3D9, BST_UNCHECKED); - SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); - return TRUE; - case IDC_ENABLE_VAAPI: -@@ -180,6 +203,12 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -180,6 +201,10 @@ INT_PTR CALLBACK StagingDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar gtk3_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_GTK3) == BST_CHECKED); SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; + case IDC_ENABLE_NATIVE_D3D9: + nine_set(IsDlgButtonChecked(hDlg, IDC_ENABLE_NATIVE_D3D9) == BST_CHECKED); -+ csmt_set(FALSE); -+ CheckDlgButton(hDlg, IDC_ENABLE_CSMT, BST_UNCHECKED); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); + return TRUE; } break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc -index f838a04a4e..7003bded4a 100644 +index 33f2642ed6..ad9c9d894f 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc -@@ -320,6 +320,7 @@ BEGIN +@@ -324,6 +324,7 @@ BEGIN CONTROL "Enable Environmental Audio E&xtensions (EAX)",IDC_ENABLE_EAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,70,230,8 CONTROL "&Hide Wine version from applications",IDC_ENABLE_HIDEWINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,85,230,8 CONTROL "Enable >K3 Theming",IDC_ENABLE_GTK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,230,8 @@ -119,5 +108,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -- -2.17.0 +2.20.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wine-d3d9-patches-3.6/wine-d3d9.patch new/wine-d3d9-patches-4.1/wine-d3d9.patch --- old/wine-d3d9-patches-3.6/wine-d3d9.patch 2018-04-14 17:56:48.000000000 +0200 +++ new/wine-d3d9-patches-4.1/wine-d3d9.patch 2019-02-18 16:05:39.000000000 +0100 @@ -1,9 +1,9 @@ -From 695c0020836ef99c924c5d33de81bf52c1fb617a Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <commendsar...@gmail.com> -Date: Sat, 14 Apr 2018 11:53:04 -0400 -Subject: [PATCH 2/2] Wine D3D9 +From 3b06e430d1a1da2b50de4d8757dc4d5ef429dbd2 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie <sar...@gentoo.org> +Date: Mon, 18 Feb 2019 10:01:15 -0500 +Subject: [PATCH] Wine D3D9 -Signed-off-by: Nick Sarnie <commendsar...@gmail.com> +Signed-off-by: Nick Sarnie <sar...@gentoo.org> --- configure.ac | 188 ++++ dlls/d3d9-nine/Makefile.in | 15 + @@ -41,10 +41,10 @@ create mode 100644 dlls/d3d9-nine/wndproc.h diff --git a/configure.ac b/configure.ac -index 8e76cd6086..10c1a8c03e 100644 +index 1b425d22a2..ded3ac4d91 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,14 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), +@@ -68,6 +68,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]), [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])) @@ -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]), -@@ -415,6 +423,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) +@@ -402,6 +410,8 @@ AC_CHECK_LIB(ossaudio,_oss_ioctl) AC_SUBST(OPENGL_LIBS,"") @@ -68,9 +68,9 @@ dnl **** Check for header files **** AC_SYS_LARGEFILE() -@@ -1261,6 +1271,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.]) +@@ -1240,6 +1250,183 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c + WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg + OpenGL and Direct3D won't be supported.]) + 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") @@ -252,7 +252,7 @@ CPPFLAGS="$ac_save_CPPFLAGS" else X_CFLAGS="" -@@ -3199,6 +3386,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) +@@ -3161,6 +3348,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) @@ -5781,5 +5781,5 @@ + +#endif -- -2.17.0 +2.20.1 ++++++ wine-rpmlintrc ++++++ # Some of our .a files are data only, rpmlint check does not cover that addFilter("lto-no-text-in-archive") ++++++ wine-staging-3.7.tar.xz -> wine-staging-5.0.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/wine/wine-staging-3.7.tar.xz /work/SRC/openSUSE:Leap:15.2/.wine.new.3606/wine-staging-5.0.tar.xz differ: char 26, line 1