[PR PATCH] [WIP] wine: add aarch64 packaging

[PR PATCH] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is a new pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5056 bytes --]

From 3d628de14a76d98e164cb3095ad3691170c8231d Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 83 +++++++++++++++++++++++++++++++------------
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..00142380d05fc6 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -21,12 +21,18 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*)
+	build_options="staging xshm"
+	build_options_default="xshm"
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +55,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +67,14 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=_64bit_configure_args
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +82,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw true false) ]; then
+	hostmakedepends+=" ${makedepends} lld clang llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +139,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw true false) ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
@@ -152,16 +187,18 @@ wine-common_package() {
 	}
 }
 
-wine-tools_package() {
-	depends="wine-${version}_${revision}"
-	short_desc+=" - development tools"
-	if [ "${_nopie}" = yes ]; then
-		nopie=yes
-	fi
-	pkg_install() {
-		for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
-		do
-			vmove usr/bin/${file}
-		done
+if [ ! "$CROSS_BUILD" ] && [ ! $(vopt_if mingw true false)]; then
+	wine-tools_package() {
+		depends="wine-${version}_${revision}"
+		short_desc+=" - development tools"
+		if [ "${_nopie}" = yes ]; then
+			nopie=yes
+		fi
+		pkg_install() {
+			for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
+			do
+				vmove usr/bin/${file}
+			done
+		}
 	}
-}
+fi

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573398058

Comment:
```suggestion
if [ "$CROSS_BUILD" ] && [ "$build_option_mingw" ]; then
```
pretty sure what you had would always evaluate true

also, put the conditional inside the function

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573398208

Comment:
do *not* optionally define a subpackage like this. use the `subpackages` variable

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573397841

Comment:
```suggestion
build_options="mingw staging xshm"
build_options_default="xshm"
case "$XBPS_TARGET_MACHINE" in
	aarch64*) ;;
	*) build_options_default+=" mingw" ;;
esac
```

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573398091

Comment:
same thing

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5058 bytes --]

From 3f224176543f1193da68ab9ef8727cb656770099 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 83 +++++++++++++++++++++++++++++++------------
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..8379bc8d1384cf 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -21,12 +21,18 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*)
+	build_options="staging xshm"
+	build_options_default="xshm"
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +55,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +67,14 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +82,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw true false) ]; then
+	hostmakedepends+=" ${makedepends} lld clang llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +139,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw true false) ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
@@ -152,16 +187,18 @@ wine-common_package() {
 	}
 }
 
-wine-tools_package() {
-	depends="wine-${version}_${revision}"
-	short_desc+=" - development tools"
-	if [ "${_nopie}" = yes ]; then
-		nopie=yes
-	fi
-	pkg_install() {
-		for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
-		do
-			vmove usr/bin/${file}
-		done
+if [ ! "$CROSS_BUILD" ] && [ ! $(vopt_if mingw true false)]; then
+	wine-tools_package() {
+		depends="wine-${version}_${revision}"
+		short_desc+=" - development tools"
+		if [ "${_nopie}" = yes ]; then
+			nopie=yes
+		fi
+		pkg_install() {
+			for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
+			do
+				vmove usr/bin/${file}
+			done
+		}
 	}
-}
+fi

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067779211

Comment:
Great work! Was on my TODO list but schedule too full, can't wait it to test it on my pi.

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573401717

Comment:
```suggestion
	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
```
Use a specific version of clang and lld to match the llvm version

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New review comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573401855

Comment:
Mingw should be reversed 
`if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw false true) ]; then`
then
`if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then`

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067781195

Comment:
By the way, the FEX emulator they spoke of in the commit logs of 9.0, is it installed separately in the wine prefix?

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 4568 bytes --]

From 090e4795bfc489dea1fee76344fffb62f0d27c2f Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 64 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..245bc65bb26eca 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ ! "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+="wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +142,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ $(vopt_if mingw true false) ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 4564 bytes --]

From 4d135798302a70a506c6a530c2d7db69738a235c Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 64 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..8f8f81c86d4a03 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ ! "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+="wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +142,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 4565 bytes --]

From c9132e1c03b3073499906f005c0dc83dd81ec959 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 64 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..197b6f92df9230 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ ! "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +142,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ ! "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573422567

Comment:
that's not how `test` works, you need to use `-z` for that

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573423307

