From bafc074a57baea14efe7913db2e94414fdbd66ad Mon Sep 17 00:00:00 2001 From: Raven Date: Thu, 25 Apr 2024 17:11:02 +0600 Subject: [PATCH] wine: update to 9.6 --- wine/sysctl.conf | 1 + wine/wine-7.22-autoconf-2.72.patch | 25 ++ wine/wine-7.5-cross.patch | 21 - wine/wine-staging-9.0.patch | 115 ++++++ wine/wine.spec | 623 +++++++++++++---------------- 5 files changed, 418 insertions(+), 367 deletions(-) create mode 100644 wine/sysctl.conf create mode 100644 wine/wine-7.22-autoconf-2.72.patch delete mode 100644 wine/wine-7.5-cross.patch create mode 100644 wine/wine-staging-9.0.patch diff --git a/wine/sysctl.conf b/wine/sysctl.conf new file mode 100644 index 0000000..5234415 --- /dev/null +++ b/wine/sysctl.conf @@ -0,0 +1 @@ +vm.max_map_count=1048576 \ No newline at end of file diff --git a/wine/wine-7.22-autoconf-2.72.patch b/wine/wine-7.22-autoconf-2.72.patch new file mode 100644 index 0000000..781bb9a --- /dev/null +++ b/wine/wine-7.22-autoconf-2.72.patch @@ -0,0 +1,25 @@ +--- wine-7.20.old/aclocal.m4 2022-11-17 17:19:01.772386752 +0100 ++++ wine-7.20/aclocal.m4 2022-11-17 17:24:03.721683055 +0100 +@@ -279,15 +279,17 @@ + dnl + dnl Usage: WINE_CHECK_DEFINE(name),[action-if-yes,[action-if-no]]) + dnl + AC_DEFUN([WINE_CHECK_DEFINE], + [AS_VAR_PUSHDEF([ac_var],[ac_cv_cpp_def_$1])dnl +-AC_CACHE_CHECK([whether we need to define $1],ac_var, +- AC_EGREP_CPP(yes,[#ifndef $1 +-yes +-#endif], +- [AS_VAR_SET(ac_var,yes)],[AS_VAR_SET(ac_var,no)])) ++AC_CACHE_CHECK([whether we need to define $1], ac_var, ++ [AC_PREPROC_IFELSE([[ ++#ifndef $1 ++#error not defined ++#endif ++]], ++ [AS_VAR_SET(ac_var,no)],[AS_VAR_SET(ac_var,yes)])]) + AS_VAR_IF([ac_var],[yes], + [CFLAGS="$CFLAGS -D$1" + LINTFLAGS="$LINTFLAGS -D$1"])dnl + AS_VAR_POPDEF([ac_var])]) + diff --git a/wine/wine-7.5-cross.patch b/wine/wine-7.5-cross.patch deleted file mode 100644 index 4c588d7..0000000 --- a/wine/wine-7.5-cross.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/aclocal.m4 2022-03-25 15:26:21.000000000 -0500 -+++ b/aclocal.m4 2022-03-30 14:17:03.862124917 -0500 -@@ -229,6 +229,7 @@ - AC_CACHE_CHECK([for MinGW $1], ac_var, - [ac_wine_check_headers_saved_cc=$CC - ac_wine_check_headers_saved_exeext=$ac_exeext -+CFLAGS="$CROSSCFLAGS" - CC="$CROSSCC" - ac_exeext=".exe" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4 -@@ -248,8 +249,10 @@ - [ac_wine_check_headers_saved_cc=$CC - ac_wine_check_headers_saved_exeext=$ac_exeext - ac_wine_check_headers_saved_libs=$LIBS -+CFLAGS="$CROSSCFLAGS" - CC="$CROSSCC" - ac_exeext=".exe" -+LDFLAGS="$CROSSLDFLAGS" - LIBS="-l$1 $5 $LIBS" - AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],[AS_VAR_SET([ac_var],[yes])],[AS_VAR_SET([ac_var],[no])]) - CC=$ac_wine_check_headers_saved_cc diff --git a/wine/wine-staging-9.0.patch b/wine/wine-staging-9.0.patch new file mode 100644 index 0000000..daad50e --- /dev/null +++ b/wine/wine-staging-9.0.patch @@ -0,0 +1,115 @@ +--- patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch 2024-01-17 20:36:36.796186786 -0600 +@@ -197,7 +197,7 @@ + + } + + } + + +-+ if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 )) +++ if (!InterlockedCompareExchange( (LONG *)&esync_list[entry][idx].type, type, 0 )) + + { + + esync_list[entry][idx].fd = fd; + + esync_list[entry][idx].shm = shm; +--- patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch 2024-01-17 20:22:59.170405980 -0600 +@@ -25,7 +25,7 @@ + + + + if (entry < ESYNC_LIST_ENTRIES && esync_list[entry]) + + { +-+ if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0)) +++ if (InterlockedExchange((LONG *)&esync_list[entry][idx].type, 0)) + + { + + close( esync_list[entry][idx].fd ); + + return STATUS_SUCCESS; +--- patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch 2024-01-17 20:25:51.399420034 -0600 +@@ -60,7 +60,7 @@ + + + + if (count + current > semaphore->max) + + return STATUS_SEMAPHORE_LIMIT_EXCEEDED; +-+ } while (InterlockedCompareExchange( &semaphore->count, count + current, current ) != current); +++ } while (InterlockedCompareExchange( (LONG *) &semaphore->count, count + current, current ) != current); + + + + if (prev) *prev = current; + + +--- patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch 2024-01-17 20:29:39.020112232 -0600 +@@ -90,7 +90,7 @@ + + if (obj->type == ESYNC_MANUAL_EVENT) + + { + + /* Acquire the spinlock. */ +-+ while (InterlockedCompareExchange( &event->locked, 1, 0 )) +++ while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 )) + + small_pause(); + + } + + +@@ -103,7 +103,7 @@ + + * eventfd is unsignaled (i.e. reset shm, set shm, set fd, reset fd), we + + * *must* signal the fd now, or any waiting threads will never wake up. */ + + +-+ if (!InterlockedExchange( &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT) +++ if (!InterlockedExchange( (LONG *) &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT) + + { + + if (write( obj->fd, &value, sizeof(value) ) == -1) + + ERR("write: %s\n", strerror(errno)); +@@ -137,7 +137,7 @@ + + if (obj->type == ESYNC_MANUAL_EVENT) + + { + + /* Acquire the spinlock. */ +-+ while (InterlockedCompareExchange( &event->locked, 1, 0 )) +++ while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 )) + + small_pause(); + + } + + +@@ -147,7 +147,7 @@ + + * For auto-reset events, we have no guarantee that the previous "signaled" + + * state is actually correct. We need to leave both states unsignaled after + + * leaving this function, so we always have to read(). */ +-+ if (InterlockedExchange( &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT) +++ if (InterlockedExchange( (LONG *) &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT) + + { + + if (read( obj->fd, &value, sizeof(value) ) == -1 && errno != EWOULDBLOCK && errno != EAGAIN) + + { +--- patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch 2024-01-17 20:31:23.217332813 -0600 +@@ -82,7 +82,7 @@ + + * fact that we were able to grab it at all means the count is nonzero, + + * and if someone else grabbed it then the count must have been >= 2, + + * etc. */ +-+ InterlockedExchangeAdd( &semaphore->count, -1 ); +++ InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 ); + + } + +} + + +--- patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch 2024-01-17 20:31:54.500700144 -0600 +@@ -49,7 +49,7 @@ + + @@ -339,6 +358,14 @@ static void update_grabbed_object( struct esync *obj ) + * etc. */ +- InterlockedExchangeAdd( &semaphore->count, -1 ); ++ InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 ); + } + + else if (obj->type == ESYNC_AUTO_EVENT) + + { +--- patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch 2024-01-17 21:07:47.674962176 -0600 +@@ -68,7 +68,7 @@ + + if ((size = read( obj->fd, &value, sizeof(value) )) == sizeof(value)) + + { + + TRACE("Woken up by handle %p [%d].\n", handles[i], i); +-+ InterlockedDecrement( &semaphore->count ); +++ InterlockedDecrement( (LONG *) &semaphore->count ); + + return i; + + } + + } +--- patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch.orig 2024-01-16 15:47:35.000000000 -0600 ++++ patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch 2024-01-18 08:19:37.882485865 -0600 +@@ -74,7 +74,7 @@ + + } + + + + if (pdev->brush.style != BS_NULL && +-+ !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const UINT *)&count, 1, NtGdiPolyPolygonRgn )))) +++ !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const ULONG *)&count, 1, NtGdiPolyPolygonRgn )))) + + { + + free( points ); + + if (outline) NtGdiDeleteObjectApp( outline ); diff --git a/wine/wine.spec b/wine/wine.spec index 91d71ea..0095302 100644 --- a/wine/wine.spec +++ b/wine/wine.spec @@ -3,23 +3,24 @@ #global _smp_mflags -j1 +%if 0%{?rhel} < 9 %bcond_with mingw +%else +%bcond_without mingw +%endif + %define extra_libs 0 %ifarch x86_64 %if %{without mingw} %define extra_libs 1 %endif -%else -%ifarch %{arm} aarch64 -%define extra_libs 1 -%endif %endif %global no64bit 0 -%global winegecko 2.47.2 -%global winemono 7.3.0 +%global winegecko 2.47.4 +%global winemono 9.0.0 #global _default_patch_fuzz 2 %ifarch %{ix86} %global winepedir i386-windows @@ -29,37 +30,19 @@ %global winepedir x86_64-windows %global winesodir x86_64-unix %endif -%ifarch %{arm} -%global winepedir arm-windows -%global winesodir arm-unix -%endif -%ifarch aarch64 -%global winepedir aarch64-windows -%global winesodir aarch64-unix -%endif + # build with wine-staging patches, see: https://github.com/wine-staging/wine-staging -%if 0%{?fedora} || 0%{?rhel} >= 7 %global wine_staging 1 -%endif -# 0%%{?fedora} - -# binfmt macros for RHEL -%if 0%{?rhel} == 7 -%global _binfmtdir /usr/lib/binfmt.d -%global binfmt_apply() \ -/usr/lib/systemd/systemd-binfmt %{?*} >/dev/null 2>&1 || : \ -%{nil} -%endif Name: wine -Version: 7.19 +Version: 9.6 Release: 1%{?dist} Summary: A compatibility layer for windows applications License: LGPLv2+ URL:https://www.winehq.org/ -Source0: https://dl.winehq.org/wine/source/7.x/wine-%{version}.tar.xz +Source0: https://dl.winehq.org/wine/source/9.x/wine-%{version}.tar.xz Source1: wine.init Source2: wine.systemd @@ -96,10 +79,13 @@ Source501: wine-tahoma.conf # and provide a readme Source502: wine-README-tahoma -# fix configure macros for cross-compiling -Patch100: wine-7.5-cross.patch +Source600: sysctl.conf + +# Autoconf 2.72+ +Patch100: wine-7.22-autoconf-2.72.patch Patch511: wine-cjk.patch +Patch900: wine-staging-9.0.patch %if 0%{?wine_staging} # wine-staging patches @@ -108,31 +94,19 @@ Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar. %endif %if !%{?no64bit} -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 +ExclusiveArch: %{ix86} x86_64 %else -ExclusiveArch: %{ix86} %{arm} +ExclusiveArch: %{ix86} %endif BuildRequires: bison BuildRequires: flex -%ifarch aarch64 -BuildRequires: clang >= 5.0 -%else -%if %{without mingw} + BuildRequires: gcc -BuildRequires: lcms2-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: libxslt-devel -BuildRequires: libxml2-devel -BuildRequires: zlib-devel -%else +%if %{with mingw} BuildRequires: mingw32-gcc BuildRequires: mingw64-gcc -BuildRequires: mingw32-FAudio -BuildRequires: mingw64-FAudio BuildRequires: mingw32-lcms2 BuildRequires: mingw64-lcms2 BuildRequires: mingw32-libpng @@ -141,16 +115,23 @@ BuildRequires: mingw32-libxml2 BuildRequires: mingw64-libxml2 BuildRequires: mingw32-libxslt BuildRequires: mingw64-libxslt -BuildRequires: mingw32-vkd3d -BuildRequires: mingw64-vkd3d +BuildRequires: mingw32-vkd3d >= 1.11 +BuildRequires: mingw64-vkd3d >= 1.11 BuildRequires: mingw32-vulkan-headers BuildRequires: mingw64-vulkan-headers BuildRequires: mingw32-zlib BuildRequires: mingw64-zlib %endif -%endif + +BuildRequires: lcms2-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libxslt-devel +BuildRequires: libxml2-devel +BuildRequires: zlib-devel BuildRequires: libFAudio-devel -#BuildRequires: libvkd3d-devel +BuildRequires: libvkd3d-devel BuildRequires: autoconf BuildRequires: make BuildRequires: desktop-file-utils @@ -171,12 +152,11 @@ BuildRequires: perl-generators BuildRequires: unixODBC-devel BuildRequires: sane-backends-devel BuildRequires: systemd-devel +BuildRequires: pcsc-lite-devel BuildRequires: fontforge freetype-devel BuildRequires: libgphoto2-devel -%if 0%{?fedora} <= 30 -BuildRequires: isdn4k-utils-devel -%endif BuildRequires: libpcap-devel +BuildRequires: libnetapi-devel # modular x BuildRequires: libX11-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel mesa-libOSMesa-devel @@ -201,12 +181,12 @@ BuildRequires: gettext-devel BuildRequires: chrpath BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-plugins-base-devel -%if 0%{?fedora} > 24 || 0%{?rhel} > 7 BuildRequires: mpg123-devel -%endif BuildRequires: SDL2-devel BuildRequires: vulkan-devel +BuildRequires: pkgconfig(wayland-server) BuildRequires: libappstream-glib +BuildRequires: isdn4k-utils-devel # Silverlight DRM-stuff needs XATTR enabled. %if 0%{?wine_staging} @@ -216,96 +196,35 @@ BuildRequires: libva-devel %endif # 0%%{?wine_staging} -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildRequires: openal-soft-devel BuildRequires: icoutils -%endif Requires: wine-common = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} -# x86-32 parts -%ifarch %{ix86} x86_64 -%if 0%{?fedora} || 0%{?rhel} <= 6 -Requires: wine-core(x86-32) = %{version}-%{release} -Requires: wine-cms(x86-32) = %{version}-%{release} -Requires: wine-ldap(x86-32) = %{version}-%{release} -Requires: wine-twain(x86-32) = %{version}-%{release} -Requires: wine-pulseaudio(x86-32) = %{version}-%{release} -%if 0%{?fedora} >= 10 || 0%{?rhel} == 6 -Requires: wine-openal(x86-32) = %{version}-%{release} -%endif -%if 0%{?fedora} || 0%{?rhel} >= 8 -Requires: wine-opencl(x86-32) = %{version}-%{release} -%endif -%if 0%{?fedora} >= 17 -#Requires: mingw32-wine-gecko = %winegecko -Requires: wine-mono = %winemono -%endif -# wait for rhbz#968860 to require arch-specific samba-winbind-clients -Requires: /usr/bin/ntlm_auth -Requires: mesa-dri-drivers(x86-32) -%endif -%if 0%{?fedora} >= 33 -Recommends: wine-dxvk(x86-32) -%endif -Recommends: gstreamer1-plugins-good(x86-32) -Recommends: isdn4k-utils(x86-32) -%endif # x86-64 parts -%ifarch x86_64 -Requires: wine-core(x86-64) = %{version}-%{release} -Requires: wine-cms(x86-64) = %{version}-%{release} -Requires: wine-ldap(x86-64) = %{version}-%{release} -Requires: wine-twain(x86-64) = %{version}-%{release} -Requires: wine-pulseaudio(x86-64) = %{version}-%{release} -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 -Requires: wine-openal(x86-64) = %{version}-%{release} -%endif +Requires: wine-core%{?_isa} = %{version}-%{release} +Requires: wine-cms%{?_isa} = %{version}-%{release} +Requires: wine-ldap%{?_isa} = %{version}-%{release} +Requires: wine-twain%{?_isa} = %{version}-%{release} +Requires: wine-pulseaudio%{?_isa} = %{version}-%{release} %if 0%{?fedora} || 0%{?rhel} >= 8 -Requires: wine-opencl(x86-64) = %{version}-%{release} +Requires: wine-opencl%{?_isa} = %{version}-%{release} %endif %if 0%{?fedora} >= 17 -Requires: mingw64-wine-gecko = %winegecko -Requires: wine-mono = %winemono +%if %{with mingw} +Recommends: mingw64-wine-gecko = %winegecko %endif -Requires: mesa-dri-drivers(x86-64) +Recommends: wine-mono = %winemono +%endif +Requires: mesa-dri-drivers%{?_isa} %if 0%{?fedora} >= 33 -Recommends: wine-dxvk(x86-64) -%endif -Recommends: gstreamer1-plugins-good(x86-64) -Recommends: isdn4k-utils(x86-64) +Recommends: wine-dxvk%{?_isa} %endif +Recommends: gstreamer1-plugins-good%{?_isa} -# ARM parts -%ifarch %{arm} aarch64 -Requires: wine-core = %{version}-%{release} -Requires: wine-cms = %{version}-%{release} -Requires: wine-ldap = %{version}-%{release} -Requires: wine-twain = %{version}-%{release} -Requires: wine-pulseaudio = %{version}-%{release} -Requires: wine-openal = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 8 -Requires: wine-opencl = %{version}-%{release} -%endif -Requires: mesa-dri-drivers -Requires: samba-winbind-clients -%endif - -# aarch64 parts -%ifarch aarch64 -Requires: wine-core(aarch-64) = %{version}-%{release} -Requires: wine-cms(aarch-64) = %{version}-%{release} -Requires: wine-ldap(aarch-64) = %{version}-%{release} -Requires: wine-twain(aarch-64) = %{version}-%{release} -Requires: wine-pulseaudio(aarch-64) = %{version}-%{release} -Requires: wine-openal(aarch-64) = %{version}-%{release} -Requires: wine-opencl(aarch-64) = %{version}-%{release} -#Requires: mingw64-wine-gecko = %winegecko -Requires: mesa-dri-drivers(aarch-64) -%endif %description Wine as a compatibility layer for UNIX to run Windows applications. This @@ -326,88 +245,60 @@ Requires(preun): %{_sbindir}/alternatives # require -filesystem Requires: wine-filesystem = %{version}-%{release} -%ifarch %{ix86} # CUPS support uses dlopen - rhbz#1367537 -Requires: cups-libs(x86-32) -Requires: freetype(x86-32) -Requires: nss-mdns(x86-32) -Requires: gnutls(x86-32) -Requires: libXcomposite(x86-32) -Requires: libXcursor(x86-32) -Requires: libXinerama(x86-32) -Requires: libXrandr(x86-32) -Requires: libXrender(x86-32) +Requires: cups-libs%{?_isa} +Requires: freetype%{?_isa} +Requires: nss-mdns%{?_isa} +Requires: gnutls%{?_isa} +Requires: libXcomposite%{?_isa} +Requires: libXcursor%{?_isa} +Requires: libXinerama%{?_isa} +Requires: libXrandr%{?_isa} +Requires: libXrender%{?_isa} #dlopen in windowscodesc (fixes rhbz#1085075) -%if %{without mingw} -Requires: libpng(x86-32) -%endif -Requires: libpcap(x86-32) -Requires: mesa-libOSMesa(x86-32) -Requires: libv4l(x86-32) -Requires: unixODBC(x86-32) -Requires: SDL2(x86-32) -Requires: vulkan-loader(x86-32) +Requires: libpng%{?_isa} +Requires: libpcap%{?_isa} +Requires: mesa-libOSMesa%{?_isa} +Requires: libv4l%{?_isa} +Requires: unixODBC%{?_isa} +Requires: SDL2%{?_isa} +Requires: vulkan-loader%{?_isa} %if 0%{?wine_staging} -Requires: libva(x86-32) +Requires: libva%{?_isa} %endif -%endif - -%ifarch x86_64 -# CUPS support uses dlopen - rhbz#1367537 -Requires: cups-libs(x86-64) -Requires: freetype(x86-64) -Requires: nss-mdns(x86-64) -Requires: gnutls(x86-64) -Requires: libXcomposite(x86-64) -Requires: libXcursor(x86-64) -Requires: libXinerama(x86-64) -Requires: libXrandr(x86-64) -Requires: libXrender(x86-64) -#dlopen in windowscodesc (fixes rhbz#1085075) -%if %{without mingw} -Requires: libpng(x86-64) -%endif -Requires: libpcap(x86-64) -Requires: mesa-libOSMesa(x86-64) -Requires: libv4l(x86-64) -Requires: unixODBC(x86-64) -Requires: SDL2(x86-64) -Requires: vulkan-loader(x86-64) -%if 0%{?wine_staging} -Requires: libva(x86-64) -%endif -%endif - -%ifarch %{arm} aarch64 -# CUPS support uses dlopen - rhbz#1367537 -Requires: cups-libs -Requires: freetype -Requires: nss-mdns -Requires: gnutls -Requires: libXrender -Requires: libXcursor -#dlopen in windowscodesc (fixes rhbz#1085075) -Requires: libpng -Requires: libpcap -Requires: mesa-libOSMesa -Requires: libv4l -Requires: unixODBC -Requires: SDL2 -Requires: vulkan-loader -%if 0%{?wine_staging} -Requires: libva -%endif -%endif - -Provides: bundled(libvkd3d) = 1.5 %if %{with mingw} -#Provides: bundled(libFAudio) = 22.02 -#Provides: bundled(libjpeg) = 9e -#Provides: bundled(mpg123-libs) = 1.29.3 -#Provides: bundled(libtiff) = 4.3.0 +%ifarch x86_64 +Requires: mingw64-FAudio +Requires: mingw64-lcms2 +Requires: mingw64-libjpeg-turbo +Requires: mingw64-libpng +Requires: mingw64-libtiff +Requires: mingw64-libxml2 +Requires: mingw64-libxslt +Requires: mingw64-vkd3d >= 1.11 +Requires: mingw64-win-iconv +Requires: mingw64-zlib +%else +Requires: mingw32-FAudio +Requires: mingw32-lcms2 +Requires: mingw32-libjpeg-turbo +Requires: mingw32-libpng +Requires: mingw32-libtiff +Requires: mingw32-libxml2 +Requires: mingw32-libxslt +Requires: mingw32-vkd3d >= 1.11 +Requires: mingw32-win-iconv +Requires: mingw32-zlib +%endif %endif +Provides: bundled(libjpeg) = 9e +Provides: bundled(mpg123-libs) = 1.29.3 + +# removed as of 7.21 +Obsoletes: wine-openal < 7.21 +Provides: wine-openal = %{version}-%{release} # removed as of 1.7.35 Obsoletes: wine-wow < 1.7.35 Provides: wine-wow = %{version}-%{release} @@ -418,7 +309,6 @@ Provides: wine-capi = %{version}-%{release} %description core Wine core package includes the basic wine stuff needed by all other packages. -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %package systemd Summary: Systemd config for the wine binfmt handler Requires: systemd >= 23 @@ -430,18 +320,7 @@ Obsoletes: wine-sysvinit < %{version}-%{release} %description systemd Register the wine binary handler for windows executables via systemd binfmt handling. See man binfmt.d for further information. -%endif -%if 0%{?rhel} == 6 -%package sysvinit -Summary: SysV initscript for the wine binfmt handler -BuildArch: noarch -Requires(post): /sbin/chkconfig, /sbin/service -Requires(preun): /sbin/chkconfig, /sbin/service - -%description sysvinit -Register the wine binary handler for windows executables via SysV init files. -%endif %package filesystem Summary: Filesystem directories for wine @@ -464,12 +343,8 @@ Requires(post): desktop-file-utils >= 0.8 Requires(postun): desktop-file-utils >= 0.8 Requires: wine-core = %{version}-%{release} Requires: wine-common = %{version}-%{release} -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 Requires: wine-systemd = %{version}-%{release} -%endif -%if 0%{?rhel} == 6 -Requires: wine-sysvinit = %{version}-%{release} -%endif + Requires: hicolor-icon-theme BuildArch: noarch @@ -671,15 +546,8 @@ Color Management for wine %package twain Summary: Twain support for wine Requires: wine-core = %{version}-%{release} -%ifarch %{ix86} -Requires: sane-backends-libs(x86-32) -%endif -%ifarch x86_64 -Requires: sane-backends-libs(x86-64) -%endif -%ifarch %{arm} aarch64 -Requires: sane-backends-libs -%endif +Requires: sane-backends-libs%{?_isa} + %description twain Twain support for wine @@ -708,15 +576,6 @@ Requires: wine-core = %{version}-%{release} %description alsa This package adds an alsa driver for wine. -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 -%package openal -Summary: Openal support for wine -Requires: wine-core = %{version}-%{release} - -%description openal -This package adds an openal driver for wine. -%endif - %if 0%{?fedora} || 0%{?rhel} >= 8 %package opencl Summary: OpenCL support for wine @@ -728,17 +587,20 @@ This package adds the opencl driver for wine. %prep %setup -q -n wine-%{version} -%patch100 -p1 -b.cross +%patch100 -p1 -b.autoconf %patch511 -p1 -b.cjk + %if 0%{?wine_staging} # setup and apply wine-staging patches gzip -dc %{SOURCE900} | tar -xf - --strip-components=1 -patches/patchinstall.sh DESTDIR="`pwd`" --all +# https://bugs.winehq.org/show_bug.cgi?id=54868 +sed -i 's/DWORD pitch_in, DWORD pitch_out/unsigned int pitch_in, unsigned int pitch_out/' patches/wined3d-WINED3DFMT_B8G8R8X8_UNORM/0001-wined3d-Implement-WINED3DFMT_B8G8R8X8_UNORM-to-WINED.patch -# fix parallelized build -# sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in +# Fix pointer types for i686 build +%patch900 -p0 -b.staging +staging/patchinstall.py DESTDIR="`pwd`" --all -W Compiler_Warnings -W shell32-IconCache %endif # 0%%{?wine_staging} @@ -751,25 +613,24 @@ patches/patchinstall.sh DESTDIR="`pwd`" --all # recommended. # Disable LTO %define _lto_cflags %{nil} - + # disable fortify as it breaks wine # http://bugs.winehq.org/show_bug.cgi?id=24606 # http://bugs.winehq.org/show_bug.cgi?id=25073 -export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error" +%undefine _fortify_level -%ifarch aarch64 -%if 0%{?fedora} >= 33 -%global toolchain clang +%if %{with mingw} +# Disable Red Hat specs for package notes (Fedora 38+) and annobin. +# MinGW GCC does not support these options. +export LDFLAGS="$(echo "%{build_ldflags}" | sed -e 's/-Wl,-z,relro//' -e 's/-Wl,--build-id=sha1//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-package-notes//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')" +%ifarch x86_64 +export CFLAGS="$(echo "%{optflags}" | sed -e 's/-O2//' -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//') -O2" %else -# ARM64 now requires clang -# https://source.winehq.org/git/wine.git/commit/8fb8cc03c3edb599dd98f369e14a08f899cbff95 -export CC="/usr/bin/clang" -# Fedora's default compiler flags now conflict with what clang supports -# https://bugzilla.redhat.com/show_bug.cgi?id=1658311 -export CFLAGS="`echo $CFLAGS | sed -e 's/-fstack-clash-protection//'`" +export CFLAGS="$(echo "%{optflags}" | sed -e 's/-fcf-protection//' -e 's/-fstack-protector-strong//' -e 's/-fstack-clash-protection//' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//')" %endif %endif + %if 0%{?wine_staging} autoreconf -i -f %endif @@ -779,13 +640,19 @@ autoreconf -i -f --x-includes=%{_includedir} --x-libraries=%{_libdir} \ --with-dbus \ --with-x \ -%ifarch %{arm} - --with-float-abi=hard \ + --with-wayland \ + --without-oss \ +%if %{with mingw} + --with-mingw \ +%else + --without-mingw \ %endif -%{?wine_staging: --with-xattr} \ --disable-tests \ -%ifarch x86_64 aarch64 +%ifarch x86_64 --enable-win64 \ +%if %{with mingw} + --enable-archs=x86_64,i386 \ +%endif %endif @@ -803,23 +670,18 @@ make %{?_smp_mflags} TARGETFLAGS="" UPDATE_DESKTOP_DATABASE=/bin/true # setup for alternatives usage -%ifarch x86_64 aarch64 +%ifarch x86_64 +mv %{buildroot}%{_bindir}/wine %{buildroot}%{_bindir}/wine64 || : mv %{buildroot}%{_bindir}/wineserver %{buildroot}%{_bindir}/wineserver64 +mv %{buildroot}%{_bindir}/wine-preloader %{buildroot}%{_bindir}/wine64-preloader || : %endif -%ifarch %{ix86} %{arm} +%ifarch %{ix86} mv %{buildroot}%{_bindir}/wine %{buildroot}%{_bindir}/wine32 mv %{buildroot}%{_bindir}/wineserver %{buildroot}%{_bindir}/wineserver32 -# do not ship typelibs in 32-bit packages -# https://www.winehq.org/pipermail/wine-devel/2020-June/167283.html -# rm %{buildroot}%{_includedir}/wine/windows/*.tlb -%endif -%ifnarch %{arm} aarch64 x86_64 mv %{buildroot}%{_bindir}/wine-preloader %{buildroot}%{_bindir}/wine32-preloader %endif touch %{buildroot}%{_bindir}/wine -%ifnarch %{arm} touch %{buildroot}%{_bindir}/wine-preloader -%endif touch %{buildroot}%{_bindir}/wineserver mv %{buildroot}%{_libdir}/wine/%{winepedir}/dxgi.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-dxgi.dll mv %{buildroot}%{_libdir}/wine/%{winepedir}/d3d9.dll %{buildroot}%{_libdir}/wine/%{winepedir}/wine-d3d9.dll @@ -842,7 +704,7 @@ touch %{buildroot}%{_libdir}/wine/%{winesodir}/dxgi.dll.so # remove rpath chrpath --delete %{buildroot}%{_bindir}/wmc chrpath --delete %{buildroot}%{_bindir}/wrc -%ifarch x86_64 aarch64 +%ifarch x86_64 chrpath --delete %{buildroot}%{_bindir}/wine64 chrpath --delete %{buildroot}%{_bindir}/wineserver64 %else @@ -852,15 +714,9 @@ chrpath --delete %{buildroot}%{_bindir}/wineserver32 mkdir -p %{buildroot}%{_sysconfdir}/wine -# Allow users to launch Windows programs by just clicking on the .exe file... -%if 0%{?rhel} < 7 -mkdir -p %{buildroot}%{_initrddir} -install -p -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/wine -%endif -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 mkdir -p %{buildroot}%{_binfmtdir} install -p -c -m 644 %{SOURCE2} %{buildroot}%{_binfmtdir}/wine.conf -%endif + # add wine dir to desktop mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged @@ -877,7 +733,6 @@ mkdir -p %{buildroot}%{_datadir}/wine/gecko mkdir -p %{buildroot}%{_datadir}/wine/mono # extract and install icons -%if 0%{?fedora} > 10 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps # This replacement masks a composite program icon .SVG down @@ -932,8 +787,6 @@ install -p -m 644 programs/wordpad/wordpad.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg sed -i -e "$PROGRAM_ICONFIX" %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wordpad.svg -%endif - # install desktop files desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ @@ -991,11 +844,11 @@ cp -p %{SOURCE502} README-tahoma mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -%ifarch %{ix86} %{arm} +%ifarch %{ix86} install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 install -p -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ld.so.conf.d/ %endif @@ -1053,23 +906,11 @@ mkdir -p %{buildroot}/%{_metainfodir}/ install -p -m 0644 %{SOURCE150} %{buildroot}/%{_metainfodir}/%{name}.appdata.xml appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml +# install sysctl config +mkdir -p %{buildroot}/%{_sysconfdir}/sysctl.d +install -p -m 0644 %{SOURCE600} %{buildroot}/%{_sysconfdir}/sysctl.d/90-wine.conf -%if 0%{?rhel} == 6 -%post sysvinit -if [ $1 -eq 1 ]; then -/sbin/chkconfig --add wine -/sbin/chkconfig --level 2345 wine on -/sbin/service wine start &>/dev/null || : -fi -%preun sysvinit -if [ $1 -eq 0 ]; then -/sbin/service wine stop >/dev/null 2>&1 -/sbin/chkconfig --del wine -fi -%endif - -%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 %post systemd %binfmt_apply wine.conf @@ -1077,7 +918,6 @@ fi if [ $1 -eq 0 ]; then /bin/systemctl try-restart systemd-binfmt.service fi -%endif %ldconfig_post core @@ -1089,7 +929,7 @@ fi %{_sbindir}/alternatives --remove 'wine-d3d9%{?_isa}' %{_libdir}/wine/wine-d3d9.dll 2>/dev/null %{_sbindir}/alternatives --remove 'wine-d3d10%{?_isa}' %{_libdir}/wine/wine-d3d10.dll 2>/dev/null %{_sbindir}/alternatives --remove 'wine-d3d11%{?_isa}' %{_libdir}/wine/wine-d3d11.dll 2>/dev/null -%ifarch x86_64 aarch64 +%ifarch x86_64 %{_sbindir}/alternatives --install %{_bindir}/wine \ wine %{_bindir}/wine64 10 \ --slave %{_bindir}/wine-preloader wine-preloader %{_bindir}/wine64-preloader @@ -1125,7 +965,7 @@ fi %postun core %{?ldconfig} if [ $1 -eq 0 ] ; then -%ifarch x86_64 aarch64 +%ifarch x86_64 %{_sbindir}/alternatives --remove wine %{_bindir}/wine64 %{_sbindir}/alternatives --remove wineserver %{_bindir}/wineserver64 %else @@ -1146,21 +986,17 @@ fi %ldconfig_scriptlets alsa -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 -%ldconfig_scriptlets openal -%endif %files # meta package %files core -%doc ANNOUNCE +%doc ANNOUNCE.md %doc COPYING.LIB %doc LICENSE %doc LICENSE.OLD %doc AUTHORS -%doc README-FEDORA -%doc README +%doc README* %doc VERSION # do not include huge changelogs .OLD .ALPHA .BETA (#204302) %doc documentation/README.* @@ -1185,20 +1021,21 @@ fi %{_libdir}/wine/%{winepedir}/wordpad.exe %{_libdir}/wine/%{winepedir}/write.exe %{_libdir}/wine/%{winepedir}/wusa.exe +%{_sysconfdir}/sysctl.d/90-wine.conf -%ifarch %{ix86} %{arm} +%ifarch %{ix86} %{_bindir}/wine32 %{_bindir}/wine32-preloader %{_bindir}/wineserver32 %config %{_sysconfdir}/ld.so.conf.d/wine-32.conf %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 %{_bindir}/wine64 %{_bindir}/wineserver64 %config %{_sysconfdir}/ld.so.conf.d/wine-64.conf %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 %{_bindir}/wine64-preloader %endif @@ -1268,7 +1105,7 @@ fi %{_libdir}/wine/%{winepedir}/wscript.exe %{_libdir}/wine/%{winepedir}/uninstaller.exe -%{_libdir}/wine/%{winesodir}/libwine.so.1* +#%{_libdir}/wine/%{winesodir}/libwine.so.1* %{_libdir}/wine/%{winepedir}/acledit.dll %{_libdir}/wine/%{winepedir}/aclui.dll @@ -1448,10 +1285,14 @@ fi %{_libdir}/wine/%{winepedir}/icmp.dll %{_libdir}/wine/%{winepedir}/ieframe.dll %if 0%{?wine_staging} +%if %{without mingw} %{_libdir}/wine/%{winepedir}/ia2comproxy.dll +%endif %ifnarch %{ix86} +%if %{without mingw} %{_libdir}/wine/%{winesodir}/ia2comproxy.dll.so %endif +%endif #%{_libdir}/wine/%{winepedir}/iertutil.dll %endif %{_libdir}/wine/%{winepedir}/ieproxy.dll @@ -1617,10 +1458,10 @@ fi %{_libdir}/wine/%{winepedir}/ntdsapi.dll %{_libdir}/wine/%{winepedir}/ntprint.dll %if 0%{?wine_staging} -%{_libdir}/wine/%{winepedir}/nvcuda.dll -%{_libdir}/wine/%{winesodir}/nvcuda.dll.so -%{_libdir}/wine/%{winepedir}/nvcuvid.dll -%{_libdir}/wine/%{winesodir}/nvcuvid.dll.so +#%{_libdir}/wine/%{winepedir}/nvcuda.dll +#%{_libdir}/wine/%{winesodir}/nvcuda.dll.so +#%{_libdir}/wine/%{winepedir}/nvcuvid.dll +#%{_libdir}/wine/%{winesodir}/nvcuvid.dll.so %endif %{_libdir}/wine/%{winepedir}/objsel.dll %{_libdir}/wine/%{winesodir}/odbc32.so @@ -1777,7 +1618,7 @@ fi %endif %{_libdir}/wine/%{winepedir}/windows.media.devices.dll %{_libdir}/wine/%{winepedir}/windows.networking.dll -%{_libdir}/wine/%{winepedir}/windows.networking.connectivity +#%{_libdir}/wine/%{winepedir}/windows.networking.connectivity %{_libdir}/wine/%{winepedir}/windowscodecs.dll %{_libdir}/wine/%{winepedir}/windowscodecsext.dll %{_libdir}/wine/%{winepedir}/winebus.sys @@ -1787,7 +1628,9 @@ fi %{_libdir}/wine/%{winepedir}/winemapi.dll %{_libdir}/wine/%{winepedir}/wineusb.sys %{_libdir}/wine/%{winesodir}/wineusb.so +%if %{without mingw} %{_libdir}/wine/%{winesodir}/wineusb.sys.so +%endif %{_libdir}/wine/%{winesodir}/winevulkan.so %{_libdir}/wine/%{winepedir}/winevulkan.dll %{_libdir}/wine/%{winepedir}/winex11.drv @@ -1814,7 +1657,7 @@ fi %{_libdir}/wine/%{winesodir}/win32u.so %{_libdir}/wine/%{winesodir}/winebus.so %{_libdir}/wine/%{winepedir}/winexinput.sys -%{_libdir}/wine/%{winepedir}/winscard.dll +#%{_libdir}/wine/%{winepedir}/winscard.dll %{_libdir}/wine/%{winepedir}/wintab32.dll %{_libdir}/wine/%{winepedir}/wintrust.dll %{_libdir}/wine/%{winepedir}/wintypes.dll @@ -1823,21 +1666,21 @@ fi %{_libdir}/wine/%{winepedir}/wlanui.dll %{_libdir}/wine/%{winepedir}/wmphoto.dll %{_libdir}/wine/%{winepedir}/wnaspi32.dll -%ifarch x86_64 aarch64 -%{_libdir}/wine/%{winepedir}/wow64.dll -%{_libdir}/wine/%{winepedir}/wow64win.dll +%ifarch x86_64 +#%{_libdir}/wine/%{winepedir}/wow64.dll +#%{_libdir}/wine/%{winepedir}/wow64win.dll %if 0%{?extra_libs} -%{_libdir}/wine/%{winesodir}/wow64cpu.dll.so +#%{_libdir}/wine/%{winesodir}/wow64cpu.dll.so %endif %endif %if 0%{?wine_staging} %ifarch x86_64 -%{_libdir}/wine/%{winepedir}/wow64cpu.dll +#%{_libdir}/wine/%{winepedir}/wow64cpu.dll %endif %endif %{_libdir}/wine/%{winepedir}/wpc.dll -%{_libdir}/wine/%{winepedir}/wpcap.dll -%{_libdir}/wine/%{winesodir}/wpcap.so +#%{_libdir}/wine/%{winepedir}/wpcap.dll +#%{_libdir}/wine/%{winesodir}/wpcap.so %{_libdir}/wine/%{winepedir}/ws2_32.dll %{_libdir}/wine/%{winesodir}/ws2_32.so %{_libdir}/wine/%{winepedir}/wsdapi.dll @@ -1859,7 +1702,9 @@ fi %ghost %{_libdir}/wine/%{winepedir}/d3d9.dll %{_libdir}/wine/%{winepedir}/wine-d3d9.dll %{_libdir}/wine/%{winepedir}/opengl32.dll +%if %{without mingw} %{_libdir}/wine/%{winesodir}/opengl32.dll.so +%endif %{_libdir}/wine/%{winepedir}/wined3d.dll %{_libdir}/wine/%{winepedir}/dnsapi.dll %{_libdir}/wine/%{winesodir}/dnsapi.so @@ -1918,18 +1763,62 @@ fi %{_libdir}/wine/%{winesodir}/capi2032.dll.so %endif +%{_libdir}/wine/%{winepedir}/appxdeploymentclient.dll +%{_libdir}/wine/%{winepedir}/bcryptprimitives.dll +%{_libdir}/wine/%{winepedir}/certutil.exe +%{_libdir}/wine/%{winepedir}/coml2.dll +%{_libdir}/wine/%{winepedir}/d3d12core.dll +%{_libdir}/wine/%{winepedir}/dxcore.dll +%{_libdir}/wine/%{winepedir}/geolocation.dll +%{_libdir}/wine/%{winepedir}/graphicscapture.dll +%{_libdir}/wine/%{winepedir}/hrtfapo.dll +%{_libdir}/wine/%{winepedir}/hvsimanagementapi.dll +%{_libdir}/wine/%{winepedir}/ir50_32.dll +%{_libdir}/wine/%{winepedir}/klist.exe +%{_libdir}/wine/%{winepedir}/magnification.dll +%{_libdir}/wine/%{winepedir}/mouhid.sys +%{_libdir}/wine/%{winepedir}/msauddecmft.dll +%{_libdir}/wine/%{winepedir}/msmpeg2vdec.dll +%{_libdir}/wine/%{winepedir}/msttsengine.dll +%{_libdir}/wine/%{winepedir}/msvcp140_codecvt_ids.dll +%{_libdir}/wine/%{winepedir}/pnputil.exe +%{_libdir}/wine/%{winepedir}/scardsvr.dll +%{_libdir}/wine/%{winepedir}/setx.exe +%{_libdir}/wine/%{winepedir}/srvsvc.dll +%{_libdir}/wine/%{winepedir}/twinapi.appcore.dll +%{_libdir}/wine/%{winepedir}/windows.applicationmodel.dll +%{_libdir}/wine/%{winepedir}/windows.devices.bluetooth.dll +%{_libdir}/wine/%{winepedir}/windows.devices.usb.dll +%{_libdir}/wine/%{winepedir}/windows.gaming.ui.gamebar.dll +%{_libdir}/wine/%{winepedir}/windows.media.dll +%{_libdir}/wine/%{winepedir}/windows.media.mediacontrol.dll +%{_libdir}/wine/%{winepedir}/windows.networking.connectivity.dll +%{_libdir}/wine/%{winepedir}/windows.networking.hostname.dll +%{_libdir}/wine/%{winepedir}/windows.perception.stub.dll +%{_libdir}/wine/%{winepedir}/windows.security.authentication.onlineid.dll +%{_libdir}/wine/%{winepedir}/windows.security.credentials.ui.userconsentverifier.dll +%{_libdir}/wine/%{winepedir}/windows.storage.applicationdata.dll +%{_libdir}/wine/%{winepedir}/windows.system.profile.systemmanufacturers.dll +%{_libdir}/wine/%{winepedir}/windows.ui.dll +%{_libdir}/wine/%{winepedir}/winewayland.drv +%{_libdir}/wine/%{winepedir}/winprint.dll +%{_libdir}/wine/%{winepedir}/winscard.dll +%{_libdir}/wine/%{winepedir}/wldp.dll +%{_libdir}/wine/%{winepedir}/wofutil.dll +%{_libdir}/wine/%{winepedir}/xinputuap.dll + %if 0%{?wine_staging} -%ifarch x86_64 aarch64 -%{_libdir}/wine/%{winepedir}/nvapi64.dll +%ifarch x86_64 +#%{_libdir}/wine/%{winepedir}/nvapi64.dll %if 0%{?extra_libs} -%{_libdir}/wine/%{winesodir}/nvapi64.dll.so +#%{_libdir}/wine/%{winesodir}/nvapi64.dll.so %endif -%{_libdir}/wine/%{winepedir}/nvencodeapi64.dll -%{_libdir}/wine/%{winesodir}/nvencodeapi64.dll.so +#%{_libdir}/wine/%{winepedir}/nvencodeapi64.dll +#%{_libdir}/wine/%{winesodir}/nvencodeapi64.dll.so %else -%{_libdir}/wine/%{winepedir}/nvapi.dll +#%{_libdir}/wine/%{winepedir}/nvapi.dll %if 0%{?extra_libs} -%{_libdir}/wine/%{winesodir}/nvapi.dll.so +#%{_libdir}/wine/%{winesodir}/nvapi.dll.so %endif %{_libdir}/wine/%{winepedir}/nvencodeapi.dll %{_libdir}/wine/%{winesodir}/nvencodeapi.dll.so @@ -1937,7 +1826,7 @@ fi %endif # 16 bit and other non 64bit stuff -%ifnarch x86_64 %{arm} aarch64 +%ifnarch x86_64 %{_libdir}/wine/%{winepedir}/winevdm.exe %{_libdir}/wine/%{winepedir}/ifsmgr.vxd %{_libdir}/wine/%{winepedir}/mmdevldr.vxd @@ -2543,7 +2432,7 @@ fi %{_libdir}/wine/%{winesodir}/windows.media.speech.dll.so %endif %{_libdir}/wine/%{winesodir}/windows.media.devices.dll.so -%{_libdir}/wine/%{winesodir}/windows.networking.connectivity.so +#%{_libdir}/wine/%{winesodir}/windows.networking.connectivity.so %if 0%{?extra_libs} %{_libdir}/wine/%{winesodir}/windows.networking.dll.so %endif @@ -2570,11 +2459,11 @@ fi %{_libdir}/wine/%{winesodir}/wmp.dll.so %{_libdir}/wine/%{winesodir}/wmvcore.dll.so %if 0%{?extra_libs} -%{_libdir}/wine/%{winesodir}/wow64.dll.so -%{_libdir}/wine/%{winesodir}/wow64win.dll.so +#%{_libdir}/wine/%{winesodir}/wow64.dll.so +#%{_libdir}/wine/%{winesodir}/wow64win.dll.so %endif %{_libdir}/wine/%{winesodir}/spoolss.dll.so -%{_libdir}/wine/%{winesodir}/winscard.dll.so +#%{_libdir}/wine/%{winesodir}/winscard.dll.so %{_libdir}/wine/%{winesodir}/wintab32.dll.so %{_libdir}/wine/%{winesodir}/wintrust.dll.so %{_libdir}/wine/%{winesodir}/wintypes.dll.so @@ -2584,7 +2473,7 @@ fi %{_libdir}/wine/%{winesodir}/wmphoto.dll.so %{_libdir}/wine/%{winesodir}/wnaspi32.dll.so %{_libdir}/wine/%{winesodir}/wpc.dll.so -%{_libdir}/wine/%{winesodir}/wpcap.dll.so +#%{_libdir}/wine/%{winesodir}/wpcap.dll.so %{_libdir}/wine/%{winesodir}/ws2_32.dll.so %{_libdir}/wine/%{winesodir}/wsdapi.dll.so %{_libdir}/wine/%{winesodir}/wshom.ocx.so @@ -2594,9 +2483,11 @@ fi %{_libdir}/wine/%{winesodir}/wuapi.dll.so %{_libdir}/wine/%{winesodir}/wuaueng.dll.so %{_libdir}/wine/%{winesodir}/wineps.drv.so +%{_libdir}/wine/%{winesodir}/dxcore.dll.so %{_libdir}/wine/%{winesodir}/d3d8.dll.so %{_libdir}/wine/%{winesodir}/d3d8thk.dll.so %{_libdir}/wine/%{winesodir}/d3d9.dll.so +%{_libdir}/wine/%{winesodir}/d3d12core.dll.so %{_libdir}/wine/%{winesodir}/dnsapi.dll.so %{_libdir}/wine/%{winesodir}/iexplore.exe.so %{_libdir}/wine/%{winesodir}/xcopy.exe.so @@ -2644,6 +2535,55 @@ fi %{_libdir}/wine/%{winesodir}/xolehlp.dll.so %{_libdir}/wine/%{winesodir}/xpsprint.dll.so %{_libdir}/wine/%{winesodir}/xpssvcs.dll.so +%{_libdir}/wine/%{winesodir}/appxdeploymentclient.dll.so +%{_libdir}/wine/%{winesodir}/bcryptprimitives.dll.so +%{_libdir}/wine/%{winesodir}/certutil.exe.so +%{_libdir}/wine/%{winesodir}/coml2.dll.so +%{_libdir}/wine/%{winesodir}/d3d12core.dll.so +%{_libdir}/wine/%{winesodir}/dxcore.dll.so +%{_libdir}/wine/%{winesodir}/geolocation.dll.so +%{_libdir}/wine/%{winesodir}/graphicscapture.dll.so +%{_libdir}/wine/%{winesodir}/hrtfapo.dll.so +%{_libdir}/wine/%{winesodir}/hvsimanagementapi.dll.so +%{_libdir}/wine/%{winesodir}/ir50_32.dll.so +%{_libdir}/wine/%{winesodir}/klist.exe.so +%{_libdir}/wine/%{winesodir}/localspl.so +%{_libdir}/wine/%{winesodir}/magnification.dll.so +%{_libdir}/wine/%{winesodir}/mouhid.sys.so +%{_libdir}/wine/%{winesodir}/msauddecmft.dll.so +%{_libdir}/wine/%{winesodir}/msmpeg2vdec.dll.so +%{_libdir}/wine/%{winesodir}/msttsengine.dll.so +%{_libdir}/wine/%{winesodir}/msvcp140_codecvt_ids.dll.so +%{_libdir}/wine/%{winesodir}/opengl32.so +%{_libdir}/wine/%{winesodir}/pnputil.exe.so +%{_libdir}/wine/%{winesodir}/scardsvr.dll.so +%{_libdir}/wine/%{winesodir}/setx.exe.so +%{_libdir}/wine/%{winesodir}/srvsvc.dll.so +%{_libdir}/wine/%{winesodir}/twinapi.appcore.dll.so +%{_libdir}/wine/%{winesodir}/windows.applicationmodel.dll.so +%{_libdir}/wine/%{winesodir}/windows.devices.bluetooth.dll.so +%{_libdir}/wine/%{winesodir}/windows.devices.usb.dll.so +%{_libdir}/wine/%{winesodir}/windows.gaming.ui.gamebar.dll.so +%{_libdir}/wine/%{winesodir}/windows.media.dll.so +%{_libdir}/wine/%{winesodir}/windows.media.mediacontrol.dll.so +%{_libdir}/wine/%{winesodir}/windows.networking.connectivity.dll.so +%{_libdir}/wine/%{winesodir}/windows.networking.hostname.dll.so +%{_libdir}/wine/%{winesodir}/windows.perception.stub.dll.so +%{_libdir}/wine/%{winesodir}/windows.security.authentication.onlineid.dll.so +%{_libdir}/wine/%{winesodir}/windows.security.credentials.ui.userconsentverifier.dll.so +%{_libdir}/wine/%{winesodir}/windows.storage.applicationdata.dll.so +%{_libdir}/wine/%{winesodir}/windows.system.profile.systemmanufacturers.dll.so +%{_libdir}/wine/%{winesodir}/windows.ui.dll.so +%{_libdir}/wine/%{winesodir}/wineps.so +%{_libdir}/wine/%{winesodir}/winewayland.drv.so +%{_libdir}/wine/%{winesodir}/winewayland.so +%{_libdir}/wine/%{winesodir}/winprint.dll.so +%{_libdir}/wine/%{winesodir}/winscard.dll.so +%{_libdir}/wine/%{winesodir}/winscard.so +%{_libdir}/wine/%{winesodir}/wldp.dll.so +%{_libdir}/wine/%{winesodir}/wofutil.dll.so +%{_libdir}/wine/%{winesodir}/xinputuap.dll.so + %endif %files filesystem @@ -2786,23 +2726,15 @@ fi %{_datadir}/desktop-directories/Wine.directory %config %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_metainfodir}/%{name}.appdata.xml -%if 0%{?fedora} >= 10 %{_datadir}/icons/hicolor/scalable/apps/*svg -%endif -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 %files systemd %config %{_binfmtdir}/wine.conf -%endif -%if 0%{?rhel} == 6 -%files sysvinit -%{_initrddir}/wine -%endif # ldap subpackage %files ldap -%{_libdir}/wine/%{winesodir}/wldap32.so +#%{_libdir}/wine/%{winesodir}/wldap32.so %{_libdir}/wine/%{winepedir}/wldap32.dll %if 0%{?extra_libs} %{_libdir}/wine/%{winesodir}/wldap32.dll.so @@ -2875,11 +2807,6 @@ fi %{_libdir}/wine/%{winesodir}/winealsa.drv.so %endif -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 -%files openal -%{_libdir}/wine/%{winepedir}/openal32.dll -%{_libdir}/wine/%{winesodir}/openal32.dll.so -%endif %files opencl %{_libdir}/wine/%{winepedir}/opencl.dll @@ -2890,6 +2817,10 @@ fi %changelog +* Thu Apr 18 2024 Raven 9.6-1 +- version update +- remove ARM stuff from spec + * Mon Oct 17 2022 Raven 7.19-1 - version update