Index: radix-1.9/X11/media/alsa-plugins/1.2.7.1/Makefile
===================================================================
--- radix-1.9/X11/media/alsa-plugins/1.2.7.1/Makefile (revision 208)
+++ radix-1.9/X11/media/alsa-plugins/1.2.7.1/Makefile (revision 209)
@@ -60,7 +60,8 @@
SOURCE_REQUIRES = sources/packages/m/alsa/plugins
-REQUIRES = X11/app/ffmpeg/4.4.4
+REQUIRES = media/alsa-plugins/1.2.7.1
+REQUIRES += X11/app/ffmpeg/4.4.4
REQUIRES += X11/media/pulseaudio/16.1
REQUIRES += media/libavtp/0.2.0
@@ -172,6 +173,14 @@
done ; \
rm -f 98-maemo.conf ; \
)
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_RK358X_GLIBC)),)
+ @mv $(ALSA_PLUGINS_PKG)/etc/alsa/conf.d/99-pulseaudio-default.conf.example \
+ $(ALSA_PLUGINS_PKG)/usr/share/alsa/pulse-alsa.conf
+ @cp -a $(CURDIR)/conf/pulse.conf $(ALSA_PLUGINS_PKG)/usr/share/alsa/alsa.conf.d/99-pulse.conf
+ @( cd $(ALSA_PLUGINS_PKG)/etc/alsa/conf.d ; \
+ ln -sf ../../../usr/share/alsa/alsa.conf.d/99-pulse.conf . ; \
+ )
+endif
# ======= Install Documentation =======
@if [ -d $(ALSA_PLUGINS_PKG)/usr/share/man ]; then \
( cd $(ALSA_PLUGINS_PKG)/usr/share/man ; \
Index: radix-1.9/X11/media/alsa-plugins/1.2.7.1/conf/pulse.conf
===================================================================
--- radix-1.9/X11/media/alsa-plugins/1.2.7.1/conf/pulse.conf (nonexistent)
+++ radix-1.9/X11/media/alsa-plugins/1.2.7.1/conf/pulse.conf (revision 209)
@@ -0,0 +1,18 @@
+
+# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as
+# default output for applications using alsa when pulseaudio is running.
+
+hook_func.pulse_load_if_running {
+ lib "libasound_module_conf_pulse.so"
+ func "conf_pulse_hook_load_if_running"
+}
+
+@hooks [
+ {
+ func pulse_load_if_running
+ files [
+ "/usr/share/alsa/pulse-alsa.conf"
+ ]
+ errors false
+ }
+]
Index: radix-1.9/X11/media/alsa-plugins/1.2.7.1-ppc32/Makefile
===================================================================
--- radix-1.9/X11/media/alsa-plugins/1.2.7.1-ppc32/Makefile (revision 208)
+++ radix-1.9/X11/media/alsa-plugins/1.2.7.1-ppc32/Makefile (revision 209)
@@ -16,6 +16,7 @@
SOURCE_REQUIRES = sources/packages/m/alsa/plugins
REQUIRES = X11/media/alsa-plugins/1.2.7.1
+REQUIRES += media/alsa-plugins/1.2.7.1-ppc32
REQUIRES += X11/app/ffmpeg/4.4.4-ppc32
REQUIRES += X11/media/pulseaudio/16.1-ppc32
REQUIRES += media/libavtp/0.2.0-ppc32
Index: radix-1.9/X11/media/alsa-plugins/1.2.7.1-x86_32/Makefile
===================================================================
--- radix-1.9/X11/media/alsa-plugins/1.2.7.1-x86_32/Makefile (revision 208)
+++ radix-1.9/X11/media/alsa-plugins/1.2.7.1-x86_32/Makefile (revision 209)
@@ -13,6 +13,7 @@
SOURCE_REQUIRES = sources/packages/m/alsa/plugins
REQUIRES = X11/media/alsa-plugins/1.2.7.1
+REQUIRES += media/alsa-plugins/1.2.7.1-x86_32
REQUIRES += X11/app/ffmpeg/4.4.4-x86_32
REQUIRES += X11/media/pulseaudio/16.1-x86_32
REQUIRES += media/libavtp/0.2.0-x86_32
Index: radix-1.9/X11/media/pulseaudio/16.1/Makefile
===================================================================
--- radix-1.9/X11/media/pulseaudio/16.1/Makefile (revision 208)
+++ radix-1.9/X11/media/pulseaudio/16.1/Makefile (revision 209)
@@ -73,6 +73,7 @@
REQUIRES += libs/pcre2/10.36
REQUIRES += libs/libasyncns/0.8
REQUIRES += libs/sbc/2.0
+REQUIRES += media/pulseaudio/16.1
REQUIRES += media/libsamplerate/0.1.9
REQUIRES += media/libsoxr/0.1.3
REQUIRES += media/speex/1.2.1
@@ -351,6 +352,10 @@
@mv $(PAUDIO_PKG)/etc/pulse/daemon.conf $(PAUDIO_PKG)/etc/pulse/daemon.conf.new
@mv $(PAUDIO_PKG)/etc/pulse/default.pa $(PAUDIO_PKG)/etc/pulse/default.pa.new
@mv $(PAUDIO_PKG)/etc/pulse/system.pa $(PAUDIO_PKG)/etc/pulse/system.pa.new
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_RK358X_GLIBC)),)
+ # ======= Set default pulseaudio output card =======
+ @sed -i 's,^#set-default-sink output,set-default-sink alsa_output.platform-hdmi0-sound.hdmi-stereo,' $(PAUDIO_PKG)/etc/pulse/default.pa.new
+endif
# ======= Move dbus configs to system location =======
@mkdir -p $(PAUDIO_PKG)/usr/share/dbus-1/system.d/
@mv $(PAUDIO_PKG)/etc/dbus-1/system.d/* $(PAUDIO_PKG)/usr/share/dbus-1/system.d/
Index: radix-1.9/X11/media/pulseaudio/16.1-ppc32/Makefile
===================================================================
--- radix-1.9/X11/media/pulseaudio/16.1-ppc32/Makefile (revision 208)
+++ radix-1.9/X11/media/pulseaudio/16.1-ppc32/Makefile (revision 209)
@@ -29,6 +29,7 @@
REQUIRES += libs/pcre2/10.36-ppc32
REQUIRES += libs/libasyncns/0.8-ppc32
REQUIRES += libs/sbc/2.0-ppc32
+REQUIRES += media/pulseaudio/16.1-ppc32
REQUIRES += media/libsamplerate/0.1.9-ppc32
REQUIRES += media/libsoxr/0.1.3-ppc32
REQUIRES += media/speex/1.2.1-ppc32
Index: radix-1.9/X11/media/pulseaudio/16.1-x86_32/Makefile
===================================================================
--- radix-1.9/X11/media/pulseaudio/16.1-x86_32/Makefile (revision 208)
+++ radix-1.9/X11/media/pulseaudio/16.1-x86_32/Makefile (revision 209)
@@ -26,6 +26,7 @@
REQUIRES += libs/pcre2/10.36-x86_32
REQUIRES += libs/libasyncns/0.8-x86_32
REQUIRES += libs/sbc/2.0-x86_32
+REQUIRES += media/pulseaudio/16.1-x86_32
REQUIRES += media/libsamplerate/0.1.9-x86_32
REQUIRES += media/libsoxr/0.1.3-x86_32
REQUIRES += media/speex/1.2.1-x86_32
Index: radix-1.9/base/radix-system/Makefile
===================================================================
--- radix-1.9/base/radix-system/Makefile (revision 208)
+++ radix-1.9/base/radix-system/Makefile (revision 209)
@@ -160,6 +160,9 @@
@chmod 0755 $(SYSINIT_BIN_PKG)/root/bin/cpan-{,un}install.new
# ======= Common /etc files =======
@cp -a $(source_etc)/skel $(SYSINIT_BIN_PKG)/etc/
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_RK358X_GLIBC)),)
+ @sed -i '/^feh/a \\nkillall pulseaudio && /usr/bin/pulseaudio --start &' $(SYSINIT_BIN_PKG)/etc/skel/.config/openbox/autostart
+endif
ifeq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_JZ47XX_GLIBC) $(TOOLCHAIN_P5600_GLIBC) \
$(TOOLCHAIN_POWER8_GLIBC) $(TOOLCHAIN_POWER9_GLIBC) \
$(TOOLCHAIN_POWER8LE_GLIBC) $(TOOLCHAIN_POWER9LE_GLIBC) \
Index: radix-1.9/media/alsa-lib/1.2.8/Makefile
===================================================================
--- radix-1.9/media/alsa-lib/1.2.8/Makefile (revision 208)
+++ radix-1.9/media/alsa-lib/1.2.8/Makefile (revision 209)
@@ -235,6 +235,13 @@
@cp -a $(CURDIR)/conf/asound.conf.alsa $(ALSA_LIB_PKG)/etc/asound.conf.new
@cp -a $(CURDIR)/conf/asound.conf.pulse $(ALSA_LIB_PKG)/etc/asound.conf.pulse
@chmod 644 $(ALSA_LIB_PKG)/etc/asound.conf.new $(ALSA_LIB_PKG)/etc/asound.conf.pulse
+ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_RK358X_GLIBC)),)
+ # ======= Install HDMI-OUT card =======
+ @cp -a $(CURDIR)/cards/HDMI-OUT.conf $(ALSA_LIB_PKG)/usr/share/alsa/cards/
+ @( cd $(ALSA_LIB_PKG)/usr/share/alsa/cards ; \
+ sed -i '/^VC4-HDMI cards.vc4-hdmi/a rockchip-hdmi0 cards.HDMI-OUT' aliases.conf ; \
+ )
+endif
# ======= remove toolchain path from target libtool *.la files =======
@( cd $(ALSA_LIB_PKG)/usr/lib$(LIBSUFFIX) ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libasound.la libatopology.la ; \
Index: radix-1.9/media/alsa-lib/1.2.8/cards/HDMI-OUT.conf
===================================================================
--- radix-1.9/media/alsa-lib/1.2.8/cards/HDMI-OUT.conf (nonexistent)
+++ radix-1.9/media/alsa-lib/1.2.8/cards/HDMI-OUT.conf (revision 209)
@@ -0,0 +1,32 @@
+#
+# configuration for HDMI connection which just expose the audio out device
+#
+
+<confdir:pcm/hdmi.conf>
+
+HDMI-OUT.pcm.hdmi.0 {
+ @args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ]
+ @args.CARD {
+ type string
+ }
+ @args.DEVICE {
+ type integer
+ }
+ @args.CTLINDEX {
+ type integer
+ }
+ @args.AES0 {
+ type integer
+ }
+ @args.AES1 {
+ type integer
+ }
+ @args.AES2 {
+ type integer
+ }
+ @args.AES3 {
+ type integer
+ }
+ type hw
+ card $CARD
+}