Minor changes. https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14
* Forward patchset and adjust for offsets. Applies cleanly Signed-off-by: Christian Melki <[email protected]> --- ...-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch | 10 +++++----- .../{alsa-utils-1.2.13 => alsa-utils-1.2.14}/series | 0 rules/alsa-utils.make | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename patches/{alsa-utils-1.2.13 => alsa-utils-1.2.14}/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch (90%) rename patches/{alsa-utils-1.2.13 => alsa-utils-1.2.14}/series (100%) diff --git a/patches/alsa-utils-1.2.13/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch b/patches/alsa-utils-1.2.14/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch similarity index 90% rename from patches/alsa-utils-1.2.13/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch rename to patches/alsa-utils-1.2.14/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch index 6f4fe5848..eee4bce85 100644 --- a/patches/alsa-utils-1.2.13/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch +++ b/patches/alsa-utils-1.2.14/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch @@ -31,7 +31,7 @@ Signed-off-by: Thomas Petazzoni <[email protected]> 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/alsactl/info.c b/alsactl/info.c -index 1d648d870381..aeff16babb19 100644 +index 9acd701f1084..f73e5f4f0579 100644 --- a/alsactl/info.c +++ b/alsactl/info.c @@ -22,9 +22,9 @@ @@ -45,7 +45,7 @@ index 1d648d870381..aeff16babb19 100644 int err, dev, idx; unsigned int count; snd_pcm_info_t *pcminfo; -@@ -76,10 +76,12 @@ static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first) +@@ -78,10 +78,12 @@ static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first) idx, snd_pcm_info_get_subdevice_name(pcminfo)); } } @@ -59,7 +59,7 @@ index 1d648d870381..aeff16babb19 100644 static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream) { if (stream == SND_RAWMIDI_STREAM_INPUT) -@@ -91,7 +93,6 @@ static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream) +@@ -93,7 +95,6 @@ static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream) static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool *first) { @@ -67,7 +67,7 @@ index 1d648d870381..aeff16babb19 100644 int err, dev, idx; unsigned int count; snd_rawmidi_info_t *info; -@@ -143,9 +144,10 @@ static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool +@@ -147,9 +148,10 @@ static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool idx, snd_rawmidi_info_get_subdevice_name(info)); } } @@ -79,7 +79,7 @@ index 1d648d870381..aeff16babb19 100644 static int hwdep_device_list(snd_ctl_t *ctl) { -@@ -228,17 +230,21 @@ int general_card_info(int cardno) +@@ -234,17 +236,21 @@ int general_card_info(int cardno) } err = card_info(ctl); diff --git a/patches/alsa-utils-1.2.13/series b/patches/alsa-utils-1.2.14/series similarity index 100% rename from patches/alsa-utils-1.2.13/series rename to patches/alsa-utils-1.2.14/series diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index 737776cc3..91fc59222 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils # # Paths and names # -ALSA_UTILS_VERSION := 1.2.13 -ALSA_UTILS_MD5 := c04cdabee211a88bf3c6c2f45b2a4f3e +ALSA_UTILS_VERSION := 1.2.14 +ALSA_UTILS_MD5 := d098c3d677ee80cf3d9f87783cce2e53 ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION) ALSA_UTILS_SUFFIX := tar.bz2 ALSA_UTILS_URL := https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) -- 2.34.1
