From a0d045577310598c0bb8cd57a41ebe6236e36e39 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sun, 25 Sep 2022 13:51:57 +0300
Subject: [PATCH] wine-staging-7.18

---
 hardware/emulator/wine-staging/actions.py |  5 +++--
 hardware/emulator/wine-staging/pspec.xml  | 25 ++++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

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 @@
         <IsA>app:console</IsA>
         <Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications - staging version.</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="9259bb87a53436b00660d38f773053a1c5a4f682" type="tarxz">https://dl.winehq.org/wine/source/7.x/wine-7.5.tar.xz</Archive>
-		<Archive sha1sum="1931c3cbd9b9893e56985148c0bcb0bc04d9f26e" type="targz" target="wine-7.5">https://github.com/wine-staging/wine-staging/archive/refs/tags/v7.5.tar.gz</Archive>
+        <Archive sha1sum="469a09017a67539773228cb369543e4dd240a30d" type="tarxz">https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz</Archive>
+		<Archive sha1sum="621367abae6a3cb3e9adbc34ccce24bb85c9eec5" type="targz" target="wine-7.18">https://github.com/wine-staging/wine-staging/archive/refs/tags/v7.18.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>mit-kerberos-devel</Dependency>
             <Dependency>lcms2-devel</Dependency>
@@ -22,6 +22,7 @@
             <Dependency>mpg123-devel</Dependency>
             <Dependency>openal-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
+            <Dependency>libusb-devel</Dependency>
             <Dependency>libsdl2-devel</Dependency>
             <Dependency>libv4l-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
@@ -38,6 +39,7 @@
 
             <!-- Libraries used with dlopen() -->
             <Dependency>cups-devel</Dependency>
+            <Dependency>vkd3d-devel</Dependency>
             <Dependency>gnutls-devel</Dependency>
             <Dependency>gnutls-32bit</Dependency>
             <Dependency>libXcursor-devel</Dependency>
@@ -91,10 +93,12 @@
         <RuntimeDependencies>
             <Dependency version="current">wine-staging-32bit</Dependency>
             <Dependency>lcms2</Dependency>
+            <Dependency>vkd3d</Dependency>
             <Dependency>libX11</Dependency>
             <Dependency>libSM</Dependency>
             <Dependency>mpg123</Dependency>
             <Dependency>openal</Dependency>
+            <Dependency>libusb</Dependency>
             <Dependency>libXext</Dependency>
             <Dependency>mesa-glu</Dependency>
             <Dependency>alsa-lib</Dependency>
@@ -128,7 +132,7 @@
             <Dependency>libunwind</Dependency>
         </RuntimeDependencies>
 		<Replaces>
-            <Package>wine</Package>
+<!--             <Package>wine</Package> -->
         </Replaces>
         <Conflicts>
             <Package>wine</Package>
@@ -169,7 +173,7 @@
             <Dependency version="current">wine-staging</Dependency>
         </RuntimeDependencies>
 		<Replaces>
-            <Package>wine-devel</Package>
+<!--             <Package>wine-devel</Package> -->
         </Replaces>
         <Conflicts>
             <Package>wine-devel</Package>
@@ -206,6 +210,8 @@
             <Dependency>zlib-32bit</Dependency>
             <Dependency>glib2-32bit</Dependency>
             <Dependency>lcms2-32bit</Dependency>
+            <Dependency>vkd3d-32bit</Dependency>
+            <Dependency>libusb-32bit</Dependency>
             <Dependency>libSM-32bit</Dependency>
             <Dependency>p11-kit-32bit</Dependency>
             <Dependency>giflib-32bit</Dependency>
@@ -236,6 +242,8 @@
             <Dependency>zlib-32bit</Dependency>
             <Dependency>eudev-32bit</Dependency>
             <Dependency>lcms2-32bit</Dependency>
+            <Dependency>vkd3d-32bit</Dependency>
+            <Dependency>libusb-32bit</Dependency>
             <Dependency>libSM-32bit</Dependency>
             <Dependency>libX11-32bit</Dependency>
             <Dependency>mpg123-32bit</Dependency>
@@ -269,7 +277,7 @@
             <Dependency>pulseaudio-libs-32bit</Dependency>
         </RuntimeDependencies>
 		<Replaces>
-            <Package>wine-32bit</Package>
+<!--             <Package>wine-32bit</Package> -->
         </Replaces>
         <Conflicts>
             <Package>wine-32bit</Package>
@@ -281,6 +289,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2022-09-25</Date>
+            <Version>7.18</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2022-04-02</Date>
             <Version>7.5</Version>