Comment:
```suggestion
if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
```

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067787708

Comment:
> By the way, the FEX emulator they spoke of in the commit logs of 9.0, is it installed separately in the wine prefix?

If it has wow64 support, then wine is able to work with fex. I'm not sure is this version supports wow64. I haven't figured it out

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067787919

Comment:
I think we should add wayland support with `--with-wayland` flag

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 4867 bytes --]

From 18e16ad3a62bd214e9af4254edee5ced0e3034be Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 66 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..48d4e456bb7b8b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +142,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067787919

Comment:
Added wayland support with `--with-wayland` globally

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 4886 bytes --]

From 3509bb540cae2473f5d1a0b06f1615d02a010a1d Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 66 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..0326155574d270 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,25 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +142,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067787919

Comment:
Added wayland support with `--with-wayland` globally; wayland-devel libxkbcommon-devel as makedepends

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 740 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067789419

Comment:
Hmm, will that allow for users to run wine with the experimental wayland support, or will it completely replace the x11 client? In the latter case maybe we should wait it out.

Could be a separate PR too if it isn't related with this.

And by WoW64 you mean the new version released in wine 9.0? With built-in support for 32bit binaries? If so, that's only enabled for musl currently, as it's also experimental. Musl had no 32bit wine so it was a good candidate to test. Would be great if people that use it reported if they had any issues so we could get going with applying it to glibc too.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 976 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067795453

Comment:
> Hmm, will that allow for users to run wine with the experimental wayland support, or will it completely replace the x11 client? In the latter case maybe we should wait it out.

First saying is right. To prove it: take a look at https://github.com/wine-mirror/wine/blob/166895ae3ad3890ad946a309d0fd85e89ea3630e/configure.ac#L62 It says: build without wayland driver. It means --with-wayland only adds wayland support to build
> And by WoW64 you mean the new version released in wine 9.0? With built-in support for 32bit binaries? If so, that's only enabled for musl currently, as it's also experimental. Musl had no 32bit wine so it was a good candidate to test. 
> Would be great if people that use it reported if they had any issues so we could get going with applying it to glibc too.

Yes. That would be sweeet :)

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067800099

Comment:
Let's wait to see what Helmut has to say on this. But maybe we should just wait for the wine team to report it as stable and feature-complete.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 448 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067801689

Comment:
> Let's wait to see what Helmut has to say on this. But maybe we should just wait for the wine team to report it as stable and feature-complete.

I'm ok with deleting it. Somehow clang build doesn't work without wayland-devel. So I thought addding wayland support would be a reasonable addition

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5000 bytes --]

From 0cdff158755d51b18b04463ff47e0226d7948069 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 69 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..58aa3b907488f8 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,28 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+= "cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +145,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [PR REVIEW] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New review comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#discussion_r1573448789

Comment:
Added to speed up building wine-tools for cross

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5000 bytes --]

From 8f2349fe5e336bc1a5da46803b3a3e5796df70b0 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Sun, 21 Apr 2024 01:45:17 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 69 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0e2b07d222c1e0..3ffc3352a45a94 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) no_cross=yes # TODO: testing
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,11 +85,28 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+=" cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
 	makedepends+=" cross-i686-w64-mingw32"
 fi
@@ -113,12 +145,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067818234

Comment:
Ah I don't mind, could probably be a separate PR/commit though.

That's just my take, we shall wait to see what Helmut and the rest have to say :).

Re: [WIP] wine: add aarch64 packaging

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067917706

Comment:
My understanding of https://gitlab.winehq.org/wine/wine/-/releases/wine-9.0#wayland-driver is that even if wine is built with the wayland driver, it needs to be manually enabled to use it. So I would say, let's build with it and let the people who want to try try it now.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 914 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067924157

Comment:
Last build messages
```2024-04-20T23:27:02.1089756Z    Stripped library: /usr/lib}/wine/aarch64-unix/wpcap.so
2024-04-20T23:27:02.1385459Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stFkt5Hx/stWgD4tY/atl.dll: warning: line number table read failed
2024-04-20T23:27:02.1388137Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stEbrjT4: file truncated
2024-04-20T23:27:02.1412601Z [1m[31m=> ERROR: wine-9.6_2: failed to strip /usr/lib}/wine/aarch64-windows/libatl.a
```
I do need help with:

