From 7e36522f2ded199487d96a5e25ca539f505a7eca62eb4432c9c6f34cd6e49383 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 21 Jul 2018 08:16:13 +0000 Subject: [PATCH 1/3] - Update to 3.13 development release - Vulkan support on macOS using MoltenVK. - Initial support for performance data in the registry. - Mono engine updated with some bug fixes. - Support for fetching BIOS information on Linux. - GnuTLS also used on macOS when available. - Improvements in the standard Task Dialog. - Various bug fixes. - updated staging to 3.13 - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=527 --- _service | 4 ++-- wine-3.12.tar.xz | 3 --- wine-3.12.tar.xz.sign | 16 ---------------- wine-3.13.tar.xz | 3 +++ wine-3.13.tar.xz.sign | 16 ++++++++++++++++ wine-d3d9-patches-3.11.tar.xz | 3 --- wine-d3d9-patches-3.12.tar.xz | 3 +++ wine-staging-3.12.tar.xz | 3 --- wine-staging-3.13.tar.xz | 3 +++ wine.changes | 14 ++++++++++++++ wine.spec | 8 ++++---- winetricks | 36 ++++++++++++++++++++++++++++++++--- 12 files changed, 78 insertions(+), 34 deletions(-) delete mode 100644 wine-3.12.tar.xz delete mode 100644 wine-3.12.tar.xz.sign create mode 100644 wine-3.13.tar.xz create mode 100644 wine-3.13.tar.xz.sign delete mode 100644 wine-d3d9-patches-3.11.tar.xz create mode 100644 wine-d3d9-patches-3.12.tar.xz delete mode 100644 wine-staging-3.12.tar.xz create mode 100644 wine-staging-3.13.tar.xz diff --git a/_service b/_service index 6ad322d..05b2944 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v3.12 + refs/tags/v3.13 v*.* git @@ -11,7 +11,7 @@ @PARENT_TAG@ wined3d9(.*) https://github.com/sarnex/wine-d3d9-patches.git - refs/tags/wine-d3d9-3.11 + refs/tags/wine-d3d9-3.12 git diff --git a/wine-3.12.tar.xz b/wine-3.12.tar.xz deleted file mode 100644 index 324093d..0000000 --- a/wine-3.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db84c059d6897809f4bb34024c021d129c73f6d2a5ae4e7ea79ba30040ab787f -size 20516708 diff --git a/wine-3.12.tar.xz.sign b/wine-3.12.tar.xz.sign deleted file mode 100644 index 6bd7ba4..0000000 --- a/wine-3.12.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAltDzL8ACgkQzvrI6q8X -UZ3OhQ//Q4tZlSb+8PwcefJWtNozbzBbwqyGBUHrozPR3gKIAygm7t5pNfUh7STX -jopImFNcEn5XKTn/IRWLDIf4OLp2j3HwbIAO32YBjce5Z5BEL6avVoPgyLRD1XCp -YZ1RTYBTXl4Y1bW1nuy5KoTLicypSRpOeVAyZ+XwHg8dq/SuJIJ4yP89VdllGdsQ -8rQshr236p0I7wInSM2Vkz095ITsovsyxdts+YUAQ7LQ4mAJ900KbFScZ8LMCiBz -/vzTqi8EJ6c+ncagL1rNNUfimkQbFRurSZz7JJQvD4dD18ZxFdyfIUTsU5mZr1dZ -pa6T3xHogISaIgBpO2DGaDnX3oxqoezKlKBTLh+nSw7u//+KH7bKfou65yTRnLjX -MXO3D+A9s8nyqJjVW0WjsVN5s+RCipa/x08yPy7hBZ7Hbxx/L2vrtVIwvQcqww1c -BPlhgZpZwQu1fJcbVhf/mIhqbRw0Kqq9jKWZeKHMzOB51lgroGiguGdnPd/qeaHH -2JGN6sYjMD1Ii2cCv5oyq/r72Qcmt1qcBZDRHTGoJr8yAj7ynEzoggwKVjbyFOcd -MGff5GnZiytt9SAIjFIxRYq+tc24qRcbWrsHDRq3hHCuB/+4xqvHllDDQUDIalLZ -VU1g4Glqg48to8crGHZiVmpT2cexrc7ROZEIDnD6/5u0Fa67+W4= -=CPGI ------END PGP SIGNATURE----- diff --git a/wine-3.13.tar.xz b/wine-3.13.tar.xz new file mode 100644 index 0000000..9bcd88e --- /dev/null +++ b/wine-3.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0785d74852232c1f6e07ac081875e92219a4428ddcc8931632fcf1924941bbd4 +size 20551460 diff --git a/wine-3.13.tar.xz.sign b/wine-3.13.tar.xz.sign new file mode 100644 index 0000000..b0f31bc --- /dev/null +++ b/wine-3.13.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAltSGE4ACgkQzvrI6q8X +UZ0iSg//QWn7NNEe8ltkC/2kAKK6R0MruwyPCkbpcAOkqWqmKbPg/uKkS1QEojyu +C+BreBB7FyWTNFJtPI4c7PlBy1S/PeAGMwz1oxcboyC5pd2nAT4ruybeieQF3mzT +NM2XOM80sj/VvQzNw+ZxFZI28T22sTMgEn718/Bck26VWZByYD9RS1m48/280fnF +1882Wg27+HjYNsyYG4osvcG4mwCvXdR17T+B/4KuXoJ7nyW/Ziwt9RMPt5C611ua +qjznDmuGG9Qx7HRVon3oc6sOsbINN6eGIuatcpFo29m+61e3CRsU0PcG6P424/94 +0vTcrpcYb/MYA7YH12bIK7x7zqz3ZdswD4RMs+ht++DQKkPjw5AboRQKuCjgz+ND +fZg33w/OSTlZIkPLMqiK8j5Kipf80G1SJOH8W0QIs45s5eQ+xPjMwo/g7b9pJmM5 +UyZ1OdrW3khXVyvj0P8qOCed1F1gZt21DsJ0g6CniEcCFkn8eWzBjHCrh+I9d1vy +pkhUze3+V242b9ZXticMu5qbsTU/69Lts3CNOoY922ietlqi94CNBJ1qBbE5iAG6 +w/QtvYZtE+/1NGpjlGLrQFg7znijLAnvjFbEWjEQXheZvNpDhuYP2qrRCmttEPld +YhbF0ulkdfmlTK+L1k5T3Vv8M5TCn9tsyLGgvvgyz+VR1Cj4vDE= +=sl7m +-----END PGP SIGNATURE----- diff --git a/wine-d3d9-patches-3.11.tar.xz b/wine-d3d9-patches-3.11.tar.xz deleted file mode 100644 index 8838ea5..0000000 --- a/wine-d3d9-patches-3.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31a941ec3a07368c528bf65cbe95428624c08a3d8b002c38828330f32d2d302d -size 42260 diff --git a/wine-d3d9-patches-3.12.tar.xz b/wine-d3d9-patches-3.12.tar.xz new file mode 100644 index 0000000..06137f6 --- /dev/null +++ b/wine-d3d9-patches-3.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a765ec8b539e7473991bffa00f4ee32de5a33bc9820bb5d9e23d7991fe276f6 +size 42276 diff --git a/wine-staging-3.12.tar.xz b/wine-staging-3.12.tar.xz deleted file mode 100644 index f2c5d87..0000000 --- a/wine-staging-3.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a920cd5ba0178e900c8a5f3873e024f9e5650b507c4ca49efc0bcf05426212f4 -size 7525892 diff --git a/wine-staging-3.13.tar.xz b/wine-staging-3.13.tar.xz new file mode 100644 index 0000000..4315de1 --- /dev/null +++ b/wine-staging-3.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:609f4afad408f54fc6d9ef141156cf5b7079041b0232f0f0bfe091d7e8787cf9 +size 7521752 diff --git a/wine.changes b/wine.changes index 9a04f2d..7fc7a37 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jul 21 08:15:41 UTC 2018 - meissner@suse.com + +- Update to 3.13 development release + - Vulkan support on macOS using MoltenVK. + - Initial support for performance data in the registry. + - Mono engine updated with some bug fixes. + - Support for fetching BIOS information on Linux. + - GnuTLS also used on macOS when available. + - Improvements in the standard Task Dialog. + - Various bug fixes. +- updated staging to 3.13 +- updated winetricks + ------------------------------------------------------------------- Tue Jul 10 06:07:29 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index c21a5d3..c61e71c 100644 --- a/wine.spec +++ b/wine.spec @@ -107,8 +107,8 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.12 -Version: 3.12 +%define realver 3.13 +Version: 3.13 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later @@ -146,7 +146,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.12 +%define staging_version 3.13 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -154,7 +154,7 @@ BuildRequires: libva-devel %endif %if %{nine} # upstream patch target version -%define nine_version 3.11 +%define nine_version 3.12 BuildRequires: Mesa-libd3d-devel BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel diff --git a/winetricks b/winetricks index 1f2aa91..ba8e2d2 100644 --- a/winetricks +++ b/winetricks @@ -6653,7 +6653,7 @@ load_dxvk54() { # https://github.com/doitsujin/dxvk w_download "https://github.com/doitsujin/dxvk/releases/download/v0.54/dxvk-0.54.tar.gz" 1c2f186baaa01d2de7b832f6f05021bdd29eccb65fc197c8b15adfd4e08f9640 - helper_dxvk "$file1" + helper_dxvk "$file1" "3.6" } #---------------------------------------------------------------- @@ -6692,6 +6692,24 @@ load_dxvk61() helper_dxvk "$file1" "3.10" "1.0.76" } +#---------------------------------------------------------------- + +w_metadata dxvk62 dlls \ + title="Vulkan-based D3D11 implementation for Linux / Wine (0.62)" \ + publisher="Philip Rebohle" \ + year="2018" \ + media="download" \ + file1="dxvk-0.62.tar.gz" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/d3d11.dll" \ + installed_file2="$W_SYSTEM32_DLLS_WIN/dxgi.dll" + +load_dxvk62() +{ + # https://github.com/doitsujin/dxvk + w_download "https://github.com/doitsujin/dxvk/releases/download/v0.62/dxvk-0.62.tar.gz" b9dbb57908e24b094b68f665ad729b6ee277eecc8ba04a6e6e4f8a4d2dfd94e3 + helper_dxvk "$file1" "3.10" "1.0.76" +} + #---------------------------------------------------------------- @@ -10809,6 +10827,7 @@ w_metadata corefonts fonts \ load_corefonts() { + w_download "https://mirrors.kernel.org/gentoo/distfiles/andale32.exe" 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 w_download "https://mirrors.kernel.org/gentoo/distfiles/arial32.exe" 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 w_download "https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe" a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8 w_download "https://mirrors.kernel.org/gentoo/distfiles/comic32.exe" 9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e @@ -10825,6 +10844,10 @@ load_corefonts() # files being present in the Windows font directory we use cabextract # to obtain the files and register the fonts by hand. + w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/andale32.exe + w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "AndaleMo.TTF" + w_register_font andalemo.ttf "Andale Mono" + w_try_cabextract -d "$W_TMP" "$W_CACHE"/corefonts/arial32.exe w_try_cp_font_files "$W_TMP" "$W_FONTSDIR_UNIX" "Arial*.TTF" w_register_font arialbd.ttf "Arial Bold" @@ -13299,19 +13322,26 @@ load_vc2005trial() winwait, Visual Studio, Setup is loading if ( w_opt_unattended > 0 ) { winwait, Visual Studio, Loading completed + sleep 1000 controlclick, button2 winwait, Visual Studio, Select features + sleep 1000 controlclick, button38 + sleep 1000 controlclick, button40 winwait, Visual Studio, You have chosen + sleep 1000 controlclick, button1 winwait, Visual Studio, Select features + sleep 1000 controlclick, button11 } - ;this can take a while + ; this can take a while winwait, Finish Page - if ( w_opt_unattended > 0 ) + if ( w_opt_unattended > 0 ) { + sleep 1000 controlclick, button2 + } winwaitclose, Finish Page " } From 451f6b5227ad4ed4f9c4f02e74155117c4ca190df37070e8e91ff25797cad5b4 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 22 Jul 2018 13:21:25 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=528 --- wine.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wine.spec b/wine.spec index c61e71c..84b0322 100644 --- a/wine.spec +++ b/wine.spec @@ -169,6 +169,15 @@ 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. +%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. @@ -180,7 +189,6 @@ information. 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++ From 4b9334ea22c444f13938230b80709caecb5961de69a8a24f5ef4cbaa27b5bc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 24 Jul 2018 08:47:19 +0000 Subject: [PATCH 3/3] Accepting request 624836 from home:tobijk:branches:Emulators - Switch to using pkgconfig for dri2proto as dri2proto-devel does not exist in "Factory" anymore, it is now provided by xorgproto-devel, yet using pkgconfig is more robust OBS-URL: https://build.opensuse.org/request/show/624836 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=529 --- wine.changes | 7 +++++++ wine.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wine.changes b/wine.changes index 7fc7a37..5b36c8d 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 23 14:54:27 UTC 2018 - tobias.johannes.klausmann@mni.thm.de + +- Switch to using pkgconfig for dri2proto as dri2proto-devel does + not exist in "Factory" anymore, it is now provided by + xorgproto-devel, yet using pkgconfig is more robust + ------------------------------------------------------------------- Sat Jul 21 08:15:41 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 84b0322..2b30394 100644 --- a/wine.spec +++ b/wine.spec @@ -156,8 +156,8 @@ BuildRequires: libva-devel # upstream patch target version %define nine_version 3.12 BuildRequires: Mesa-libd3d-devel -BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel +BuildRequires: pkgconfig(dri2proto) Source110: wine-d3d9-patches-%{nine_version}.tar.xz %endif