diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py index d778e6f8df..b266476515 100644 --- a/hardware/emulator/wine/actions.py +++ b/hardware/emulator/wine/actions.py @@ -29,11 +29,6 @@ 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 \ @@ -78,9 +73,9 @@ def install(): shelltools.cd("build-wine") if get.buildTYPE() == "emul32": - 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())) + 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())) else: - 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())) + 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())) shelltools.cd("..") diff --git a/hardware/emulator/wine/pspec.xml b/hardware/emulator/wine/pspec.xml index e2893e9bc5..04d2745854 100755 --- a/hardware/emulator/wine/pspec.xml +++ b/hardware/emulator/wine/pspec.xml @@ -2,7 +2,7 @@ - wine-staging + wine http://www.winehq.org/ PisiLinux Community @@ -10,19 +10,19 @@ LGPLv2.1 app:console - WINE Is Not An Emulator, which lets you run Microsoft Windows applications - staging version. + wine + WINE Is Not An Emulator, which lets you run Microsoft Windows applications 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/8.x/wine-8.18.tar.xz - https://github.com/wine-staging/wine-staging/archive/refs/tags/v8.17.1.tar.gz - mit-kerberos-devel + mit-kerberos lcms2-devel libao-devel libSM-devel mpg123-devel openal-devel - openssl-devel libusb-devel + openssl-devel libsdl2-devel libv4l-devel libXext-devel @@ -34,6 +34,7 @@ gstreamer-devel openldap-client libgphoto2-devel + libunwind-devel pulseaudio-libs-devel gst-plugins-base-devel @@ -61,7 +62,7 @@ gettext-devel giflib-devel v4l-utils - libpng-devel + libpng libtevent-devel @@ -81,21 +82,21 @@ 0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch - - wine-staging + wine app:gui - wine-staging-32bit + wine-32bit + winetricks lcms2 - vkd3d libX11 libSM + vkd3d mpg123 openal libusb @@ -131,12 +132,6 @@ libpcap libunwind - - - - - wine - /etc/xdg /usr/bin @@ -149,6 +144,8 @@ /usr/share/man + + winetricks wisotool @@ -164,20 +161,17 @@ menu/wine-oleview.desktop menu/wine-winemine.desktop + + wine-staging + - wine-staging-devel + wine-devel Wine development environment - wine-staging + wine - - - - - wine-devel - /usr/bin/function_grep.pl /usr/bin/widl @@ -199,19 +193,34 @@ /usr/share/man/man1/wmc.1 /usr/share/man/man1/wrc.1 + + wine-staging-devel + - - wine-staging-32bit + + + 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 emul32 32-bit shared libraries for wine emul32 zlib-32bit glib2-32bit - lcms2-32bit vkd3d-32bit - libusb-32bit + lcms2-32bit libSM-32bit p11-kit-32bit giflib-32bit @@ -227,6 +236,7 @@ mesa-glu-32bit openldap-32bit ncurses-32bit + libunwind-32bit libXrandr-32bit libXdamage-32bit libXxf86vm-32bit @@ -240,10 +250,8 @@ zlib-32bit - eudev-32bit - lcms2-32bit vkd3d-32bit - libusb-32bit + lcms2-32bit libSM-32bit libX11-32bit mpg123-32bit @@ -254,6 +262,7 @@ mesa-glu-32bit openldap-32bit gsm-32bit + eudev-32bit cups-32bit tiff-32bit libXi-32bit @@ -276,46 +285,205 @@ libjpeg-turbo-32bit pulseaudio-libs-32bit - - - - - wine-32bit - /usr/lib32/libwine.so* /usr/lib32/wine + + wine-staging-32bit + - + 2023-10-14 8.18 Version bump. Mustafa Cinasal muscnsl@gmail.com - + 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 - Kamil Atlı - suvari@pisilinux.org + 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 + + + 2016-07-11 + 1.9.14 + Version bump + Ergün Salman + poyraz76@pisilinux.org - 2022-04-02 - 7.5 - Version bump - Kamil Atlı - suvari@pisilinux.org + 2016-07-09 + 1.9.13 + missing fixes release + Ergün Salman + poyraz76@pisilinux.org - 2020-06-04 - 5.9 + 2016-07-02 + 1.9.13 First release - Idris Kalp - idriskalp@gmail.com + Ergün Salman + poyraz76@pisilinux.org