From a4123200c091da937dae56946a14735e0edcb67e Mon Sep 17 00:00:00 2001
From: crueter <swurl@swurl.xyz>
Date: Mon, 16 Jun 2025 03:27:06 +0000
Subject: [PATCH] fix packaging (#192)

Signed-off-by: crueter <swurl@swurl.xyz>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/192
Co-authored-by: crueter <swurl@swurl.xyz>
Co-committed-by: crueter <swurl@swurl.xyz>
---
 .ci/linux/build.sh   |  3 ---
 .ci/linux/package.sh | 41 +++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh
index b475ff6358..02d62193c5 100755
--- a/.ci/linux/build.sh
+++ b/.ci/linux/build.sh
@@ -34,9 +34,6 @@ fi
 
 if [ "$TARGET" = "appimage" ]; then
     export EXTRA_CMAKE_FLAGS=(-DCMAKE_INSTALL_PREFIX=/usr -DYUZU_ROOM=ON -DYUZU_ROOM_STANDALONE=OFF -DYUZU_CMD=OFF)
-    # Bundle required QT wayland libraries
-    export EXTRA_QT_PLUGINS="waylandcompositor"
-    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
 else
     # For the linux-fresh verification target, verify compilation without PCH as well.
     export EXTRA_CMAKE_FLAGS=(-DYUZU_USE_PRECOMPILED_HEADERS=OFF)
diff --git a/.ci/linux/package.sh b/.ci/linux/package.sh
index 8fd235a2b7..5e8c73d816 100755
--- a/.ci/linux/package.sh
+++ b/.ci/linux/package.sh
@@ -11,8 +11,8 @@ export ARCH="$BASE_ARCH"
 
 export BUILDDIR="$2"
 
-LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
-URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
+SHARUN="https://github.com/VHSgunzo/sharun/releases/latest/download/sharun-${BASE_ARCH}-aio"
+URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-${BASE_ARCH}"
 
 if [ "$ARCH" = 'x86_64' ]; then
 	if [ "$1" = 'v3' ]; then
@@ -48,22 +48,24 @@ fi
 UPINFO='gh-releases-zsync|eden-emulator|Releases|latest|*.AppImage.zsync'
 
 LIBDIR="/usr/lib"
-# some distros are weird and use a subdir
 
-if [ ! -f "/usr/lib/libGL.so" ]
+# Workaround for Gentoo
+if [ ! -d "$LIBDIR/qt6" ]
+then
+	LIBDIR="/usr/lib64"
+fi
+
+# Workaround for Debian
+if [ ! -d "$LIBDIR/qt6" ]
 then
     LIBDIR="/usr/lib/${BASE_ARCH}-linux-gnu"
 fi
 
 # Bundle all libs
 
-# temp workaround for arch being silly
-mkdir -p share/X11
-cp -r /usr/share/X11/xkb share/X11
-
-wget --retry-connrefused --tries=30 "$LIB4BN" -O ./lib4bin
-chmod +x ./lib4bin
-xvfb-run -a -- ./lib4bin -p -v -e -s -k \
+wget --retry-connrefused --tries=30 "$SHARUN" -O ./sharun-aio
+chmod +x ./sharun-aio
+xvfb-run -a ./sharun-aio l -p -v -e -s -k \
 	../$BUILDDIR/bin/eden* \
 	$LIBDIR/lib*GL*.so* \
     $LIBDIR/libSDL2*.so* \
@@ -88,14 +90,18 @@ xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	$LIBDIR/spa-0.2/*/* \
 	$LIBDIR/alsa-lib/*
 
+rm -f ./sharun-aio
+
 # Prepare sharun
 if [ "$ARCH" = 'aarch64' ]; then
-	# allow the host vulkan to be used for aarch64 given the sed situation
+	# allow the host vulkan to be used for aarch64 given the sad situation
 	echo 'SHARUN_ALLOW_SYS_VKICD=1' > ./.env
 fi
 
-wget https://github.com/VHSgunzo/sharun/releases/download/v0.6.3/sharun-x86_64 -O sharun
-chmod a+x sharun
+# Workaround for Gentoo
+if [ -d "shared/libproxy" ]; then
+	cp shared/libproxy/* lib/
+fi
 
 ln -f ./sharun ./AppRun
 ./sharun -g
@@ -121,9 +127,4 @@ echo "Generating AppImage..."
 
 echo "Generating zsync file..."
 zsyncmake *.AppImage -u *.AppImage
-echo "All Done!"
-
-# Cleanup
-
-rm -rf AppDir
-rm uruntime
+echo "All Done!"
\ No newline at end of file