- [ ] Fixing this stripping
- [ ] Building wine-tools
OR
- [ ] Add cross-aarch64-mingw -clang/gnu package. Can't find a way to build something like this

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067924157

Comment:
Last build messages
```2024-04-20T23:27:02.1089756Z    Stripped library: /usr/lib}/wine/aarch64-unix/wpcap.so
2024-04-20T23:27:02.1385459Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stFkt5Hx/stWgD4tY/atl.dll: warning: line number table read failed
2024-04-20T23:27:02.1388137Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stEbrjT4: file truncated
2024-04-20T23:27:02.1412601Z [1m[31m=> ERROR: wine-9.6_2: failed to strip /usr/lib}/wine/aarch64-windows/libatl.a
```
I do need help with:

- [ ] Fixing this stripping
- [ ] Building wine-tools
OR
- [ ] Add cross-aarch64-mingw -clang/gnu package (aarch64-w64-mingw32-clang/aarch64-w64-mingw32-gcc). Can't find a way to build something like this

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067941915

Comment:
Experimental aarch64-w64-mingw32-gcc: https://github.com/Windows-on-ARM-Experiments/mingw-woarm64
Should we try it?

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2068059784

Comment:
@Hoshpak So, I opened a PR to merge updating to wine 9.7 with these commits in @iFoundSilentHouse repo, let us know whether you think we should merge them individually(by merging #49956 as it is, then this one) or whether we should go ahead with the merging of the two by updating this PR. Reference: https://github.com/iFoundSilentHouse/void-packages/pull/1

Re: [PR PATCH] [Closed]: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]

There's a closed pull request on the void-packages repository

[WIP] wine: add aarch64 packaging
https://github.com/void-linux/void-packages/pull/49943

Description:
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5098 bytes --]

From 01bc3086edd439a2b3edc9ba9d0f002ba266d3ba Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Mon, 22 Apr 2024 14:08:41 +0600
Subject: [PATCH] wine: add aarch64 packaging; enable wayland support

---
 srcpkgs/wine/template | 71 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..cd319c92c50514 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64*) nostrip=yes # Doesn't work with aarch64-windows files
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,13 +85,32 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+=" cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
-	makedepends+=" cross-i686-w64-mingw32"
+	if [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
+		makedepends+=" cross-i686-w64-mingw32"
+	fi
 fi
 
 _wine_libexec="/usr/libexec/wine"
@@ -113,12 +147,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069051372

Comment:
Can anyone please tell me why nostrip variable didn't work?

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5068 bytes --]

From 4b82b8c73c00e0520de735f543527ca099f1a1d5 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Mon, 22 Apr 2024 14:08:41 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 71 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..508b907b09f0ba 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,19 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
+case "$XBPS_MACHINE" in
+	aarch64) configure_args+=" --enable-archs=i386,x86_64" ;;
+esac
+
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,13 +85,32 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+=" cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
-	makedepends+=" cross-i686-w64-mingw32"
+	if [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
+		makedepends+=" cross-i686-w64-mingw32"
+	fi
 fi
 
 _wine_libexec="/usr/libexec/wine"
@@ -113,12 +147,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069051372

Comment:
Can anyone please tell me why nostrip variable didn't work?

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) compilation (see below)
* minor tweaks for aarch64 building
* added wayland support

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) post-install phase fail with `file truncated`
2) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 5113 bytes --]

