diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py
index e67080d3bc..14b2c16e4b 100644
--- a/hardware/emulator/wine/actions.py
+++ b/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("..")
diff --git a/hardware/emulator/wine/pspec.xml b/hardware/emulator/wine/pspec.xml
index 9446593bb0..33f6546dbf 100755
--- a/hardware/emulator/wine/pspec.xml
+++ b/hardware/emulator/wine/pspec.xml
@@ -13,7 +13,7 @@
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/9.x/wine-9.22.tar.xz
+ https://dl.winehq.org/wine/source/11.x/wine-11.4.tar.xz
git
mit-kerberos-devel
@@ -36,6 +36,7 @@
openldap-client
libgphoto2-devel
libunwind-devel
+ ffmpeg-devel
pulseaudio-libs-devel
gst-plugins-base-devel
@@ -126,6 +127,7 @@
p11-kit
libxml2
giflib
+ ffmpeg
ncurses
cups
@@ -243,6 +245,7 @@
tiff-32bit
libSM-32bit
libXi-32bit
+ libusb-32bit
p11-kit-32bit
giflib-32bit
libpng-32bit
@@ -290,6 +293,7 @@
openldap-32bit
gsm-32bit
eudev-32bit
+ libusb-32bit
cups-32bit
tiff-32bit
libXi-32bit
@@ -317,6 +321,8 @@
/usr/lib32/libwine.so*
/usr/lib32/wine
+ /usr/lib/wine/i386-unix
+ /usr/lib/wine/i386-windows
wine-staging-32bit
@@ -324,6 +330,13 @@
+
+ 2026-03-07
+ 11.4
+ Version bump.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2024-12-30
9.22