From fff35f5bf04c5b447e52251318ee7f0b329fda6f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 10:27:40 +0200 Subject: [PATCH 1/7] updated to 1.1.7 --- alsa-lib-addon-dir.patch | 85 ---------------------------------------- alsa-lib.spec | 40 ++++++++++++++----- sources | 3 +- 3 files changed, 31 insertions(+), 97 deletions(-) delete mode 100644 alsa-lib-addon-dir.patch diff --git a/alsa-lib-addon-dir.patch b/alsa-lib-addon-dir.patch deleted file mode 100644 index 7cc32fa..0000000 --- a/alsa-lib-addon-dir.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 93e03bdc2a3dcd5d12516f5de78e14d88a32ff2c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 4 Apr 2018 09:58:12 +0200 -Subject: [PATCH 1/2] alsa.conf: change the location for add-on configs to - /etc/alsa/conf.d - -The add-on configuration files should be placed to a volatile place. - -Signed-off-by: Jaroslav Kysela ---- - src/conf/alsa.conf | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf -index f22918fb..bb00ff40 100644 ---- a/src/conf/alsa.conf -+++ b/src/conf/alsa.conf -@@ -8,13 +8,7 @@ - { - func load - files [ -- { -- @func concat -- strings [ -- { @func datadir } -- "/alsa.conf.d/" -- ] -- } -+ "/etc/alsa/conf.d" - "/etc/asound.conf" - "~/.asoundrc" - ] --- -2.13.6 - - -From 78505dccd23546cc77e5221cb21c01325bc0138d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 4 Apr 2018 10:02:49 +0200 -Subject: [PATCH 2/2] conf: remove alsa.conf.d from the datadir - -Signed-off-by: Jaroslav Kysela ---- - src/conf/Makefile.am | 2 +- - src/conf/alsa.conf.d/Makefile.am | 8 -------- - src/conf/alsa.conf.d/README | 2 -- - 3 files changed, 1 insertion(+), 11 deletions(-) - delete mode 100644 src/conf/alsa.conf.d/Makefile.am - delete mode 100644 src/conf/alsa.conf.d/README - -diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am -index ef2ea9c1..2b46f95c 100644 ---- a/src/conf/Makefile.am -+++ b/src/conf/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS=cards pcm alsa.conf.d -+SUBDIRS=cards pcm - - if BUILD_UCM - SUBDIRS += ucm -diff --git a/src/conf/alsa.conf.d/Makefile.am b/src/conf/alsa.conf.d/Makefile.am -deleted file mode 100644 -index c91661e9..00000000 ---- a/src/conf/alsa.conf.d/Makefile.am -+++ /dev/null -@@ -1,8 +0,0 @@ --alsaconfigdir = @ALSA_CONFIG_DIR@ --alsadir = $(alsaconfigdir)/alsa.conf.d --cfg_files = README -- --alsa_DATA = $(cfg_files) -- --EXTRA_DIST = \ -- $(cfg_files) -diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README -deleted file mode 100644 -index 99978848..00000000 ---- a/src/conf/alsa.conf.d/README -+++ /dev/null -@@ -1,2 +0,0 @@ --You can place files named *.conf in this folder and they will be processed --when initialising alsa-lib. --- -2.13.6 - diff --git a/alsa-lib.spec b/alsa-lib.spec index c4e2ace..6062eaa 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.1.6 -Release: 3%{?prever_dot}%{?dist} +Version: 1.1.7 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -16,7 +16,6 @@ Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf Patch0: alsa-lib-1.0.24-config.patch Patch1: alsa-lib-1.0.14-glibc-open.patch -Patch10: alsa-lib-addon-dir.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -44,19 +43,29 @@ This package includes the ALSA development libraries for developing against the ALSA libraries and interfaces. %package -n alsa-ucm -Summary: ALSA Universal Configuration Manager -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Summary: ALSA Use Case Manager configuration +Group: System Environment/Libraries +BuildArch: noarch +Requires: %{name} = %{version}-%{release} %description -n alsa-ucm -The Advanced Linux Sound Architecture (ALSA) Universal Configuration -Manager allows configuration of Audio input/output names and routing +The Advanced Linux Sound Architecture (ALSA) Use Case Manager configuration +contains alsa-lib configuration of Audio input/output names and routing + +%package -n alsa-topology +Summary: ALSA Topology configuration +Group: System Environment/Libraries +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description -n alsa-topology +The Advanced Linux Sound Architecture (ALSA) topology configuration +contains alsa-lib configuration of SoC topology %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} %patch0 -p1 -b .config %patch1 -p1 -b .glibc-open -%patch10 -p1 -b .addon-dir %build autoreconf -vif @@ -90,7 +99,10 @@ install -p -m 644 %{SOURCE12} . # Create UCM directory mkdir -p %{buildroot}/%{_datadir}/alsa/ucm -#Remove libtool archives. +# Create topology directory +mkdir -p %{buildroot}/%{_datadir}/alsa/topology + +# Remove libtool archives. find %{buildroot} -name '*.la' -delete %post -p /sbin/ldconfig @@ -107,6 +119,7 @@ find %{buildroot} -name '*.la' -delete #{_libdir}/alsa-lib/ %{_datadir}/alsa/ %exclude %{_datadir}/alsa/ucm +%exclude %{_datadir}/alsa/topology /lib/modprobe.d/dist-* %files devel @@ -120,7 +133,14 @@ find %{buildroot} -name '*.la' -delete %files -n alsa-ucm %{_datadir}/alsa/ucm +%files -n alsa-topology +%{_datadir}/alsa/topology + %changelog +* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +- Moved topology files to alsa-topology +- Updated to 1.1.7 + * Thu Jul 12 2018 Fedora Release Engineering - 1.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index fd984bd..300b38d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (alsa-lib-1.1.5.tar.bz2) = c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58 -SHA512 (alsa-lib-1.1.6.tar.bz2) = 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0 +SHA512 (alsa-lib-1.1.7.tar.bz2) = 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c From 5cb01a1e361b16a427f62370bcf295347ed62cee Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 17:34:41 +0200 Subject: [PATCH 2/7] eliminate some lint errors --- alsa-lib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index 6062eaa..d8fd09b 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -79,6 +79,8 @@ make %{?_smp_mflags} V=1 make doc %install +%global sysmodprobedir %{_prefix}/lib/modprobe.d + make DESTDIR=%{buildroot} install # We need the library to be available even before /usr might be mounted @@ -91,8 +93,8 @@ mkdir -p -m 755 %{buildroot}/etc install -p -m 644 %{SOURCE10} %{buildroot}/etc # Install the modprobe files for ALSA -mkdir -p -m 755 %{buildroot}/lib/modprobe.d/ -install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf +mkdir -p -m 755 %{buildroot}%{sysmodprobedir} +install -p -m 644 %{SOURCE11} %{buildroot}%{sysmodprobedir}/dist-alsa.conf # bug#926973, place this file to the doc directory install -p -m 644 %{SOURCE12} . @@ -120,7 +122,7 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/alsa/ %exclude %{_datadir}/alsa/ucm %exclude %{_datadir}/alsa/topology -/lib/modprobe.d/dist-* +%{sysmodprobedir}/dist-* %files devel %doc TODO doc/doxygen/ From 1f69500496083dec063694fa2d2dbb74fea8409d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 24 Oct 2018 12:36:19 +0200 Subject: [PATCH 3/7] fix pcm interval regression --- alsa-git.patch | 305 +++++++++++++++++++++++++++++++++++++++++++++++++ alsa-lib.spec | 14 ++- 2 files changed, 313 insertions(+), 6 deletions(-) create mode 100644 alsa-git.patch diff --git a/alsa-git.patch b/alsa-git.patch new file mode 100644 index 0000000..8794e18 --- /dev/null +++ b/alsa-git.patch @@ -0,0 +1,305 @@ +From 6eced6b4b6dca9f62ea3d13a40c5991231df3c5c Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 18 Oct 2018 09:38:38 +0200 +Subject: [PATCH 1/6] conf/ucm/Dell-WD15-Dock: Fix incorrect device names + +The device name string for Dell WD15 (and its variants) dock is set as +"WD15Dock", while the actual device name to be used is "Dock". + +Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1112292 +Fixes: 8ebb40c96970 ("conf/ucm: Add a UCM profile for Dell WD15 Dock USB-audio") +Signed-off-by: Takashi Iwai +--- + src/conf/ucm/Dell-WD15-Dock/HiFi.conf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf +index b07f3440..1b6bd212 100644 +--- a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf ++++ b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf +@@ -3,7 +3,7 @@ SectionDevice."Headphone" { + + Value { + PlaybackChannels "2" +- PlaybackPCM "hw:WD15Dock,0" ++ PlaybackPCM "hw:Dock,0" + } + } + +@@ -12,7 +12,7 @@ SectionDevice."LineOut" { + + Value { + PlaybackChannels "2" +- PlaybackPCM "hw:WD15Dock,1" ++ PlaybackPCM "hw:Dock,1" + } + } + +@@ -21,6 +21,6 @@ SectionDevice."Mic" { + + Value { + CaptureChannels "2" +- CapturePCM "hw:WD15Dock,0" ++ CapturePCM "hw:Dock,0" + } + } +-- +2.13.6 + + +From 6852f88e80e442ba5d7f2044cf0fbbe72d46fefa Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 10:03:17 +0200 +Subject: [PATCH 2/6] test/latecy: fix typo in tstamp compare + +Signed-off-by: Jaroslav Kysela +--- + test/latency.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/latency.c b/test/latency.c +index f3590b3f..e926856b 100644 +--- a/test/latency.c ++++ b/test/latency.c +@@ -673,7 +673,7 @@ int main(int argc, char *argv[]) + printf("Capture:\n"); + showstat(chandle, frames_in); + showinmax(in_max); +- if (p_tstamp.tv_sec == p_tstamp.tv_sec && ++ if (p_tstamp.tv_sec == c_tstamp.tv_sec && + p_tstamp.tv_usec == c_tstamp.tv_usec) + printf("Hardware sync\n"); + snd_pcm_drop(chandle); +-- +2.13.6 + + +From 82ae026f49e6e22f4775ae23e33324535025a5c6 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 10:17:12 +0200 +Subject: [PATCH 3/6] test/code: make it work again + +Signed-off-by: Jaroslav Kysela +--- + test/code.c | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +diff --git a/test/code.c b/test/code.c +index e2032de5..3706243e 100644 +--- a/test/code.c ++++ b/test/code.c +@@ -3,11 +3,7 @@ + #include + #include + #include +-#include +- +-#ifndef __builtin_expect +-#include +-#endif ++#include + + #define rdtscll(val) \ + __asm__ __volatile__("rdtsc" : "=A" (val)) +@@ -72,21 +68,21 @@ static inline void atomic_add(volatile int *dst, int v) + + static double detect_cpu_clock() + { +- struct timeval tm_begin, tm_end; ++ struct timespec tm_begin, tm_end; + unsigned long long tsc_begin, tsc_end; + + /* Warm cache */ +- gettimeofday(&tm_begin, 0); ++ clock_gettime(CLOCK_MONOTONIC, &tm_begin); + + rdtscll(tsc_begin); +- gettimeofday(&tm_begin, 0); ++ clock_gettime(CLOCK_MONOTONIC, &tm_begin); + + usleep(1000000); + + rdtscll(tsc_end); +- gettimeofday(&tm_end, 0); ++ clock_gettime(CLOCK_MONOTONIC, &tm_end); + +- return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_usec - tm_begin.tv_usec) / 1e6); ++ return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_nsec - tm_begin.tv_nsec) / 1e9); + } + + void mix_areas_srv(unsigned int size, +@@ -146,11 +142,17 @@ void mix_areas0(unsigned int size, + } + } + +-#define MIX_AREAS1 mix_areas1 +-#define MIX_AREAS1_MMX mix_areas1_mmx ++#define MIX_AREAS_16 mix_areas1 ++#define MIX_AREAS_16_MMX mix_areas1_mmx ++#define MIX_AREAS_32 mix_areas1_32 ++#define MIX_AREAS_24 mix_areas1_24 ++#define MIX_AREAS_24_CMOV mix_areas1_24_cmov ++#define XADD "addl" ++#define XSUB "subl" + #include "../src/pcm/pcm_dmix_i386.h" +-#undef MIX_AREAS1 +-#undef MIX_AREAS1_MMX ++static void *ptr_mix_areas1_32 __attribute__((unused)) = &mix_areas1_32; ++static void *ptr_mix_areas1_24 __attribute__((unused)) = &mix_areas1_24; ++static void *ptr_mix_areas1_24_cmov __attribute__((unused)) = &mix_areas1_24_cmov; + + void mix_areas2(unsigned int size, + volatile s16 *dst, const s16 *src, +@@ -319,11 +321,11 @@ int main(int argc, char **argv) + + printf(" \r"); + printf("Summary (the best times):\n"); +- printf("mix_areas_srv : %lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock)); +- printf("mix_areas0 : %lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock)); +- printf("mix_areas1 : %lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock)); +- printf("mix_areas1_mmx: %lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock)); +- printf("mix_areas2 : %lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock)); ++ printf("mix_areas_srv : %8lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock)); ++ printf("mix_areas0 : %8lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock)); ++ printf("mix_areas1 : %8lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock)); ++ printf("mix_areas1_mmx : %8lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock)); ++ printf("mix_areas2 : %8lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock)); + + printf("\n"); + printf("areas1/srv ratio : %f\n", (double)diff1 / diffS); +-- +2.13.6 + + +From 956bc152e7f77714a3be58dccf91ef8542c34556 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 10:18:24 +0200 +Subject: [PATCH 4/6] test: rename code to more approriate mixtest + +Signed-off-by: Jaroslav Kysela +--- + test/Makefile.am | 2 +- + test/{code.c => mixtest.c} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + rename test/{code.c => mixtest.c} (100%) + +diff --git a/test/Makefile.am b/test/Makefile.am +index 5f35159a..99c2c4ff 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -20,7 +20,7 @@ oldapi_LDADD=../src/libasound.la + queue_timer_LDADD=../src/libasound.la + namehint_LDADD=../src/libasound.la + client_event_filter_LDADD=../src/libasound.la +-code_CFLAGS=-Wall -pipe -g -O2 ++mixtest_CFLAGS=-Wall -pipe -g -O2 + chmap_LDADD=../src/libasound.la + audio_time_LDADD=../src/libasound.la + pcm_multi_thread_LDADD=../src/libasound.la +diff --git a/test/code.c b/test/mixtest.c +similarity index 100% +rename from test/code.c +rename to test/mixtest.c +-- +2.13.6 + + +From 92172adb0b733de5a52f1671a279b3079cf0a657 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 23 Oct 2018 10:20:20 +0200 +Subject: [PATCH 5/6] test/audio_time: remove unused variables + +Signed-off-by: Jaroslav Kysela +--- + test/audio_time.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/test/audio_time.c b/test/audio_time.c +index a54c10dc..530922d9 100644 +--- a/test/audio_time.c ++++ b/test/audio_time.c +@@ -115,9 +115,7 @@ int main(int argc, char *argv[]) + snd_pcm_sw_params_t *swparams_p; + snd_pcm_sw_params_t *swparams_c; + +- snd_pcm_uframes_t curr_count_c; + snd_pcm_uframes_t frame_count_c = 0; +- snd_pcm_uframes_t curr_count_p; + snd_pcm_uframes_t frame_count_p = 0; + + snd_pcm_sframes_t delay_p, delay_c; +-- +2.13.6 + + +From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 +From: Timo Wischer +Date: Thu, 18 Oct 2018 13:33:24 +0200 +Subject: [PATCH 6/6] pcm: interval: Interpret (x x+1] correctly and return x+1 + +Without this change an interval of (x x+1] will be interpreted as an +empty interval but the right value would be x+1. +This leads to a failing snd_pcm_hw_params() call which returns -EINVAL. + +An example issue log is given in the following: +snd_pcm_hw_params failed with err -22 (Invalid argument) +ACCESS: MMAP_NONINTERLEAVED +FORMAT: S16_LE +SUBFORMAT: STD +SAMPLE_BITS: 16 +FRAME_BITS: 16 +CHANNELS: 1 +RATE: 16000 +PERIOD_TIME: (15999 16000] +PERIOD_SIZE: (255 256] +PERIOD_BYTES: (510 512] +PERIODS: [2 3) +BUFFER_TIME: 32000 +BUFFER_SIZE: 512 +BUFFER_BYTES: 1024 + +In case of (x x+1) we have to interpret it anyway as a single value of x to +compensate rounding issues. +For example the period size will result in an interval of (352 353) when +the period time is 16ms and the sample rate 22050 Hz +(16ms * 22,05 kHz = 352,8 frames). But 352 has to be chosen to allow a +buffer size of 705 (32ms * 22,05 kHz = 705,6 frames) which has to be >= 2x +period size to avoid Xruns. The buffer size will not end up with an +interval of (705 706) simular to the period size because +snd_pcm_rate_hw_refine_cchange() calls snd_interval_floor() for the buffer +size. Therefore this value will be interpreted as an integer interval +instead of a real interval further on. + +This issue seems to exist since the change of 9bb985c38 ("pcm: +snd_interval_refine_first/last: exclude value only if also excluded +before") + +Signed-off-by: Timo Wischer +Signed-off-by: Jaroslav Kysela +--- + src/pcm/interval_inline.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h +index a68e292b..d9a30b2a 100644 +--- a/src/pcm/interval_inline.h ++++ b/src/pcm/interval_inline.h +@@ -51,12 +51,14 @@ INTERVAL_INLINE int snd_interval_single(const snd_interval_t *i) + { + assert(!snd_interval_empty(i)); + return (i->min == i->max || +- (i->min + 1 == i->max && i->openmax)); ++ (i->min + 1 == i->max && (i->openmin || i->openmax))); + } + + INTERVAL_INLINE int snd_interval_value(const snd_interval_t *i) + { + assert(snd_interval_single(i)); ++ if (i->openmin && !i->openmax) ++ return i->max; + return i->min; + } + +-- +2.13.6 + diff --git a/alsa-lib.spec b/alsa-lib.spec index d8fd09b..08f8a9e 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -5,7 +5,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: 1.1.7 -Release: 1%{?prever_dot}%{?dist} +Release: 2%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -14,8 +14,9 @@ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?post Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf -Patch0: alsa-lib-1.0.24-config.patch -Patch1: alsa-lib-1.0.14-glibc-open.patch +Patch0: alsa-git.patch +Patch1: alsa-lib-1.0.24-config.patch +Patch2: alsa-lib-1.0.14-glibc-open.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -64,8 +65,9 @@ contains alsa-lib configuration of SoC topology %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} -%patch0 -p1 -b .config -%patch1 -p1 -b .glibc-open +%patch0 -p1 -b .alsa-git +%patch1 -p1 -b .config +%patch2 -p1 -b .glibc-open %build autoreconf -vif @@ -139,7 +141,7 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/alsa/topology %changelog -* Tue Oct 16 2018 Jaroslav Kysela - 1.1.7-1 +* Wed Oct 24 2018 Jaroslav Kysela - 1.1.7-2 - Moved topology files to alsa-topology - Updated to 1.1.7 From dafb0030d62e9cee717a90a37939d1147aec1aee Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 24 Oct 2018 12:41:58 +0200 Subject: [PATCH 4/7] fix alsa-git.patch --- alsa-git.patch | 185 ------------------------------------------------- 1 file changed, 185 deletions(-) diff --git a/alsa-git.patch b/alsa-git.patch index 8794e18..783d364 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -47,191 +47,6 @@ index b07f3440..1b6bd212 100644 2.13.6 -From 6852f88e80e442ba5d7f2044cf0fbbe72d46fefa Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 10:03:17 +0200 -Subject: [PATCH 2/6] test/latecy: fix typo in tstamp compare - -Signed-off-by: Jaroslav Kysela ---- - test/latency.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/latency.c b/test/latency.c -index f3590b3f..e926856b 100644 ---- a/test/latency.c -+++ b/test/latency.c -@@ -673,7 +673,7 @@ int main(int argc, char *argv[]) - printf("Capture:\n"); - showstat(chandle, frames_in); - showinmax(in_max); -- if (p_tstamp.tv_sec == p_tstamp.tv_sec && -+ if (p_tstamp.tv_sec == c_tstamp.tv_sec && - p_tstamp.tv_usec == c_tstamp.tv_usec) - printf("Hardware sync\n"); - snd_pcm_drop(chandle); --- -2.13.6 - - -From 82ae026f49e6e22f4775ae23e33324535025a5c6 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 10:17:12 +0200 -Subject: [PATCH 3/6] test/code: make it work again - -Signed-off-by: Jaroslav Kysela ---- - test/code.c | 40 +++++++++++++++++++++------------------- - 1 file changed, 21 insertions(+), 19 deletions(-) - -diff --git a/test/code.c b/test/code.c -index e2032de5..3706243e 100644 ---- a/test/code.c -+++ b/test/code.c -@@ -3,11 +3,7 @@ - #include - #include - #include --#include -- --#ifndef __builtin_expect --#include --#endif -+#include - - #define rdtscll(val) \ - __asm__ __volatile__("rdtsc" : "=A" (val)) -@@ -72,21 +68,21 @@ static inline void atomic_add(volatile int *dst, int v) - - static double detect_cpu_clock() - { -- struct timeval tm_begin, tm_end; -+ struct timespec tm_begin, tm_end; - unsigned long long tsc_begin, tsc_end; - - /* Warm cache */ -- gettimeofday(&tm_begin, 0); -+ clock_gettime(CLOCK_MONOTONIC, &tm_begin); - - rdtscll(tsc_begin); -- gettimeofday(&tm_begin, 0); -+ clock_gettime(CLOCK_MONOTONIC, &tm_begin); - - usleep(1000000); - - rdtscll(tsc_end); -- gettimeofday(&tm_end, 0); -+ clock_gettime(CLOCK_MONOTONIC, &tm_end); - -- return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_usec - tm_begin.tv_usec) / 1e6); -+ return (tsc_end - tsc_begin) / (tm_end.tv_sec - tm_begin.tv_sec + (tm_end.tv_nsec - tm_begin.tv_nsec) / 1e9); - } - - void mix_areas_srv(unsigned int size, -@@ -146,11 +142,17 @@ void mix_areas0(unsigned int size, - } - } - --#define MIX_AREAS1 mix_areas1 --#define MIX_AREAS1_MMX mix_areas1_mmx -+#define MIX_AREAS_16 mix_areas1 -+#define MIX_AREAS_16_MMX mix_areas1_mmx -+#define MIX_AREAS_32 mix_areas1_32 -+#define MIX_AREAS_24 mix_areas1_24 -+#define MIX_AREAS_24_CMOV mix_areas1_24_cmov -+#define XADD "addl" -+#define XSUB "subl" - #include "../src/pcm/pcm_dmix_i386.h" --#undef MIX_AREAS1 --#undef MIX_AREAS1_MMX -+static void *ptr_mix_areas1_32 __attribute__((unused)) = &mix_areas1_32; -+static void *ptr_mix_areas1_24 __attribute__((unused)) = &mix_areas1_24; -+static void *ptr_mix_areas1_24_cmov __attribute__((unused)) = &mix_areas1_24_cmov; - - void mix_areas2(unsigned int size, - volatile s16 *dst, const s16 *src, -@@ -319,11 +321,11 @@ int main(int argc, char **argv) - - printf(" \r"); - printf("Summary (the best times):\n"); -- printf("mix_areas_srv : %lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock)); -- printf("mix_areas0 : %lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock)); -- printf("mix_areas1 : %lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock)); -- printf("mix_areas1_mmx: %lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock)); -- printf("mix_areas2 : %lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock)); -+ printf("mix_areas_srv : %8lld %f%%\n", diffS, 100*2*44100.0*diffS/(size*n*cpu_clock)); -+ printf("mix_areas0 : %8lld %f%%\n", diff0, 100*2*44100.0*diff0/(size*n*cpu_clock)); -+ printf("mix_areas1 : %8lld %f%%\n", diff1, 100*2*44100.0*diff1/(size*n*cpu_clock)); -+ printf("mix_areas1_mmx : %8lld %f%%\n", diff1_mmx, 100*2*44100.0*diff1_mmx/(size*n*cpu_clock)); -+ printf("mix_areas2 : %8lld %f%%\n", diff2, 100*2*44100.0*diff2/(size*n*cpu_clock)); - - printf("\n"); - printf("areas1/srv ratio : %f\n", (double)diff1 / diffS); --- -2.13.6 - - -From 956bc152e7f77714a3be58dccf91ef8542c34556 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 10:18:24 +0200 -Subject: [PATCH 4/6] test: rename code to more approriate mixtest - -Signed-off-by: Jaroslav Kysela ---- - test/Makefile.am | 2 +- - test/{code.c => mixtest.c} | 0 - 2 files changed, 1 insertion(+), 1 deletion(-) - rename test/{code.c => mixtest.c} (100%) - -diff --git a/test/Makefile.am b/test/Makefile.am -index 5f35159a..99c2c4ff 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -20,7 +20,7 @@ oldapi_LDADD=../src/libasound.la - queue_timer_LDADD=../src/libasound.la - namehint_LDADD=../src/libasound.la - client_event_filter_LDADD=../src/libasound.la --code_CFLAGS=-Wall -pipe -g -O2 -+mixtest_CFLAGS=-Wall -pipe -g -O2 - chmap_LDADD=../src/libasound.la - audio_time_LDADD=../src/libasound.la - pcm_multi_thread_LDADD=../src/libasound.la -diff --git a/test/code.c b/test/mixtest.c -similarity index 100% -rename from test/code.c -rename to test/mixtest.c --- -2.13.6 - - -From 92172adb0b733de5a52f1671a279b3079cf0a657 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Tue, 23 Oct 2018 10:20:20 +0200 -Subject: [PATCH 5/6] test/audio_time: remove unused variables - -Signed-off-by: Jaroslav Kysela ---- - test/audio_time.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/test/audio_time.c b/test/audio_time.c -index a54c10dc..530922d9 100644 ---- a/test/audio_time.c -+++ b/test/audio_time.c -@@ -115,9 +115,7 @@ int main(int argc, char *argv[]) - snd_pcm_sw_params_t *swparams_p; - snd_pcm_sw_params_t *swparams_c; - -- snd_pcm_uframes_t curr_count_c; - snd_pcm_uframes_t frame_count_c = 0; -- snd_pcm_uframes_t curr_count_p; - snd_pcm_uframes_t frame_count_p = 0; - - snd_pcm_sframes_t delay_p, delay_c; --- -2.13.6 - - From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 From: Timo Wischer Date: Thu, 18 Oct 2018 13:33:24 +0200 From f9ae32497a03e1dafb2410bc13b0362bbf9cc01c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 25 Dec 2018 15:16:55 +0100 Subject: [PATCH 5/7] Fix broken chtrt5645 UCM profile, fixing mic input on chtrt5645 devices --- alsa-lib-1.1.7-ucm-chtrt5645.patch | 9 +++++++++ alsa-lib.spec | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 alsa-lib-1.1.7-ucm-chtrt5645.patch diff --git a/alsa-lib-1.1.7-ucm-chtrt5645.patch b/alsa-lib-1.1.7-ucm-chtrt5645.patch new file mode 100644 index 0000000..206f274 --- /dev/null +++ b/alsa-lib-1.1.7-ucm-chtrt5645.patch @@ -0,0 +1,9 @@ +diff -up alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf~ alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf +--- alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf~ 2018-10-16 10:08:35.000000000 +0200 ++++ alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf 2018-12-25 14:46:21.860175750 +0100 +@@ -1,3 +1,5 @@ ++ ++ + SectionVerb { + # ALSA PCM + Value { diff --git a/alsa-lib.spec b/alsa-lib.spec index 08f8a9e..d81fd20 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -5,7 +5,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib Version: 1.1.7 -Release: 2%{?prever_dot}%{?dist} +Release: 3%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -17,6 +17,8 @@ Source12: modprobe-dist-oss.conf Patch0: alsa-git.patch Patch1: alsa-lib-1.0.24-config.patch Patch2: alsa-lib-1.0.14-glibc-open.patch +# Fixed differently upstream, drop on next rebase +Patch3: alsa-lib-1.1.7-ucm-chtrt5645.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -68,6 +70,7 @@ contains alsa-lib configuration of SoC topology %patch0 -p1 -b .alsa-git %patch1 -p1 -b .config %patch2 -p1 -b .glibc-open +%patch3 -p1 %build autoreconf -vif @@ -141,6 +144,9 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/alsa/topology %changelog +* Tue Dec 25 2018 Hans de Goede - 1.1.7-3 +- Fix broken chtrt5645 UCM profile, fixing mic input on chtrt5645 devices + * Wed Oct 24 2018 Jaroslav Kysela - 1.1.7-2 - Moved topology files to alsa-topology - Updated to 1.1.7 From 03e9ab8100327872dec1f6bd596930f28669bde7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 7 Jan 2019 14:27:49 +0100 Subject: [PATCH 6/7] updated to 1.1.8 --- alsa-git.patch | 120 ----------------------------- alsa-lib-1.1.7-ucm-chtrt5645.patch | 9 --- alsa-lib.spec | 10 +-- sources | 2 +- 4 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 alsa-lib-1.1.7-ucm-chtrt5645.patch diff --git a/alsa-git.patch b/alsa-git.patch index 783d364..e69de29 100644 --- a/alsa-git.patch +++ b/alsa-git.patch @@ -1,120 +0,0 @@ -From 6eced6b4b6dca9f62ea3d13a40c5991231df3c5c Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Thu, 18 Oct 2018 09:38:38 +0200 -Subject: [PATCH 1/6] conf/ucm/Dell-WD15-Dock: Fix incorrect device names - -The device name string for Dell WD15 (and its variants) dock is set as -"WD15Dock", while the actual device name to be used is "Dock". - -Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1112292 -Fixes: 8ebb40c96970 ("conf/ucm: Add a UCM profile for Dell WD15 Dock USB-audio") -Signed-off-by: Takashi Iwai ---- - src/conf/ucm/Dell-WD15-Dock/HiFi.conf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf -index b07f3440..1b6bd212 100644 ---- a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf -+++ b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf -@@ -3,7 +3,7 @@ SectionDevice."Headphone" { - - Value { - PlaybackChannels "2" -- PlaybackPCM "hw:WD15Dock,0" -+ PlaybackPCM "hw:Dock,0" - } - } - -@@ -12,7 +12,7 @@ SectionDevice."LineOut" { - - Value { - PlaybackChannels "2" -- PlaybackPCM "hw:WD15Dock,1" -+ PlaybackPCM "hw:Dock,1" - } - } - -@@ -21,6 +21,6 @@ SectionDevice."Mic" { - - Value { - CaptureChannels "2" -- CapturePCM "hw:WD15Dock,0" -+ CapturePCM "hw:Dock,0" - } - } --- -2.13.6 - - -From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 -From: Timo Wischer -Date: Thu, 18 Oct 2018 13:33:24 +0200 -Subject: [PATCH 6/6] pcm: interval: Interpret (x x+1] correctly and return x+1 - -Without this change an interval of (x x+1] will be interpreted as an -empty interval but the right value would be x+1. -This leads to a failing snd_pcm_hw_params() call which returns -EINVAL. - -An example issue log is given in the following: -snd_pcm_hw_params failed with err -22 (Invalid argument) -ACCESS: MMAP_NONINTERLEAVED -FORMAT: S16_LE -SUBFORMAT: STD -SAMPLE_BITS: 16 -FRAME_BITS: 16 -CHANNELS: 1 -RATE: 16000 -PERIOD_TIME: (15999 16000] -PERIOD_SIZE: (255 256] -PERIOD_BYTES: (510 512] -PERIODS: [2 3) -BUFFER_TIME: 32000 -BUFFER_SIZE: 512 -BUFFER_BYTES: 1024 - -In case of (x x+1) we have to interpret it anyway as a single value of x to -compensate rounding issues. -For example the period size will result in an interval of (352 353) when -the period time is 16ms and the sample rate 22050 Hz -(16ms * 22,05 kHz = 352,8 frames). But 352 has to be chosen to allow a -buffer size of 705 (32ms * 22,05 kHz = 705,6 frames) which has to be >= 2x -period size to avoid Xruns. The buffer size will not end up with an -interval of (705 706) simular to the period size because -snd_pcm_rate_hw_refine_cchange() calls snd_interval_floor() for the buffer -size. Therefore this value will be interpreted as an integer interval -instead of a real interval further on. - -This issue seems to exist since the change of 9bb985c38 ("pcm: -snd_interval_refine_first/last: exclude value only if also excluded -before") - -Signed-off-by: Timo Wischer -Signed-off-by: Jaroslav Kysela ---- - src/pcm/interval_inline.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h -index a68e292b..d9a30b2a 100644 ---- a/src/pcm/interval_inline.h -+++ b/src/pcm/interval_inline.h -@@ -51,12 +51,14 @@ INTERVAL_INLINE int snd_interval_single(const snd_interval_t *i) - { - assert(!snd_interval_empty(i)); - return (i->min == i->max || -- (i->min + 1 == i->max && i->openmax)); -+ (i->min + 1 == i->max && (i->openmin || i->openmax))); - } - - INTERVAL_INLINE int snd_interval_value(const snd_interval_t *i) - { - assert(snd_interval_single(i)); -+ if (i->openmin && !i->openmax) -+ return i->max; - return i->min; - } - --- -2.13.6 - diff --git a/alsa-lib-1.1.7-ucm-chtrt5645.patch b/alsa-lib-1.1.7-ucm-chtrt5645.patch deleted file mode 100644 index 206f274..0000000 --- a/alsa-lib-1.1.7-ucm-chtrt5645.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf~ alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf ---- alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf~ 2018-10-16 10:08:35.000000000 +0200 -+++ alsa-lib-1.1.7/src/conf/ucm/chtrt5645/HiFi.conf 2018-12-25 14:46:21.860175750 +0100 -@@ -1,3 +1,5 @@ -+ -+ - SectionVerb { - # ALSA PCM - Value { diff --git a/alsa-lib.spec b/alsa-lib.spec index d81fd20..6e28536 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,8 +4,8 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.1.7 -Release: 3%{?prever_dot}%{?dist} +Version: 1.1.8 +Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.alsa-project.org/ @@ -17,8 +17,6 @@ Source12: modprobe-dist-oss.conf Patch0: alsa-git.patch Patch1: alsa-lib-1.0.24-config.patch Patch2: alsa-lib-1.0.14-glibc-open.patch -# Fixed differently upstream, drop on next rebase -Patch3: alsa-lib-1.1.7-ucm-chtrt5645.patch BuildRequires: doxygen BuildRequires: autoconf automake libtool @@ -70,7 +68,6 @@ contains alsa-lib configuration of SoC topology %patch0 -p1 -b .alsa-git %patch1 -p1 -b .config %patch2 -p1 -b .glibc-open -%patch3 -p1 %build autoreconf -vif @@ -144,6 +141,9 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/alsa/topology %changelog +* Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-1 +- Updated to 1.1.8 + * Tue Dec 25 2018 Hans de Goede - 1.1.7-3 - Fix broken chtrt5645 UCM profile, fixing mic input on chtrt5645 devices diff --git a/sources b/sources index 300b38d..8b47b43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-lib-1.1.7.tar.bz2) = 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c +SHA512 (alsa-lib-1.1.8.tar.bz2) = 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed From 046113b0a829f6df6a6e5327782afb084e089151 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 10 May 2019 09:38:58 +0200 Subject: [PATCH 7/7] updated to 1.1.9 --- ....24-config.patch => alsa-lib-1.1.9-config.patch | 12 ++++++------ alsa-lib.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) rename alsa-lib-1.0.24-config.patch => alsa-lib-1.1.9-config.patch (82%) diff --git a/alsa-lib-1.0.24-config.patch b/alsa-lib-1.1.9-config.patch similarity index 82% rename from alsa-lib-1.0.24-config.patch rename to alsa-lib-1.1.9-config.patch index f0e50e3..f8c2c59 100644 --- a/alsa-lib-1.0.24-config.patch +++ b/alsa-lib-1.1.9-config.patch @@ -1,8 +1,8 @@ diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf -index 1889f01..60c12ac 100644 +index 09980586..c4525f0b 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf -@@ -66,8 +66,7 @@ defaults.pcm.nonblock 1 +@@ -67,8 +67,7 @@ defaults.pcm.nonblock 1 defaults.pcm.compat 0 defaults.pcm.minperiodtime 5000 # in us defaults.pcm.ipc_key 5678293 @@ -10,13 +10,13 @@ index 1889f01..60c12ac 100644 -defaults.pcm.ipc_perm 0660 +defaults.pcm.ipc_perm 0600 defaults.pcm.dmix.max_periods 0 + defaults.pcm.dmix.channels 2 defaults.pcm.dmix.rate 48000 - defaults.pcm.dmix.format "unchanged" diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf -index e62cb29..a005488 100644 +index 7fa5c8b2..97936a82 100644 --- a/src/conf/pcm/dmix.conf +++ b/src/conf/pcm/dmix.conf -@@ -41,10 +41,6 @@ pcm.!dmix { +@@ -48,10 +48,6 @@ pcm.!dmix { @func refer name defaults.pcm.ipc_key } @@ -28,7 +28,7 @@ index e62cb29..a005488 100644 @func refer name defaults.pcm.ipc_perm diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf -index 49cfca9..842e1fb 100644 +index abbd44f7..528fb6ad 100644 --- a/src/conf/pcm/dsnoop.conf +++ b/src/conf/pcm/dsnoop.conf @@ -41,10 +41,6 @@ pcm.!dsnoop { diff --git a/alsa-lib.spec b/alsa-lib.spec index 6e28536..508e638 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -4,7 +4,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library Name: alsa-lib -Version: 1.1.8 +Version: 1.1.9 Release: 1%{?prever_dot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -14,8 +14,8 @@ Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?post Source10: asound.conf Source11: modprobe-dist-alsa.conf Source12: modprobe-dist-oss.conf -Patch0: alsa-git.patch -Patch1: alsa-lib-1.0.24-config.patch +#Patch0: alsa-git.patch +Patch1: alsa-lib-1.1.9-config.patch Patch2: alsa-lib-1.0.14-glibc-open.patch BuildRequires: doxygen @@ -65,7 +65,7 @@ contains alsa-lib configuration of SoC topology %prep %setup -q -n %{name}-%{version}%{?prever}%{?postver} -%patch0 -p1 -b .alsa-git +#%patch0 -p1 -b .alsa-git %patch1 -p1 -b .config %patch2 -p1 -b .glibc-open @@ -109,6 +109,9 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/topology # Remove libtool archives. find %{buildroot} -name '*.la' -delete +# Remove /usr/include/asoundlib.h +rm %{buildroot}/%{_includedir}/asoundlib.h + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -141,6 +144,9 @@ find %{buildroot} -name '*.la' -delete %{_datadir}/alsa/topology %changelog +* Fri May 10 2019 Jaroslav Kysela - 1.1.9-1 +- Updated to 1.1.9 + * Mon Jan 7 2019 Jaroslav Kysela - 1.1.8-1 - Updated to 1.1.8 diff --git a/sources b/sources index 8b47b43..d98b561 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-lib-1.1.8.tar.bz2) = 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed +SHA512 (alsa-lib-1.1.9.tar.bz2) = 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49