From cc2dad11f87fed8d7b61ba1c27c480d43a694d8c Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Mon, 22 Apr 2024 14:08:41 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 70 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..4f8ba885c0c273 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -61,8 +65,14 @@ replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
+subpackages="wine-devel wine-common"
+if [ -z "$CROSS_BUILD" ] || [ "$build_option_mingw" ]; then
+	subpackages+=" wine-tools"
+fi
+
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,13 +80,36 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+=" cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then
+	# build with WoW64 support for aarch64
+	configure_args+=" --enable-archs=i386,x86_64"
+fi
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
-	makedepends+=" cross-i686-w64-mingw32"
+	if [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
+		makedepends+=" cross-i686-w64-mingw32"
+	fi
 fi
 
 _wine_libexec="/usr/libexec/wine"
@@ -113,12 +146,21 @@ post_install() {
 	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
 	vbin ${FILESDIR}/wine
 	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
+	if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+		# do not install wine-tools for target - they were not compiled
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	else
+		for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
+			winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
+			winegcc winemaker wmc wrc function_grep.pl
+		do
+			mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
+		done
+	fi
 	case $XBPS_TARGET_MACHINE in
 		x86_64*)
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069080967

Comment:
Trying to build with WoW64 support for all aarch64 archs now sinse stripping passed with aarch64-musl after building with `--enable-archs=i386,x86_64`
If it won't work, I'll just disable stripping.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069202421

Comment:
**Aarch64 stripping phase has no errors only if wine built with WoW64 support**

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069202421

Comment:
**Aarch64 cross building stripping phase has no errors only if wine built with WoW64 support**

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069233759

Comment:
Time to start testing. @Hoshpak , would you mind adding `needs-testing` label to thist PR?

> can't wait it to test it on my pi.
@fvalasiad can you test it please? Btw, it'd be more helpful to cross-build and `sudo xbps-install --rootdir /where/rpi/sd/mounted/`. I can send already built xbps'es to your email if you want.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069233759

Comment:
Time to start testing. @Hoshpak , would you mind adding `needs-testing` label to thist PR?

> can't wait it to test it on my pi.

@fvalasiad can you test it please? Btw, it'd be more helpful to cross-build and `sudo xbps-install --rootdir /where/rpi/sd/mounted/`. I can send already built xbps'es to your email if you want.

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069233759

Comment:
Time to start testing. @Hoshpak , would you mind adding `needs-testing` label to thist PR?

> can't wait it to test it on my pi.

@fvalasiad can you test it please? Btw, it'd be more helpful to cross-build and `sudo xbps-install --rootdir /where/rpi/sd/mounted/`. I can send already built xbps'es to your email if you want.

And I will test it with qemu

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069233759

Comment:
Time to start testing. @Hoshpak , would you mind adding `needs-testing` label to thist PR?

> can't wait it to test it on my pi.

@fvalasiad can you test it please? Btw, it'd be more helpful to cross-build and `sudo xbps-install --rootdir /where/rpi/sd/mounted/`. Or just install within booted rpi sd. I can send already built xbps'es to your email if you want.

And I will test it with qemu

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069233759

Comment:
Time to start testing. @Hoshpak , would you mind adding `needs-testing` label to thist PR?

> can't wait it to test it on my pi.

@fvalasiad can you test it please? Btw, it'd be more helpful to cross-build and `sudo xbps-install --rootdir /where/rpi/sd/mounted/`. Or just install cross-built binaries within booted rpi. I can send already built xbps'es to your email if you want.

And I will test it with qemu

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067924157

Comment:
Last build messages
```2024-04-20T23:27:02.1089756Z    Stripped library: /usr/lib}/wine/aarch64-unix/wpcap.so
2024-04-20T23:27:02.1385459Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stFkt5Hx/stWgD4tY/atl.dll: warning: line number table read failed
2024-04-20T23:27:02.1388137Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stEbrjT4: file truncated
2024-04-20T23:27:02.1412601Z [1m[31m=> ERROR: wine-9.6_2: failed to strip /usr/lib}/wine/aarch64-windows/libatl.a
```
I do need help with:

- [x] Fixing this stripping
- [ ] Building wine-tools
OR
- [ ] Add cross-aarch64-mingw -clang/gnu package (aarch64-w64-mingw32-clang/aarch64-w64-mingw32-gcc). Can't find a way to build something like this

Re: [WIP] wine: add aarch64 packaging

[zlice]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069417782

Comment:
Has anyone been able to get wayland to run games? I tried wayland again a bit back and had errors with vulkan side stuff not being there. Thought it was my intel gpu but switched back to amd and had the same thing.

Was literally just searching about running x86 games on arm or another arch, then happened to see this.

Re: [WIP] wine: add aarch64 packaging

[zlice]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069417782

Comment:
Has anyone been able to get native wine+wayland to run games? I tried wayland again a bit back and had errors with vulkan side stuff not being there. Thought it was my intel gpu but switched back to amd and had the same thing.

Was literally just searching about running x86 games on arm or another arch, then happened to see this.

Re: [WIP] wine: add aarch64 packaging

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2070155251

Comment:
@iFoundSilentHouse label added

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2070205711

Comment:
> Has anyone been able to get native wine+wayland to run games? I tried wayland again a bit back and had errors with vulkan side stuff not being there. Thought it was my intel gpu but switched back to amd and had the same thing.
> 
> Was literally just searching about running x86 games on arm or another arch, then happened to see this.

Personally I haven't. There may be a lot of things with build configuration. 1) Wine should be built with --with-wayland 2) It should be build with equivalent of vulkan-loader package 3) All vulkan firmware packages should be installed 4) WoW64 support should be enabled with --enable-archs=i386,x86_64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2070205711

Comment:
> Has anyone been able to get native wine+wayland to run games? I tried wayland again a bit back and had errors with vulkan side stuff not being there. Thought it was my intel gpu but switched back to amd and had the same thing.
> 
> Was literally just searching about running x86 games on arm or another arch, then happened to see this.

Hi @zlice , personally I haven't. There may be a lot of things with build configuration. 1) Wine should be built with --with-wayland 2) It should be build with equivalent of vulkan-loader package 3) All vulkan firmware packages should be installed 4) WoW64 support should be enabled with --enable-archs=i386,x86_64

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2070205711

Comment:
> Has anyone been able to get native wine+wayland to run games? I tried wayland again a bit back and had errors with vulkan side stuff not being there. Thought it was my intel gpu but switched back to amd and had the same thing.
> 
> Was literally just searching about running x86 games on arm or another arch, then happened to see this.

Hi @zlice , personally I haven't. There may be a lot of things with build configuration. 1) Wine should be built with --with-wayland 2) It should be built with equivalent of vulkan-loader package 3) All vulkan firmware packages should be installed 4) WoW64 support should be enabled with --enable-archs=i386,x86_64

Re: [WIP] wine: add aarch64 packaging

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2070836314

Comment:
@iFoundSilentHouse Hey! Really unfortunate timing, I am on a business trip as part of my new employment, will be off until I return 27/04/2024!

I will also be getting a work laptop so I did not carry any computer of my own other than the pinephone. Maybe I could setup a void chroot there and try to run wine! It's an aarch64 PC depending on how you look at it so it should work.

I could probably SSH into my home machine and cross compile for aarch64 but yes it'd be convenient if you instead just mailed me the xbps package.

Re: [PR PATCH] [Updated] [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 1384 bytes --]

There is an updated pull request by iFoundSilentHouse against master on the void-packages repository

https://github.com/iFoundSilentHouse/void-packages wine-9.6
https://github.com/void-linux/void-packages/pull/49943

[WIP] wine: add aarch64 packaging
What was added:
* aarch64 as new arch
* mingw is disabled as build option when target is aarch64 (there's no mingw cross package for aarch64)
* added wayland-devel, lld, clang, llvm17, when compiling cross without mingw. Added wayland-devel as member of makedepends. Clang build doesn't work without this. Not sure whether it's right place.
* wine-tools is disabled with no-mingw (clang) cross compilation (see below)
* minor tweaks for aarch64 building
* added wayland support
* added WoW64 support for aarch64 (see https://github.com/void-linux/void-packages/pull/49943#issuecomment-2069202421)

- I tested the changes in this PR: **NO**

Needs testing:
- [ ] 1) Native aarch64 testing with -Q build
- [ ] 2) Cross-built x86>aarch64 binaries
- [ ] 3) Cross-built aarch64>x86 binaries

