diff --git a/hardware/emulator/wine-staging/actions.py b/hardware/emulator/wine-staging/actions.py
index f8678da336..d778e6f8df 100755
--- a/hardware/emulator/wine-staging/actions.py
+++ b/hardware/emulator/wine-staging/actions.py
@@ -43,6 +43,7 @@ def setup():
--with-dbus \
--with-opengl \
--with-alsa \
+ --prefix=/usr \
--with-x \
"
@@ -77,9 +78,9 @@ def install():
shelltools.cd("build-wine")
if get.buildTYPE() == "emul32":
- autotools.install("UPDATE_DESKTOP_DATABASE=/bin/true libdir=%s/usr/lib32 dlldir=%s/usr/lib32/wine" % (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("UPDATE_DESKTOP_DATABASE=/bin/true libdir=%s/usr/lib dlldir=%s/usr/lib/wine" % (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-staging/pspec.xml b/hardware/emulator/wine-staging/pspec.xml
index e687c301a0..57dc99a2a5 100755
--- a/hardware/emulator/wine-staging/pspec.xml
+++ b/hardware/emulator/wine-staging/pspec.xml
@@ -12,8 +12,8 @@
app:console
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.5.tar.xz
- https://github.com/wine-staging/wine-staging/archive/refs/tags/v7.5.tar.gz
+ https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz
+ https://github.com/wine-staging/wine-staging/archive/refs/tags/v7.18.tar.gz
mit-kerberos-devel
lcms2-devel
@@ -22,6 +22,7 @@
mpg123-devel
openal-devel
openssl-devel
+ libusb-devel
libsdl2-devel
libv4l-devel
libXext-devel
@@ -38,6 +39,7 @@
cups-devel
+ vkd3d-devel
gnutls-devel
gnutls-32bit
libXcursor-devel
@@ -91,10 +93,12 @@
wine-staging-32bit
lcms2
+ vkd3d
libX11
libSM
mpg123
openal
+ libusb
libXext
mesa-glu
alsa-lib
@@ -128,7 +132,7 @@
libunwind
- wine
+
wine
@@ -169,7 +173,7 @@
wine-staging
- wine-devel
+
wine-devel
@@ -206,6 +210,8 @@
zlib-32bit
glib2-32bit
lcms2-32bit
+ vkd3d-32bit
+ libusb-32bit
libSM-32bit
p11-kit-32bit
giflib-32bit
@@ -236,6 +242,8 @@
zlib-32bit
eudev-32bit
lcms2-32bit
+ vkd3d-32bit
+ libusb-32bit
libSM-32bit
libX11-32bit
mpg123-32bit
@@ -269,7 +277,7 @@
pulseaudio-libs-32bit
- wine-32bit
+
wine-32bit
@@ -281,6 +289,13 @@
+
+ 2022-09-25
+ 7.18
+ Version bump
+ Kamil Atlı
+ suvari@pisilinux.org
+
2022-04-02
7.5