From 550e745fc3a6cd4c1ba1127c23810385454d1a35 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 14 Oct 2023 20:30:37 +0300 Subject: [PATCH] wine ver. bump --- hardware/emulator/wine/actions.py | 9 +- hardware/emulator/wine/pspec.xml | 273 ++++++------------------------ 2 files changed, 63 insertions(+), 219 deletions(-) diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py index b266476515..d778e6f8df 100644 --- a/hardware/emulator/wine/actions.py +++ b/hardware/emulator/wine/actions.py @@ -29,6 +29,11 @@ def setup(): #pisitools.flags.add("-fno-omit-frame-pointer") #shelltools.system("sed -i 's|OpenCL/opencl.h|CL/opencl.h|g' configure*") + shelltools.cd("wine-staging-%s" %get.srcVERSION()) + shelltools.system("./patches/patchinstall.sh DESTDIR=.. --all") + shelltools.cd("..") + + autotools.autoreconf("-vif") options = "--without-capi \ --without-oss \ @@ -73,9 +78,9 @@ def install(): shelltools.cd("build-wine") if get.buildTYPE() == "emul32": - autotools.install("LDCONFIG=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib32 dlldir=%s/usr/lib32/wine" % (get.installDIR(), get.installDIR(), get.installDIR())) + autotools.install("UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib32 dlldir=%s/usr/lib32/wine" % (get.installDIR(), get.installDIR(), get.installDIR())) else: - autotools.install("LDCONFIG=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib dlldir=%s/usr/lib/wine" % (get.installDIR(), get.installDIR(), get.installDIR())) + autotools.install("UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib dlldir=%s/usr/lib/wine" % (get.installDIR(), get.installDIR(), get.installDIR())) shelltools.cd("..") diff --git a/hardware/emulator/wine/pspec.xml b/hardware/emulator/wine/pspec.xml index 1e7516740c..e2893e9bc5 100755 --- a/hardware/emulator/wine/pspec.xml +++ b/hardware/emulator/wine/pspec.xml @@ -2,7 +2,7 @@ - wine + wine-staging http://www.winehq.org/ PisiLinux Community @@ -10,19 +10,19 @@ LGPLv2.1 app:console - wine - WINE Is Not An Emulator, which lets you run Microsoft Windows applications + WINE Is Not An Emulator, which lets you run Microsoft Windows applications - staging version. Wine allows running Windows 3.*, Windows 95/98 and Windows NT programs on a i386 (or compatible) machine running X11. It is still alpha level code; don't expect everything to work. - https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz + https://dl.winehq.org/wine/source/8.x/wine-8.18.tar.xz + https://github.com/wine-staging/wine-staging/archive/refs/tags/v8.17.1.tar.gz - mit-kerberos + mit-kerberos-devel lcms2-devel libao-devel libSM-devel mpg123-devel openal-devel - libusb-devel openssl-devel + libusb-devel libsdl2-devel libv4l-devel libXext-devel @@ -34,7 +34,6 @@ gstreamer-devel openldap-client libgphoto2-devel - libunwind-devel pulseaudio-libs-devel gst-plugins-base-devel @@ -62,7 +61,7 @@ gettext-devel giflib-devel v4l-utils - libpng + libpng-devel libtevent-devel @@ -82,21 +81,21 @@ 0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch + - wine + wine-staging app:gui - wine-32bit - winetricks + wine-staging-32bit lcms2 + vkd3d libX11 libSM - vkd3d mpg123 openal libusb @@ -132,6 +131,12 @@ libpcap libunwind + + + + + wine + /etc/xdg /usr/bin @@ -144,8 +149,6 @@ /usr/share/man - - winetricks wisotool @@ -161,17 +164,20 @@ menu/wine-oleview.desktop menu/wine-winemine.desktop - - wine-staging - - wine-devel + wine-staging-devel Wine development environment - wine + wine-staging + + + + + wine-devel + /usr/bin/function_grep.pl /usr/bin/widl @@ -193,34 +199,19 @@ /usr/share/man/man1/wmc.1 /usr/share/man/man1/wrc.1 - - wine-staging-devel - - - - winetricks - winetricks is a helper script to download and install various redistributable runtime libraries needed to run some programs in Wine. - - zenity - - - /usr/bin/winetricks - /usr/share/applications/winetricks.desktop - - - - - wine-32bit + + wine-staging-32bit emul32 32-bit shared libraries for wine emul32 zlib-32bit glib2-32bit - vkd3d-32bit lcms2-32bit + vkd3d-32bit + libusb-32bit libSM-32bit p11-kit-32bit giflib-32bit @@ -236,7 +227,6 @@ mesa-glu-32bit openldap-32bit ncurses-32bit - libunwind-32bit libXrandr-32bit libXdamage-32bit libXxf86vm-32bit @@ -250,8 +240,10 @@ zlib-32bit - vkd3d-32bit + eudev-32bit lcms2-32bit + vkd3d-32bit + libusb-32bit libSM-32bit libX11-32bit mpg123-32bit @@ -262,7 +254,6 @@ mesa-glu-32bit openldap-32bit gsm-32bit - eudev-32bit cups-32bit tiff-32bit libXi-32bit @@ -285,198 +276,46 @@ libjpeg-turbo-32bit pulseaudio-libs-32bit + + + + + wine-32bit + /usr/lib32/libwine.so* /usr/lib32/wine - - wine-staging-32bit - - - 2022-09-25 - 7.18 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-09-23 - 7.17 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2020-06-03 - 5.9 - Version bump. - İdris Kalp - idriskalp@gmail.com - - - 2019-09-30 - 4.17 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-03-03 - 4.3 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2019-01-23 - 4.0 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2018-11-25 - 3.21 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2018-08-29 - 3.14 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2018-07-11 - 3.12 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2018-05-23 - 3.8 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2018-04-23 - 3.6 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2017-12-24 - 2.22 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2017-05-28 - 2.9 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2017-01-29 - 2.0 - Version bump. - Stefan Gronewold - groni@pisilinux.org - - - 2016-09-13 - 1.9.18 - - - Support for multiple kernel drivers in a single process. - - More WebServices reader support. - - Various improvements in joystick support. - - Some more work towards the Direct3D command stream. - - GDI performance improvements. - - Improved IME window handling. - - Compatibility fixes in the clipboard support. - - Various bug fixes. - - Ergün Salman - poyraz76@pisilinux.org - - - 2016-08-22 - 1.9.17 - - -Better exception handling on 64-bit. - -Various improvements in joystick support. - -Some more stream support in the C++ runtime. - -Font embedding improvements. - -More metafile support in GDI+. - -Various bug fixes. - - Ergün Salman - poyraz76@pisilinux.org - - - 2016-08-15 - 1.9.16 - - -Better 64-bit binary compatibility on macOS. - -Performance improvements in JavaScript. - -More progress towards the Direct3D command stream. - -More shader instructions in Direct3D. - -Performance improvements in GDI. - -Various bug fixes. - - Ergün Salman - poyraz76@pisilinux.org - - - 2016-07-23 - 1.9.15 - Bugs fixed in 1.9.15 (total 22). - Ergün Salman - poyraz76@pisilinux.org - - 2016-07-11 - 1.9.14 - - -Pisilinux Fixed Options. - -More Shader Model 5 support in Direct3D. - -Some more write support in WebServices. - -Performance improvements in GDI. - -Some more progress towards the Direct3D command stream. - -Various bug fixes. - Ergün Salman - poyraz76@pisilinux.org + 2023-10-14 + 8.18 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com - 2016-07-11 - 1.9.14 + 2022-09-25 + 7.18 Version bump - Ergün Salman - poyraz76@pisilinux.org + Kamil Atlı + suvari@pisilinux.org - 2016-07-09 - 1.9.13 - missing fixes release - Ergün Salman - poyraz76@pisilinux.org + 2022-04-02 + 7.5 + Version bump + Kamil Atlı + suvari@pisilinux.org - 2016-07-02 - 1.9.13 + 2020-06-04 + 5.9 First release - Ergün Salman - poyraz76@pisilinux.org + Idris Kalp + idriskalp@gmail.com