SHA256
1
0
forked from pool/wine

- remove outdated wine-nine support.

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1092
This commit is contained in:
Marcus Meissner 2024-02-28 13:48:56 +00:00 committed by Git OBS Bridge
parent ada2ba8bac
commit 49f4194167
2 changed files with 8 additions and 36 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 28 13:48:34 UTC 2024 - Marcus Meissner <meissner@suse.com>
- remove outdated wine-nine support.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 26 10:34:20 UTC 2024 - Marcus Meissner <meissner@suse.com> Mon Feb 26 10:34:20 UTC 2024 - Marcus Meissner <meissner@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,14 +19,10 @@
%define projectname wine %define projectname wine
%global flavor @BUILD_FLAVOR@%nil %global flavor @BUILD_FLAVOR@%nil
%define staging 0 %define staging 0
%define nine 0
%if "%flavor" == "staging" || "%flavor" == "staging-nine" %if "%flavor" == "staging"
%define staging 1 %define staging 1
%endif %endif
%if "%flavor" == "nine" || "%flavor" == "staging-nine"
%define nine 1
%endif
# needs to be on top due to usage of %version macro below # needs to be on top due to usage of %version macro below
%define realver 9.3 %define realver 9.3
@ -181,15 +177,6 @@ BuildRequires: libOSMesa-devel
BuildRequires: libva-devel BuildRequires: libva-devel
BuildRequires: python3 BuildRequires: python3
%endif %endif
%if %{nine}
# upstream patch target version
%define nine_version 4.1
BuildRequires: Mesa-libd3d-devel
Requires: Mesa-libd3d
BuildRequires: libOSMesa-devel
BuildRequires: pkgconfig(dri2proto)
Source110: wine-d3d9-patches-%{nine_version}.tar.xz
%endif
# wine bundles multiple unix libraries to be able to build PE files without dependencies # wine bundles multiple unix libraries to be able to build PE files without dependencies
# current versions are from 7.22 (update this if you update the versions below): # current versions are from 7.22 (update this if you update the versions below):
Provides: bundled(FAudio) = 23.12.0 Provides: bundled(FAudio) = 23.12.0
@ -221,10 +208,6 @@ This WINE flavor contains the "staging" development patchset
on top of the regular Wine release. on top of the regular Wine release.
%endif %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 You can run your Windows executables with it and write your Windows
programs under Linux and link against the WINE libraries. It is not programs under Linux and link against the WINE libraries. It is not
necessary to have a Windows installation to run WINE. necessary to have a Windows installation to run WINE.
@ -260,16 +243,6 @@ tar xf %{SOURCE100}
python3 ./wine-staging-%staging_version/staging/patchinstall.py --all python3 ./wine-staging-%staging_version/staging/patchinstall.py --all
%endif %endif
%if %{nine}
tar xf %{SOURCE110}
%if %{staging}
patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/staging-helper.patch
%else
patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/d3d9-helper.patch
%endif
patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/wine-d3d9.patch
%endif
%build %build
# currently not building with LTO # currently not building with LTO
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
@ -286,7 +259,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
export CC="/usr/bin/clang" export CC="/usr/bin/clang"
%endif %endif
%if %{staging} || %{nine} %if %{staging}
autoreconf -i -f autoreconf -i -f
%endif %endif
# keep just for susepatches with configure changes # keep just for susepatches with configure changes
@ -300,9 +273,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
%endif %endif
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
--enable-win64 \ --enable-win64 \
%endif
%if %{nine}
--with-d3d9-nine \
%endif %endif
--verbose --verbose
@ -333,9 +303,6 @@ echo " recommends \"wine-mp3-32bit\"" >> %SOURCE7
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
echo " requires \"p11-kit-32bit\"" >> %SOURCE7 echo " requires \"p11-kit-32bit\"" >> %SOURCE7
%endif %endif
%if %{nine}
echo " requires \"Mesa-libd3d-32bit\"" >> %SOURCE7
%endif
%if "%{flavor}" != "" %if "%{flavor}" != ""
echo " provides \"wine-<targettype> = <version>\"" >> %SOURCE7 echo " provides \"wine-<targettype> = <version>\"" >> %SOURCE7
%endif %endif