- I built this PR locally for these architectures:
  - aarch64 (cross)
  - aarch64-musl (cross)
Build-install was successful but:
1) haven't figured out how to build wine-tools when cross-compiling with clang

@Hoshpak  @fvalasiad 

A patch file from https://github.com/void-linux/void-packages/pull/49943.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-9.6-49943.patch --]
[-- Type: text/x-diff, Size: 3736 bytes --]

From b34be60d51d9ab89e05a40f46148989d63453fc9 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Mon, 22 Apr 2024 14:08:41 +0600
Subject: [PATCH] wine: add aarch64 packaging

---
 srcpkgs/wine/template | 44 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..68409a7e614918 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,12 +1,12 @@
 # Template file for 'wine'
 pkgname=wine
 version=9.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
 build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm)"
+configure_args="--bindir=/usr/libexec/wine $(vopt_with xshm) --with-wayland"
 short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
@@ -18,15 +18,19 @@ checksum="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
-
 build_options="mingw staging xshm"
-build_options_default="mingw xshm"
+build_options_default="xshm"
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) ;;
+	*) build_options_default+=" mingw" ;;
+esac
+
 desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
 desc_option_staging="Apply the wine-staging patchset"
 desc_option_xshm="Enable support for the X Shared Memory Extension"
 
 lib32mode=full
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 
 patch_args="-Np1 --directory=${build_wrksrc}"
 
