From 3e4cddad17b55d5ee13f41436bddf7ea52107107 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 5 Oct 2021 13:05:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8=20pipewire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-merge/media-sound/alsa-utils/calculate.env | 8 +++----- .../1-merge/media-sound/pulseaudio/calculate.env | 9 --------- .../1-merge/media-sound/pulseaudio/client.conf | 4 ---- .../1-merge/media-video/pipewire/.calculate_directory | 1 + .../media-video/pipewire/99-pipewire-default.conf | 2 ++ .../media-video/pipewire/99-pipewire-default.conf.remove | 2 ++ .../1-merge/media-video/pipewire/pipewire.desktop | 9 +++++++++ profiles/templates/3.6/6_ac_install_configure/audio | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/.calculate_directory create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env index 42c94a182..3ff75c8c2 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/alsa-utils/calculate.env @@ -1,9 +1,7 @@ -# Calculate path=/var/lib/calculate format=samba os_audio==alsa +# Calculate path=/var/lib/calculate format=samba [install] -os_audio = alsa -#?cl_ver>=3.6.0.12# -#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils:3)>=3.6.0.12# +os_audio = #-os_audio-# +#?os_audio_card_default!=# os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-# #os_audio_card_default# -#cl_ver# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env deleted file mode 100644 index 9ffa73689..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/calculate.env +++ /dev/null @@ -1,9 +0,0 @@ -# Calculate path=/var/lib/calculate format=samba os_audio==pulseaudio - -[install] -os_audio = pulseaudio -#?cl_ver>=3.6.0.12# -#?os_audio_card_default!=&&pkg(sys-apps/calculate-utils:3)>=3.6.0.12# -os_audio_hw = #-os_audio_card_default-#,#-os_audio_device_default-# -#os_audio_card_default# -#cl_ver# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf index 67cb7dcb1..9d097827e 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-sound/pulseaudio/client.conf @@ -1,7 +1,3 @@ # Calculate format=postfix -#?os_audio==pulseaudio# -autospawn = yes -#!os_audio# autospawn = no -#os_audio# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/.calculate_directory new file mode 100644 index 000000000..95f15012e --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/.calculate_directory @@ -0,0 +1 @@ +# Calculate mergepkg()!= append=skip diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf new file mode 100644 index 000000000..235bb818f --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf @@ -0,0 +1,2 @@ +# Calculate path=/etc/alsa/conf.d link=/usr/share/alsa/alsa.conf.d/99-pipewire-default.conf mirror os_audio==pulseaudio + diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove new file mode 100644 index 000000000..e86de81c7 --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove @@ -0,0 +1,2 @@ +# Calculate path=/etc/alsa/conf.d name=99-pipewire-default.conf os_audio==alsa + diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop new file mode 100644 index 000000000..9b3e28a53 --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/pipewire.desktop @@ -0,0 +1,9 @@ +# Calculate format=kde path=/etc/xdg/autostart +[Desktop Entry] +#?os_audio==pulseaudio# +!Hidden= +!OnlyShowIn= +#!os_audio# +Hidden=true +OnlyShowIn= +#os_audio# diff --git a/profiles/templates/3.6/6_ac_install_configure/audio b/profiles/templates/3.6/6_ac_install_configure/audio index 67153b4f4..fbbfb6027 100644 --- a/profiles/templates/3.6/6_ac_install_configure/audio +++ b/profiles/templates/3.6/6_ac_install_configure/audio @@ -1 +1 @@ -# Calculate merge=media-sound/alsa-utils,media-sound/pulseaudio,kde-plasma/plasma-pa,kde-apps/kmix,media-sound/volumeicon,media-sound/pavucontrol,media-sound/qastools,media-plugins/alsa-plugins,net-wireless/bluez cl_setup==audio||cl_setup== append=skip +# Calculate merge=kde-apps/kmix,kde-plasma/plasma-pa,media-libs/libsdl,media-plugins/alsa-plugins,media-sound/alsa-utils,media-sound/pavucontrol,media-sound/pulseaudio,media-sound/qastools,media-sound/volumeicon,media-video/pipewire,net-wireless/bluez cl_setup==audio||cl_setup== append=skip