From 2efe56a38f71162797fd6ef0eb7a5ecbf9a2e3f5 Mon Sep 17 00:00:00 2001
From: Asahi Lina <lina@asahilina.net>
Date: Tue, 12 Nov 2024 19:01:04 +0900
Subject: teams/asahi: FEX: Clean up some redundant FEX packages

ibus: This is an input method, which is a user choice. It doesn't make
sense to ship some input method libs and not others. These libs
typically communicate with the main IM daemon over UNIX sockets, so this
won't work anyway without additional work. (This might cause some
spurious errors as the guest tries to load the nonexistent IM, but we
can ignore them since it wouldn't work anyway).

xdg-desktop-portal: This is just data and executables, no libraries, so
it makes no sense for FEX.

glibc-langpack-en, kbd-misc: Only needed for kiwi, add a comment

zenity: Used by Steam but it's just a binary, so this should be an
aarch64 dependency, not run emulated.

llvm 14 & 15: I don't think there's a good reason to ship these? Any
reasonable binary-packaged app shouldn't be depending on specific LLVM
versions like this. Let's keep llvm18 & 19 since 18 is used by our Mesa
builds.

sudo & rsync: Binaries only (and sudo doesn't even work, neither under
emulation nor plain in muvm).

dbus: What we really need is the libs, so replace with that. dbus
probably won't do what we want inside the container, but for many use
cases dbus is not critical so it's okay for things to fail as long as
the libs are there.

spirv-tools-devel: Replace with spirv-tools-libs (dep)
glew-devel: Replace with libGLEW (dep)
---
 teams/asahi.xml | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

(limited to 'teams')

diff --git a/teams/asahi.xml b/teams/asahi.xml
index 4f07625..ddd8de2 100644
--- a/teams/asahi.xml
+++ b/teams/asahi.xml
@@ -15,16 +15,16 @@
 	<packages type="bootstrap" profiles="FEX-RootFS">
 		<package name="dnf5-plugins"/>
 		<package name="util-linux-core"/>
-		<package name="sudo"/>
-		<package name="rsync"/>
 		<package name="glibc.x86_64"/>
 		<package name="glibc.i686"/>
-		<package name="dbus"/>
+		<package name="dbus-libs.x86_64"/>
+		<package name="dbus-libs.i686"/>
 		<package name="systemd.x86_64"/>
 		<package name="systemd.i686"/>
 		<package name="systemd-libs.x86_64"/>
 		<package name="systemd-libs.i686"/>
-		<package name="pulseaudio.x86_64"/>
+		<package name="pulseaudio-libs.x86_64"/>
+		<package name="pulseaudio-libs.i686"/>
 		<package name="mesa-libGL.x86_64"/>
 		<package name="mesa-libGL.i686"/>
 		<package name="mesa-libEGL.x86_64"/>
@@ -84,8 +84,8 @@
 		<package name="pciutils"/>
 		<package name="libpciaccess.x86_64"/>
 		<package name="libpciaccess.x86_64"/>
-		<package name="glew-devel.x86_64"/>
-		<package name="glew-devel.i686"/>
+		<package name="libGLEW.x86_64"/>
+		<package name="libGLEW.i686"/>
 		<package name="libX11-xcb.x86_64"/>
 		<package name="libX11-xcb.i686"/>
 		<package name="xcb-util.x86_64"/>
@@ -124,16 +124,12 @@
 		<package name="clang18-libs.i686"/>
 		<package name="llvm-libs.x86_64"/>
 		<package name="llvm-libs.i686"/>
-		<package name="llvm14-libs.x86_64"/>
-		<package name="llvm14-libs.i686"/>
-		<package name="llvm15-libs.x86_64"/>
-		<package name="llvm15-libs.i686"/>
 		<package name="llvm18-libs.x86_64"/>
 		<package name="llvm18-libs.i686"/>
 		<package name="libclc.x86_64"/>
 		<package name="libclc.i686"/>
-		<package name="spirv-tools-devel.x86_64"/>
-		<package name="spirv-tools-devel.i686"/>
+		<package name="spirv-tools-libs.x86_64"/>
+		<package name="spirv-tools-libs.i686"/>
 		<package name="spirv-llvm-translator.x86_64"/>
 		<package name="spirv-llvm-translator.i686"/>
 		<package name="harfbuzz.x86_64"/>
@@ -146,10 +142,6 @@
 		<package name="fuse-libs.i686"/>
 		<package name="fuse3-libs.x86_64"/>
 		<package name="fuse3-libs.i686"/>
-		<package name="ibus-libs.x86_64"/>
-		<package name="ibus-libs.i686"/>
-		<package name="ibus-gtk4.x86_64"/>
-		<package name="ibus-gtk4.i686"/>
 		<package name="mangohud.x86_64"/>
 		<package name="mangohud.i686"/>
 		<package name="nss.x86_64"/>
@@ -162,11 +154,7 @@
 		<package name="openssl-libs.i686"/>
 		<package name="curl"/>
 		<package name="xterm"/>
-		<package name="zenity"/>
 		<package name="xz"/>
-		<package name="xdg-desktop-portal.x86_64"/>
-		<package name="xdg-desktop-portal.i686"/>
-		<package name="xdg-desktop-portal-gtk"/>
 		<package name="wine.x86_64"/>
 		<package name="wine.i686"/>
 		<package name="vulkan-tools"/>
@@ -176,8 +164,8 @@
 		<package name="pkgconf.i686"/>
 		<package name="clinfo"/>
 		<package name="gobject-introspection"/>
-		<package name="kbd-misc"/>
-		<package name="glibc-langpack-en"/>
+		<package name="kbd-misc"/> <!-- needed by kiwi -->
+		<package name="glibc-langpack-en"/> <!-- needed by kiwi -->
 		<package name="zlib-ng.x86_64"/>
 		<package name="zlib-ng.i686"/>
 		<package name="libxslt.x86_64"/>
-- 
cgit v1.3.1+13