@@ -49,7 +53,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  freetype-devel pulseaudio-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
  libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
- SDL2-devel"
+ SDL2-devel wayland-devel libxkbcommon-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision}"
@@ -62,7 +66,8 @@ replaces="libwine>=0"
 make_check=extended
 
 if [ "$XBPS_TARGET_WORDSIZE" != 32 ]; then
-	configure_args+=" --enable-win64 --libdir=/usr/lib"
+	_64bit_configure_args=" --enable-win64 --libdir=/usr/lib"
+	configure_args+=$_64bit_configure_args}
 	_wine_suffix="64"
 	_wineserver_suffix=${_wine_suffix}
 else
@@ -70,13 +75,36 @@ else
 	CFLAGS=" -D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 fi
 
+if [ "$CROSS_BUILD" ] && [ -z "$build_option_mingw" ]; then
+	case "$XBPS_MACHINE" in
+		x86_64*|i686*) hostmakedepends+=" cross-${XBPS_MACHINE%-musl}-w64-mingw32" ;;
+	esac
+	hostmakedepends+=" ${makedepends} lld17 clang17 llvm17"
+	pre_configure() {
+		# native compilation for wine-tools
+		vsrcextract -C ../wine-tools-for-cross wine-${_pkgver}.tar.xz
+		cd ../wine-tools-for-cross
+		env CC=cc LD=ld CXX=g++ \
+			CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+			./configure $_64bit_configure_args # not set if 32bit
+		make ${makejobs}
+		configure_args+=" --with-wine-tools=../wine-tools-for-cross --enable-tools"
+	}
+fi
+
 if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then
+	# build with WoW64 support for aarch64
+	configure_args+=" --enable-archs=i386,x86_64"
+fi
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" --enable-archs=i386,x86_64"
-	makedepends+=" cross-i686-w64-mingw32"
+	if [ "$XBPS_TARGET_MACHINE" != aarch64-musl ]; then
+		makedepends+=" cross-i686-w64-mingw32"
+	fi
 fi
 
 _wine_libexec="/usr/libexec/wine"

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067924157

Comment:
Last build messages
```2024-04-20T23:27:02.1089756Z    Stripped library: /usr/lib}/wine/aarch64-unix/wpcap.so
2024-04-20T23:27:02.1385459Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stFkt5Hx/stWgD4tY/atl.dll: warning: line number table read failed
2024-04-20T23:27:02.1388137Z /usr/bin/aarch64-linux-gnu-strip: /destdir/aarch64-linux-gnu/wine-9.6/usr/lib}/wine/aarch64-windows/stEbrjT4: file truncated
2024-04-20T23:27:02.1412601Z [1m[31m=> ERROR: wine-9.6_2: failed to strip /usr/lib}/wine/aarch64-windows/libatl.a
```
I do need help with:

- [x] Fixing this stripping
- [x] Building wine-tools
OR
- [ ] Add cross-aarch64-mingw -clang/gnu package (aarch64-w64-mingw32-clang/aarch64-w64-mingw32-gcc). Can't find a way to build something like this

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2071693507

Comment:
julliard from WineHQ irc helped me with finding `--enable-tools` configure flag that forces tools building. Now we have aarch64 wine-tools package

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2067941915

Comment:
Experimental aarch64-w64-mingw32-gcc: https://github.com/Windows-on-ARM-Experiments/mingw-woarm64
Should we try it?

Re: [WIP] wine: add aarch64 packaging

[iFoundSilentHouse]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

New comment by iFoundSilentHouse on void-packages repository

https://github.com/void-linux/void-packages/pull/49943#issuecomment-2077817979

Comment:
Everything failes on qemu. There's empty system32 directory so even wineboot, notepad fail; wow64 fail with linking to misterious /usr/lib}/wine/aarch64-unix/ntdll.dll.so