diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000000000000000000000000000000000000..3ba704a682f2e0de49064173d9868c3c6a4d83db --- /dev/null +++ b/alsa-git.patch @@ -0,0 +1,82 @@ +From 9685505bf438467d9b11919b332b066d3a1c94d0 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 4 Sep 2023 09:37:29 +0200 +Subject: [PATCH 1/2] gitcompile: Add static build + +Signed-off-by: Jaroslav Kysela +--- + gitcompile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/gitcompile b/gitcompile +index 0fe092ce..c70448f7 100755 +--- a/gitcompile ++++ b/gitcompile +@@ -32,6 +32,10 @@ if [ $# -ne 0 ]; then + lto="-flto -flto-partition=none" + echo "Forced lto build..." + shift ;; ++ static) ++ static=yes ++ echo "Selected static build..." ++ shift ;; + *) + endloop=yes + ;; +@@ -75,6 +79,12 @@ if [ "$python2" = "yes" ]; then + args="$args --enable-python2" + fi + ++if [ "$static" = "yes" ]; then ++ #args="$args --enable-shared=no --enable-static=yes" ++ args="$args --disable-shared" ++fi ++ ++ + touch ltconfig + libtoolize --force --copy --automake + aclocal $ACLOCAL_FLAGS +-- +2.41.0 + + +From fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 4 Sep 2023 09:38:26 +0200 +Subject: [PATCH 2/2] control.h: Fix ump header file detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apparently, the control.h is used from apps separately (outside +asoundlib.h). Avoid errors like: + +/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared + 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); + | ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared + 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: https://github.com/alsa-project/alsa-lib/issues/348 +Signed-off-by: Jaroslav Kysela +--- + include/control.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/control.h b/include/control.h +index ab482ba4..e7541d56 100644 +--- a/include/control.h ++++ b/include/control.h +@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev); + int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device); + int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info); + int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev); ++#endif ++#ifdef __ALSA_UMP_H + int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device); + int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info); + int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info); +-- +2.41.0 + diff --git a/alsa-lib-1.2.10-glibc-open.patch b/alsa-lib-1.2.10-glibc-open.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e53a926f6f8ef96f251eb4668de4eec836627d4 --- /dev/null +++ b/alsa-lib-1.2.10-glibc-open.patch @@ -0,0 +1,10 @@ +--- alsa-lib-1.2.10/aserver/aserver.c~ 2023-09-01 17:35:48.000000000 +0200 ++++ alsa-lib-1.2.10/aserver/aserver.c 2023-09-01 18:13:11.339601685 +0200 +@@ -35,6 +35,7 @@ + #include + #include + ++#undef open + + char *command; + diff --git a/alsa-lib-1.2.10.tar.bz2 b/alsa-lib-1.2.10.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..d85108d70de497351ee6c5faedb9d04f22c5c873 Binary files /dev/null and b/alsa-lib-1.2.10.tar.bz2 differ diff --git a/alsa-lib-1.2.3.1-config.patch b/alsa-lib-1.2.3.1-config.patch new file mode 100644 index 0000000000000000000000000000000000000000..95961a589633f961596ff32757275ffae97b0aa3 --- /dev/null +++ b/alsa-lib-1.2.3.1-config.patch @@ -0,0 +1,44 @@ +diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf +index 18427ec6..1915af4e 100644 +--- a/src/conf/alsa.conf ++++ b/src/conf/alsa.conf +@@ -80,8 +80,7 @@ defaults.pcm.nonblock 1 + defaults.pcm.compat 0 + defaults.pcm.minperiodtime 5000 # in us + defaults.pcm.ipc_key 5678293 +-defaults.pcm.ipc_gid audio +-defaults.pcm.ipc_perm 0660 ++defaults.pcm.ipc_perm 0600 + defaults.pcm.tstamp_type default + defaults.pcm.dmix.max_periods 0 + defaults.pcm.dmix.channels 2 +diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf +index 50e573da..70523f29 100644 +--- a/src/conf/pcm/dmix.conf ++++ b/src/conf/pcm/dmix.conf +@@ -48,10 +48,6 @@ pcm.!dmix { + @func refer + name defaults.pcm.ipc_key + } +- ipc_gid { +- @func refer +- name defaults.pcm.ipc_gid +- } + ipc_perm { + @func refer + name defaults.pcm.ipc_perm +diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf +index f4336e5f..60b9f212 100644 +--- a/src/conf/pcm/dsnoop.conf ++++ b/src/conf/pcm/dsnoop.conf +@@ -41,10 +41,6 @@ pcm.!dsnoop { + @func refer + name defaults.pcm.ipc_key + } +- ipc_gid { +- @func refer +- name defaults.pcm.ipc_gid +- } + ipc_perm { + @func refer + name defaults.pcm.ipc_perm diff --git a/alsa-lib-1.2.9.tar.bz2 b/alsa-lib-1.2.9.tar.bz2 deleted file mode 100644 index 2b37e87715ff1b20b2047e308e3caddfc7d18827..0000000000000000000000000000000000000000 Binary files a/alsa-lib-1.2.9.tar.bz2 and /dev/null differ diff --git a/alsa-lib.spec b/alsa-lib.spec index 5ebd74c0ddb27cc188e7b588300855b78ca49229..c987b64183b31b6624452933c6d0e02d2e8c0782 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -1,19 +1,23 @@ -%define version_alsa_ucm 1.2.7.1 -%define version_alsa_tplg 1.2.5.1 +%define version_alsa_lib 1.2.10 +%define version_alsa_ucm 1.2.10 +%define version_alsa_tplg 1.2.5 Name: alsa-lib -Version: 1.2.9 -Release: 2 +Version: 1.2.10 +Release: 1 Summary: the user space library that developers compile ALSA applications against License: LGPLv2+ URL: https://alsa-project.org/ -Source0: https://www.alsa-project.org/files/pub/lib/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version_alsa_ucm}.tar.bz2 Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_tplg}.tar.bz2 Source10: asound.conf Source40: alsa-ucm-conf.patch -Patch1: alsa-lib-1.2.5.1-sw.patch +Patch1: alsa-lib-1.2.5.1-sw.patch +Patch2: alsa-git.patch +Patch3: alsa-lib-1.2.3.1-config.patch +Patch4: alsa-lib-1.2.10-glibc-open.patch BuildRequires: autoconf, automake, libtool, doxygen, gtk3 Requires: coreutils @@ -86,7 +90,7 @@ patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40} mkdir -p %{buildroot}/%{_datadir}/alsa/topology # Unpack topologies -tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa-topology-conf-%{version_alsa_tplg}/topology" +tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "*/topology" @@ -124,10 +128,13 @@ tar xvjf %{SOURCE2} -C %{buildroot}/%{_datadir}/alsa --strip-components=1 "alsa- %{_datadir}/alsa/topology %changelog +* Wed Nov 01 2023 haomimi - 1.2.10-2 +- Upgrade to 1.2.10 + * Wed Aug 9 2023 zhangnaichuan - 1.2.9-2 - fix: build failuer caused by tar upgrade -* Fri July 21 2023 lijianglin - 1.2.9-1 +* Fri Jul 21 2023 lijianglin - 1.2.9-1 - Upgrade to 1.2.9 * Thu Feb 9 2023 lijianglin - 1.2.8-1 diff --git a/alsa-topology-conf-1.2.5.1.tar.bz2 b/alsa-topology-conf-1.2.5.1.tar.bz2 deleted file mode 100644 index b290ac6e402254fd2096c856b8124c36c54c523e..0000000000000000000000000000000000000000 Binary files a/alsa-topology-conf-1.2.5.1.tar.bz2 and /dev/null differ diff --git a/alsa-topology-conf-1.2.5.tar.bz2 b/alsa-topology-conf-1.2.5.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..9c8479e52a1a3cdd67bd469728ec8099eeeb1b00 Binary files /dev/null and b/alsa-topology-conf-1.2.5.tar.bz2 differ diff --git a/alsa-ucm-conf-1.2.10.tar.bz2 b/alsa-ucm-conf-1.2.10.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..4f474bba7b883d4626dbe913d63cbd7d913636eb Binary files /dev/null and b/alsa-ucm-conf-1.2.10.tar.bz2 differ diff --git a/alsa-ucm-conf-1.2.7.1.tar.bz2 b/alsa-ucm-conf-1.2.7.1.tar.bz2 deleted file mode 100644 index d36f3025486100897a0c133ff302e813f82f660b..0000000000000000000000000000000000000000 Binary files a/alsa-ucm-conf-1.2.7.1.tar.bz2 and /dev/null differ diff --git a/alsa-ucm-conf.patch b/alsa-ucm-conf.patch index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bd3790ca448aec03a2722c8b496ea24aa4aef641 100644 --- a/alsa-ucm-conf.patch +++ b/alsa-ucm-conf.patch @@ -0,0 +1,28 @@ +From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 4 Sep 2023 16:39:52 +0200 +Subject: [PATCH] SplitPCM: Device argument may not be set + +Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346 +Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro") +Signed-off-by: Jaroslav Kysela +--- + ucm2/common/pcm/split.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/common/pcm/split.conf b/ucm2/common/pcm/split.conf +index 80f23e6..9ed2f95 100644 +--- a/ucm2/common/pcm/split.conf ++++ b/ucm2/common/pcm/split.conf +@@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice { + If.0 { + Condition { + Type String +- Empty "${var:__Device}" ++ Empty "${var:-__Device}" + } + True.Define.__Device "0" + } +-- +2.41.0 + diff --git a/asound.conf b/asound.conf index 581dbbd2be40733f6f305311d5bb1c205927bfed..da7ab7c2f0213b169ab74b762752ef4b0ee11146 100644 --- a/asound.conf +++ b/asound.conf @@ -1 +1,3 @@ -# alsa-lib global configuration +# +# Place your global alsa-lib configuration here... +#