rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

Accepting request 582585 from Emulators

Browse Source 
- update wine-staging and wine-nine to 3.3
- enable wine staging

- Update to 3.3 development release
  - Beginnings of Vulkan support.
  - Direct3D multi-threaded command stream enabled by default.
  - Multisample textures enabled by default.
  - Support for game controllers through SDL.
  - Support for loading CIL-only .Net binaries.
  - Various bug fixes.
- Updated winetricks

OBS-URL: https://build.opensuse.org/request/show/582585
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=246
This commit is contained in:
Dominique Leuenberger 2018-03-07 09:34:46 +00:00 committed by Git OBS Bridge
commit 9f8e9d33fd
13 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_multibuild
View File

@ -1,5 +1,5 @@
<multibuild>
<package>nine</package>
<!-- no staging currently <package>staging</package>
<package>staging-nine</package> -->
<package>staging</package>
<package>staging-nine</package>
</multibuild>

6
_service
View File

@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="url">https://github.com/wine-compholio/wine-staging.git</param>
<param name="revision">refs/tags/v2.21</param>
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
<param name="revision">refs/tags/v3.3</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-2.20</param>
<param name="revision">refs/tags/wine-d3d9-3.3</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">

3
wine-3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5281066150b981d1c731584ee8f70bae5f38b393d411e29fa910de3ee20221a0
size 19793180

16
wine-3.2.tar.xz.sign
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlqHM24ACgkQzvrI6q8X
UZ1zgw//XaDQoj3P3+tWT33+Q0wwJdpcvT33tNtGe0OCgmbzV+9CFHpyZpmQ3V7O
d0Fmf6Q+oXo6pDHdPZ1m923yQh5t/qYK9qXz+wVWyXIDfEp1J3ms4Uw441wKmNxX
y3DwTLx9sEg3mzSm6FAAwzVGk0g3xIFwzlvkddCdc0qbzmR9m4+onp9UweCkWTuG
n1Hd+WdAfzs+4eDkRKOtJlu461f82dUPi49KFqR2sXDlkp4LdJx2G0PK1LLYgRLN
/1lWeBG7X77K3NHUymnvnXMmg7TECBr4RiVrT2QOrkr7Eat0CRix8uoUvqfrDXh9
xfbwrazdOXaTmQ/KTYLiWIbcOydOQZWo9LL/p0xDVIYdTZ6o7ZZGzY3AnF3DiQK+
N7tyu5cr2MSskU0yR8yN1d10/6yhqXNX9iG4wzeLRHaQU0F+wKqrOtO37cgYcTQg
aigax7us2rDed5l6yRlOhpgo9+AgwT+mkh7nlOqcx9wyjSLOZQfeF6epDhlz8wwQ
S3j3mMOgS2QlJde6sMQQcpATDAzILg125lo1US8WlA1q9kgF0QnnWIg/2P9ov/sG
W/PBQodCvHo7oEDSu9RTZ09IhfeHq4a7zCj2zt9X0TtWK5Z6wOAOd4KilaL5M3/o
CoBXuZ9ssA+xJ69+2gCzABYb26zrTTE7oHrxmg/WfOncLdbhCFA=
=Eh2i
-----END PGP SIGNATURE-----

3
wine-3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0594bdb27bb3f9420dd8cbf3cb8c6a66712c155477837d726abd1e4ab50ca333
size 19891048

16
wine-3.3.tar.xz.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlqZlHQACgkQzvrI6q8X
UZ3gDA//RoTF/7Lz7jOKLLKClhxHI+5m4c7wXXSctGFgKaVVw9Furwp0GkCmcKYo
ztCAJaBpHUGLpmm6TYERs5zPW6QqtFbspz89oKngnT/ESNDPcrhWAaSwTwqXrvxj
RUKN99mVIpdU1IM+5PFwsgAxAThMtMVa2A2cbsBdBUys1ujYsKKjGGYrSLtv0fSn
s+csTsRb6SdgyF+seSrbXISBlxSoMuQt/n6od9G39iY55FqqXdZ3sChUMHTtKg6t
3huW0BBgeFjN8CtAjF0Atu+qYbVxhiyNR6NuebUSExiUA8OM05ObKrruk2dI8I7T
qCJEXOzSoCNwOe+OqsILp4+gaoOKm/8pV5wmO3a1aV0ulVPxC7+07So0rwnmLSqz
yECqM8tb11jOB0ib+ag+1rqsam/0GfMiHXgYis9zkcG/vvgdcCmVWAfD7dUNYLR9
fuGwT8tEPJ5+f9H7Kj8nDAj5jdI4u7Jj5tvL9ombFvmWU9Ki0PuKhjPb31D2r0pd
psfBsx+k5V/GFCYpXq9shDN18IKFpkeyQ20GNRVVHj9e9UUowcXYlGYpDDgVOTez
7bRM20hizTGLp8tviatnnhtjhe9bqDrxY9PaxE1jagCM6ZaWwUwHgiIWqohuMJ2n
OjKSCWqHOQho7uLRIbtTtqAUovUC6aK6g/ICMFy2jVI+khNvmWA=
=Fdvl
-----END PGP SIGNATURE-----

