Merge pull request #18324 from Rmys/master

wine-11.4

hardware/emulator/wine/actions.py

@@ -44,12 +44,14 @@ def setup():
 
     if get.buildTYPE() == "emul32":
         shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") 
+        shelltools.export("CC", "gcc -m32")
+        shelltools.export("CXX", "g++ -m32")
         options += " --with-wine64=%s/work/wine-%s/build-wine \
-                     --libdir=/usr/lib32 \
+                     --libdir=/usr/lib \
                    " % (get.pkgDIR(), get.srcVERSION())
                    
-        shelltools.system("mkdir build-wine")
-        shelltools.cd("build-wine")
+        shelltools.system("mkdir build-wine-32")
+        shelltools.cd("build-wine-32")
         shelltools.system(". ../configure %s" %options)
         
     elif get.ARCH() == "x86_64":
@@ -63,18 +65,27 @@ def setup():
 
 
 def build():
-    shelltools.cd("build-wine")
-    autotools.make()
+    if not get.buildTYPE() == "emul32":
+        shelltools.cd("build-wine")
+        autotools.make()
+
+    if get.buildTYPE() == "emul32":
+        shelltools.cd("build-wine-32")
+        autotools.make()
 
 def install():
     # We need especially specify libdir and dlldir prefixes. Otherwise the
     # 32bit parts overwrite the 64bit files under /usr/lib
     
-    shelltools.cd("build-wine")
+    # 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()))
+        shelltools.cd("build-wine-32")
+        # 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("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()))
+
     else:
+        shelltools.cd("build-wine")
         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("..")

hardware/emulator/wine/pspec.xml

@@ -13,7 +13,7 @@
         <Icon>wine</Icon>
         <Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications</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="5ea8e766533c4e97e015a98f7d28872b1fdd966e" type="tarxz">https://dl.winehq.org/wine/source/9.x/wine-9.22.tar.xz</Archive>
+        <Archive sha1sum="3472fcc15564635df4e9e51176f6814c62732b80" type="tarxz">https://dl.winehq.org/wine/source/11.x/wine-11.4.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
             <Dependency>mit-kerberos-devel</Dependency>
@@ -36,6 +36,7 @@
             <Dependency>openldap-client</Dependency>
             <Dependency>libgphoto2-devel</Dependency>
             <Dependency>libunwind-devel</Dependency>
+            <Dependency>ffmpeg-devel</Dependency>
             <Dependency>pulseaudio-libs-devel</Dependency>
             <Dependency>gst-plugins-base-devel</Dependency>
 
@@ -126,6 +127,7 @@
             <Dependency>p11-kit</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>giflib</Dependency>
+            <Dependency>ffmpeg</Dependency>
             <Dependency>ncurses</Dependency>
             <!-- Libraries used with dlopen() -->
             <Dependency>cups</Dependency>
@@ -243,6 +245,7 @@
             <Dependency>tiff-32bit</Dependency>
             <Dependency>libSM-32bit</Dependency>
             <Dependency>libXi-32bit</Dependency>
+            <Dependency>libusb-32bit</Dependency>
             <Dependency>p11-kit-32bit</Dependency>
             <Dependency>giflib-32bit</Dependency>
             <Dependency>libpng-32bit</Dependency>
@@ -290,6 +293,7 @@
             <Dependency>openldap-32bit</Dependency>
             <Dependency>gsm-32bit</Dependency>
             <Dependency>eudev-32bit</Dependency>
+            <Dependency>libusb-32bit</Dependency>
             <Dependency>cups-32bit</Dependency>
             <Dependency>tiff-32bit</Dependency>
             <Dependency>libXi-32bit</Dependency>
@@ -317,6 +321,8 @@
         <Files>
             <Path fileType="library">/usr/lib32/libwine.so*</Path>
             <Path fileType="library">/usr/lib32/wine</Path>
+            <Path fileType="library">/usr/lib/wine/i386-unix</Path>
+            <Path fileType="library">/usr/lib/wine/i386-windows</Path>
         </Files>
         <Conflicts>
             <Package>wine-staging-32bit</Package>
@@ -324,6 +330,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2026-03-07</Date>
+            <Version>11.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="25">
             <Date>2024-12-30</Date>
             <Version>9.22</Version>