iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/alsa-utils/Config.in
View File

@@ -41,6 +41,7 @@ comment "alsamixer needs a toolchain w/ wchar"
config BR2_PACKAGE_ALSA_UTILS_ALSAUCM
bool "alsaucm"
select BR2_PACKAGE_ALSA_LIB_UCM
config BR2_PACKAGE_ALSA_UTILS_ALSATPLG
bool "alsatplg"

4
package/alsa-utils/alsa-utils.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 5ddf2cbddb4bd1a4a2a6492a09c25898b08c3ad64893c3655be14194cf0a213a alsa-utils-1.1.9.tar.bz2
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
sha256 ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa alsa-utils-1.2.3.tar.bz2
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING

21
package/alsa-utils/alsa-utils.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
ALSA_UTILS_VERSION = 1.1.9
ALSA_UTILS_VERSION = 1.2.3
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils
ALSA_UTILS_LICENSE = GPL-2.0
ALSA_UTILS_LICENSE_FILES = COPYING
ALSA_UTILS_INSTALL_STAGING = YES
@@ -14,10 +14,6 @@ ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \
$(if $(BR2_PACKAGE_NCURSES),ncurses) \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
$(TARGET_NLS_DEPENDENCIES)
# Regenerate aclocal.m4 to pick the patched
# version of alsa.m4 from alsa-lib
ALSA_UTILS_AUTORECONF = YES
ALSA_UTILS_GETTEXTIZE = YES
ALSA_UTILS_CONF_ENV = \
ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \
@@ -35,7 +31,7 @@ ALSA_UTILS_CONF_OPTS += --disable-alsaloop
endif
ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest
ALSA_UTILS_CONF_OPTS += --disable-alsamixer
endif
ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y)
@@ -90,11 +86,12 @@ define ALSA_UTILS_INSTALL_INIT_SYSTEMD
$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service
$(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-state.service \
$(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service
mkdir -p $(TARGET_DIR)/etc/systemd/system/sound.target.wants
ln -sf ../../../../lib/systemd/system/alsa-restore.service \
$(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-restore.service
ln -sf ../../../../lib/systemd/system/alsa-state.service \
$(TARGET_DIR)/etc/systemd/system/sound.target.wants/alsa-state.service
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d
printf '[Install]\nWantedBy=multi-user.target\n' \
>$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service.d/buildroot-enable.conf
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d
printf '[Install]\nWantedBy=multi-user.target\n' \
>$(TARGET_DIR)/usr/lib/systemd/system/alsa-state.service.d/buildroot-enable.conf;
endef
endif