3
wine-d3d9-patches-2.20.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33e42128cce101d409b16c893d7e52a80f6797d860a29d90a259199e3ba6a6b0
size 40848

3
wine-d3d9-patches-3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ede0c407d68bc677d5108565657945311f4d8e5d0f60e05e49ddc2cf29a9ca11
size 42412

3
wine-staging-2.21.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5df468532ada7ff8713cf31a186f80e19cdf16fb913974a8989c2c86c3428373
size 7730272

3
wine-staging-3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4154577d896072e15139d0428a3bf547cdc0d9932c5d9438239392f580310672
size 7657768

18
wine.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Mar 5 08:52:57 UTC 2018 - mimi.vx@gmail.com
- update wine-staging and wine-nine to 3.3
- enable wine staging
-------------------------------------------------------------------
Fri Mar 2 18:49:34 UTC 2018 - meissner@suse.com
- Update to 3.3 development release
- Beginnings of Vulkan support.
- Direct3D multi-threaded command stream enabled by default.
- Multisample textures enabled by default.
- Support for game controllers through SDL.
- Support for loading CIL-only .Net binaries.
- Various bug fixes.
- Updated winetricks
-------------------------------------------------------------------
Mon Feb 19 12:23:23 UTC 2018 - meissner@suse.com

16
wine.spec
View File

@ -69,6 +69,7 @@ Obsoletes: wine-mp3 < %version
%else
Recommends: wine-mp3
%endif
BuildRequires: SDL2-devel
BuildRequires: ncurses-devel
BuildRequires: openal-soft-devel
BuildRequires: openldap2-devel
@ -77,18 +78,19 @@ BuildRequires: pkgconfig
BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: vulkan-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
%define realver 3.2
Version: 3.2
%define realver 3.3
Version: 3.3
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: System/Emulators/PC
Url: http://www.winehq.org/
Source0: http://downloads.sourceforge.net/wine/%{projectname}-%{realver}.tar.xz
Source0: https://dl.winehq.org/wine/source/3.x/%{projectname}-%{realver}.tar.xz
Source41: wine.keyring
Source42: http://downloads.sourceforge.net/wine/%{projectname}-%{realver}.tar.xz.sign
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
Source2: http://kegel.com/wine/wisotool
@ -118,7 +120,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc %arm
%if %{staging}
# upstream patch target version
%define staging_version 2.21
%define staging_version 3.3
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@ -126,7 +128,7 @@ BuildRequires: libva-devel
%endif
%if %{nine}
# upstream patch target version
%define nine_version 2.20
%define nine_version 3.3
BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel

9
winetricks
View File

@ -34,7 +34,7 @@ WINETRICKS_VERSION=20180217-next
# - zenity is needed by the GUI, though it can limp along somewhat with kdialog/xmessage.
# - xdg-open (if present) or open (for OS X) is used to open download pages
# for the user when downloads cannot be fully automated.
# - pfexec, sudo, or kdesu (gksu/gksudo/kdesudo are deprecated upstream but also still supported)
# - pkexec, sudo, or kdesu (gksu/gksudo/kdesudo are deprecated upstream but also still supported)
# are used to mount .iso images if the user cached them with -k option.
# - perl is used to munge steam config files.
# - torify is used with option "--torify" if sites are blocked in single countries.
@ -1178,6 +1178,9 @@ w_download_to()
w_try_cd "$_W_dl_olddir"
unset _W_dl_olddir
# downloaded successfully, exit from loop
break
elif test $tries = 2; then
test -f "$_W_file" && rm "$_W_file"
w_die "Downloading $_W_url failed"
@ -14094,7 +14097,7 @@ load_cod1()
WinWait, Call of Duty, Start
ControlClick Button1
}
WinWait, Insert CD, Please insert the Call of Duty w_try_cd 2
WinWait, Insert CD, Please insert the Call of Duty cd 2
"
"$WINE" eject ${W_ISO_MOUNT_LETTER}:
@ -14105,7 +14108,7 @@ load_cod1()
if ( w_opt_unattended > 0 ) {
Send {Enter} ;continue installation
}
WinWait, Insert CD, Please insert the Call of Duty w_try_cd 1
WinWait, Insert CD, Please insert the Call of Duty cd 1
"
"$WINE" eject ${W_ISO_MOUNT_LETTER}: