From d9bd5f96a2bd82d773cf2cfe02a835dd07da6b60 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 26 Apr 2024 09:16:40 +0200 Subject: [PATCH] feat: add alsa-plugins --- configs/recalbox-odroidgo2_defconfig | 1 + configs/recalbox-odroidxu4_defconfig | 1 + configs/recalbox-rg353x_defconfig | 1 + configs/recalbox-rpi1_defconfig | 1 + configs/recalbox-rpi3_defconfig | 1 + configs/recalbox-rpi4_64_defconfig | 1 + configs/recalbox-rpi5_64_defconfig | 1 + configs/recalbox-rpizero2_defconfig | 1 + configs/recalbox-rpizero2legacy_defconfig | 1 + configs/recalbox-x86_64_defconfig | 1 + custom/list.hash | 2 + custom/package/alsa-plugins/Config.in | 9 +++++ custom/package/alsa-plugins/Config.in.patch | 12 ++++++ custom/package/alsa-plugins/alsa-plugins.mk | 38 +++++++++++++++++++ .../alsa-plugins/alsa-plugins.mk.patch | 30 +++++++++++++++ 15 files changed, 101 insertions(+) create mode 100644 custom/package/alsa-plugins/Config.in create mode 100644 custom/package/alsa-plugins/Config.in.patch create mode 100644 custom/package/alsa-plugins/alsa-plugins.mk create mode 100644 custom/package/alsa-plugins/alsa-plugins.mk.patch diff --git a/configs/recalbox-odroidgo2_defconfig b/configs/recalbox-odroidgo2_defconfig index 3eb21627f3..f1c9b485a4 100644 --- a/configs/recalbox-odroidgo2_defconfig +++ b/configs/recalbox-odroidgo2_defconfig @@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3326-odroidgo2-linux-v11 rockchip/r BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y diff --git a/configs/recalbox-odroidxu4_defconfig b/configs/recalbox-odroidxu4_defconfig index 4f17e0d2b8..566a3df688 100644 --- a/configs/recalbox-odroidxu4_defconfig +++ b/configs/recalbox-odroidxu4_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4 overlays/ads7846 overlays BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_X264=y diff --git a/configs/recalbox-rg353x_defconfig b/configs/recalbox-rg353x_defconfig index 42d6e77660..bf32cb3a65 100644 --- a/configs/recalbox-rg353x_defconfig +++ b/configs/recalbox-rg353x_defconfig @@ -39,6 +39,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3566-rg353p-linux rockchip/rk3566-r BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y diff --git a/configs/recalbox-rpi1_defconfig b/configs/recalbox-rpi1_defconfig index 422b90b9f8..90f136d807 100644 --- a/configs/recalbox-rpi1_defconfig +++ b/configs/recalbox-rpi1_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_GPL=y diff --git a/configs/recalbox-rpi3_defconfig b/configs/recalbox-rpi3_defconfig index 729b036b5c..fbe38dd11a 100644 --- a/configs/recalbox-rpi3_defconfig +++ b/configs/recalbox-rpi3_defconfig @@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FLUIDSYNTH_DBUS=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y diff --git a/configs/recalbox-rpi4_64_defconfig b/configs/recalbox-rpi4_64_defconfig index 0218bec81e..5c7f7a4eaa 100644 --- a/configs/recalbox-rpi4_64_defconfig +++ b/configs/recalbox-rpi4_64_defconfig @@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FLUIDSYNTH_DBUS=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y diff --git a/configs/recalbox-rpi5_64_defconfig b/configs/recalbox-rpi5_64_defconfig index 8ae1423f06..8035395c9a 100644 --- a/configs/recalbox-rpi5_64_defconfig +++ b/configs/recalbox-rpi5_64_defconfig @@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FLUIDSYNTH_DBUS=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y diff --git a/configs/recalbox-rpizero2_defconfig b/configs/recalbox-rpizero2_defconfig index 8b7512491f..53cb3094ed 100644 --- a/configs/recalbox-rpizero2_defconfig +++ b/configs/recalbox-rpizero2_defconfig @@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FLUIDSYNTH_DBUS=y BR2_PACKAGE_X264=y BR2_PACKAGE_X265=y diff --git a/configs/recalbox-rpizero2legacy_defconfig b/configs/recalbox-rpizero2legacy_defconfig index ea9c114d36..eaad276325 100644 --- a/configs/recalbox-rpizero2legacy_defconfig +++ b/configs/recalbox-rpizero2legacy_defconfig @@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_DTS_INSTALL_OVERLAYS=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config" BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FLUIDSYNTH_DBUS=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_X264=y diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig index daaa53a427..b972b3857d 100644 --- a/configs/recalbox-x86_64_defconfig +++ b/configs/recalbox-x86_64_defconfig @@ -34,6 +34,7 @@ BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/r BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_AMIXER=y BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_XCBGRAB=y diff --git a/custom/list.hash b/custom/list.hash index 8889f2d617..966198cbba 100644 --- a/custom/list.hash +++ b/custom/list.hash @@ -12,6 +12,8 @@ -------------------------------- package/usbmount/0001-rules-fix.patch 659a58bb047b48f06331465ca6128592 linux/Config.in f9276b91b0fe5ccfad41b70d0611bdb7 linux/linux.mk +5f30589736a71c2887e7b61aaa21ed40 package/alsa-plugins/Config.in +626f63d35b36a6cefdb6522714e5f456 package/alsa-plugins/alsa-plugins.mk c17b2548c35cffbd487ade70e272015c package/bcm2835/Config.in 164ecdbdb3d962e53a88cffbdd61651e package/binutils/binutils.mk 05a2454fb455799e570b8059a9189e0c package/bluez5_utils/bluez5_utils.mk diff --git a/custom/package/alsa-plugins/Config.in b/custom/package/alsa-plugins/Config.in new file mode 100644 index 0000000000..0897e9c1bf --- /dev/null +++ b/custom/package/alsa-plugins/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_ALSA_PLUGINS + bool "alsa-plugins" + depends on BR2_PACKAGE_ALSA_LIB + depends on BR2_PACKAGE_PULSEAUDIO + select BR2_PACKAGE_ALSA_LIB_HWDEP + help + Advanced Linux Sound Architecture Plugins + + http://www.alsa-project.org/ diff --git a/custom/package/alsa-plugins/Config.in.patch b/custom/package/alsa-plugins/Config.in.patch new file mode 100644 index 0000000000..dea96da4be --- /dev/null +++ b/custom/package/alsa-plugins/Config.in.patch @@ -0,0 +1,12 @@ +diff --git a/package/alsa-plugins/Config.in b/package/alsa-plugins/Config.in +index ee0fb4c1d5..0897e9c1bf 100644 +--- a/package/alsa-plugins/Config.in ++++ b/package/alsa-plugins/Config.in +@@ -1,6 +1,7 @@ + config BR2_PACKAGE_ALSA_PLUGINS + bool "alsa-plugins" + depends on BR2_PACKAGE_ALSA_LIB ++ depends on BR2_PACKAGE_PULSEAUDIO + select BR2_PACKAGE_ALSA_LIB_HWDEP + help + Advanced Linux Sound Architecture Plugins diff --git a/custom/package/alsa-plugins/alsa-plugins.mk b/custom/package/alsa-plugins/alsa-plugins.mk new file mode 100644 index 0000000000..2f1ec94577 --- /dev/null +++ b/custom/package/alsa-plugins/alsa-plugins.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# alsa-plugins +# +################################################################################ + +ALSA_PLUGINS_VERSION = 1.2.7.1 +ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 +ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins +ALSA_PLUGINS_LICENSE = LGPL-2.1+ +ALSA_PLUGINS_LICENSE_FILES = COPYING +ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib pulseaudio + +ALSA_PLUGINS_CONF_OPTS = \ + --disable-jack \ + --disable-usbstream \ + --disable-libav \ + --disable-maemo-plugin \ + --disable-maemo-resource-manager \ + --with-speex=no + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +ALSA_PLUGINS_CONF_OPTS += --enable-samplerate +ALSA_PLUGINS_DEPENDENCIES += libsamplerate +ALSA_PLUGINS_LICENSE += , GPL-2.0+ (samplerate plugin) +ALSA_PLUGINS_LICENSE_FILES += COPYING.GPL +else +ALSA_PLUGINS_CONF_OPTS += --disable-samplerate +endif + +define ALSA_PLUGINS_ADD_DEFAULT_CONF + mv $(TARGET_DIR)/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ + $(TARGET_DIR)/etc/alsa/conf.d/99-pulseaudio-default.conf +endef + +ALSA_PLUGINS_POST_INSTALL_TARGET_HOOKS += ALSA_PLUGINS_ADD_DEFAULT_CONF + +$(eval $(autotools-package)) diff --git a/custom/package/alsa-plugins/alsa-plugins.mk.patch b/custom/package/alsa-plugins/alsa-plugins.mk.patch new file mode 100644 index 0000000000..6eda5b100f --- /dev/null +++ b/custom/package/alsa-plugins/alsa-plugins.mk.patch @@ -0,0 +1,30 @@ +diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk +index 5728ebfe37..2f1ec94577 100644 +--- a/package/alsa-plugins/alsa-plugins.mk ++++ b/package/alsa-plugins/alsa-plugins.mk +@@ -9,12 +9,11 @@ ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 + ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins + ALSA_PLUGINS_LICENSE = LGPL-2.1+ + ALSA_PLUGINS_LICENSE_FILES = COPYING +-ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib ++ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib pulseaudio + + ALSA_PLUGINS_CONF_OPTS = \ + --disable-jack \ + --disable-usbstream \ +- --disable-pulseaudio \ + --disable-libav \ + --disable-maemo-plugin \ + --disable-maemo-resource-manager \ +@@ -29,4 +28,11 @@ else + ALSA_PLUGINS_CONF_OPTS += --disable-samplerate + endif + ++define ALSA_PLUGINS_ADD_DEFAULT_CONF ++ mv $(TARGET_DIR)/etc/alsa/conf.d/99-pulseaudio-default.conf.example \ ++ $(TARGET_DIR)/etc/alsa/conf.d/99-pulseaudio-default.conf ++endef ++ ++ALSA_PLUGINS_POST_INSTALL_TARGET_HOOKS += ALSA_PLUGINS_ADD_DEFAULT_CONF ++ + $(eval $(autotools-package)) -- GitLab