public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Do not read ~/.asoundrc by default
@ 2026-09-11 14:43 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-09-11 14:43 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 92d682ab44a5bd32081a8369cc478cea50927c76
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-03-02T21:13:16-05:00
            Stats  : +12/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/92d682ab44a5bd32081a8369cc478cea50927c76?branch=f45

            Log:
            Do not read ~/.asoundrc by default

The user host configuration (which would be readable when --filesystem=home
is used) is likely to be wrong inside of a flatpak.  Also, ignore user-set
ALSA_CONFIG_* environment variables for the same reason.

https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/857

---
diff --git a/container-sdk.in.yaml b/container-sdk.in.yaml
index 6da6cd3..71bb1a3 100644
--- a/container-sdk.in.yaml
+++ b/container-sdk.in.yaml
@@ -6,6 +6,8 @@ flatpak:
     branch: @RELEASE@
     runtime: @ID_PREFIX@.Platform
     finish-args: >
+        --env=ALSA_CONFIG_DIR=/usr/share/alsa
+        --env=ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf
         --env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0
         --env=GST_PLUGIN_SYSTEM_PATH=/app/lib64/gstreamer-1.0:/usr/lib64/gstreamer-1.0
         --env=LUA_PATH="/app/share/lua/5.4/?.lua;/app/share/lua/5.4/?/init.lua;/app/lib64/lua/5.4/?.lua;/app/lib64/lua/5.4/?/init.lua;;"
@@ -49,6 +51,10 @@ flatpak:
         cat /etc/ld.so.conf.d/*.conf > /etc/ld.so.conf
         rm -f /etc/ld.so.conf.d/*.conf
 
+        # User ALSA configuration can conflict with flatpak setup
+        # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/857
+        sed -e '/~\/\.asoundrc/d' -e 's|/alsa/asoundrc|/asound.conf|' /usr/share/alsa/alsa.conf
+
         # Create a directory for mounting extension points
         mkdir -p /usr/lib64/GL
         mkdir -p /usr/lib64/openh264

diff --git a/container.in.yaml b/container.in.yaml
index cb7fcfe..e5a7187 100644
--- a/container.in.yaml
+++ b/container.in.yaml
@@ -6,6 +6,8 @@ flatpak:
     branch: @RELEASE@
     sdk: @ID_PREFIX@.Sdk
     finish-args: >
+        --env=ALSA_CONFIG_DIR=/usr/share/alsa
+        --env=ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf
         --env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0
         --env=GST_PLUGIN_SYSTEM_PATH=/app/lib64/gstreamer-1.0:/usr/lib64/gstreamer-1.0
         --env=LUA_PATH="/app/share/lua/5.4/?.lua;/app/share/lua/5.4/?/init.lua;/app/lib64/lua/5.4/?.lua;/app/lib64/lua/5.4/?/init.lua;;"
@@ -50,6 +52,10 @@ flatpak:
         cat /etc/ld.so.conf.d/*.conf > /etc/ld.so.conf
         rm -f /etc/ld.so.conf.d/*.conf
 
+        # User ALSA configuration can conflict with flatpak setup
+        # https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/issues/857
+        sed -e '/~\/\.asoundrc/d' -e 's|/alsa/asoundrc|/asound.conf|' /usr/share/alsa/alsa.conf
+
         # Create a directory for mounting extension points
         mkdir -p /usr/lib64/GL
         mkdir -p /usr/lib64/openh264

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-11 14:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 14:43 [flatpaks/flatpak-runtime] f45: Do not read ~/.asoundrc by default Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox