[ptxdist] [PATCH] alsa-lib: Version bump. 1.2.13 -> 1.2.14

[ptxdist] [PATCH] alsa-lib: Version bump. 1.2.13 -> 1.2.14

[Christian Melki]

Minor changes.
https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14

* Drop ALSA Lisp.

* Adjust build options.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/alsa-lib.in   | 12 ------------
 rules/alsa-lib.make |  6 +++---
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 87d363f19..a314e2ee4 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -91,17 +91,5 @@ config ALSA_LIB_UCM
 	help
 	  Disable the use-case-manager component if you do not need it
 
-config ALSA_LIB_ALISP
-	bool
-	default y
-	# alisp itself broken in 1.1.7 builds now (alsa-lib commit 639d404),
-	# but then targets SI7018/sndo[cp]-mixer.alisp in src/conf/cards/
-	# fail (missing in tarball, present in git tree).
-	depends on BROKEN
-	prompt "alisp"
-	help
-	  Disable the alisp component if you do not need it
-
-
 endif
 
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 82ed3a331..c875b43fc 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
 #
 # Paths and names
 #
-ALSA_LIB_VERSION	:= 1.2.13
-ALSA_LIB_MD5		:= dd856a78e0702c3c4c1d8f56bc07bf61
+ALSA_LIB_VERSION	:= 1.2.14
+ALSA_LIB_MD5		:= d0efd7930da31f0034baddc0b993fa03
 ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
 ALSA_LIB_SUFFIX		:= tar.bz2
 ALSA_LIB_URL		:= https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
@@ -51,7 +51,6 @@ ALSA_LIB_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_SEQ)-seq \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_UCM)-ucm \
 	--disable-topology \
-	--$(call ptx/endis, PTXCONF_ALSA_LIB_ALISP)-alisp \
 	--disable-old-symbols \
 	--disable-mixer-modules \
 	--disable-mixer-pymods \
@@ -59,6 +58,7 @@ ALSA_LIB_CONF_OPT	:= \
 	--disable-python2 \
 	--disable-lockless-dmix \
 	--enable-thread-safety \
+	--$(call ptx/endis, PTXDIST_Y2038)-year2038 \
 	--with-versioned \
 	--with-tmpdir=/tmp \
 	--with-softfloat=$(call ptx/ifdef, PTXCONF_HAS_HARDFLOAT, no, yes) \
-- 
2.34.1

[ptxdist] [PATCH] alsa-utils: Version bump. 1.2.13 -> 1.2.14

[Christian Melki]

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 <christian.melki@t2data.com>
---
 ...-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 <thomas.petazzoni@bootlin.com>
  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