[ptxdist] [PATCH] alsa-lib: Version bump. 1.2.9 -> 1.2.10

[ptxdist] [PATCH] alsa-lib: Version bump. 1.2.9 -> 1.2.10

[Christian Melki]

Some bugfixes and enhancements. Looks like midi-2.0 made it.
https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.10

* Remove patchset. Afacit, largefile is finally included in this release.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-add-largefile-support.patch          | 32 -------------------
 patches/alsa-lib-1.2.9/autogen.sh             |  1 -
 patches/alsa-lib-1.2.9/series                 |  4 ---
 rules/alsa-lib.make                           |  4 +--
 4 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 patches/alsa-lib-1.2.9/0001-add-largefile-support.patch
 delete mode 120000 patches/alsa-lib-1.2.9/autogen.sh
 delete mode 100644 patches/alsa-lib-1.2.9/series

diff --git a/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch
deleted file mode 100644
index c90e11441..000000000
--- a/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Lucas Stach <l.stach@pengutronix.de>
-Date: Tue, 17 Oct 2017 12:29:22 +0200
-Subject: [PATCH] add largefile support
-
-Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index b6266651b9d6..b89dbb2bc6fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,6 +38,9 @@ AM_PROG_LIBTOOL
- 
- CC_NOUNDEFINED
- 
-+dnl enable largefile
-+AC_SYS_LARGEFILE
-+
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CONFIG_HEADERS(include/config.h)
-@@ -743,6 +746,8 @@ if test ! -L "$srcdir"/include/alsa ; then
-   ln -sf . "$srcdir"/include/alsa
- fi
- 
-+CPPFLAGS='-include $(CONFIG_HEADER)'
-+
- AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
- 	  include/Makefile include/sound/Makefile include/sound/uapi/Makefile \
- 	  src/Versions src/Makefile \
diff --git a/patches/alsa-lib-1.2.9/autogen.sh b/patches/alsa-lib-1.2.9/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/alsa-lib-1.2.9/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/alsa-lib-1.2.9/series b/patches/alsa-lib-1.2.9/series
deleted file mode 100644
index f96f3345c..000000000
--- a/patches/alsa-lib-1.2.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-add-largefile-support.patch
-# 28c8f5e33d509bdb14724d1cc3204a4d  - git-ptx-patches magic
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 65f8cc499..0c582ec2e 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.9
-ALSA_LIB_MD5		:= d29f5ebe9a4ff1be70508ecbf6655318
+ALSA_LIB_VERSION	:= 1.2.10
+ALSA_LIB_MD5		:= aced5acdb6161ed86e5ca3bb10618ca1
 ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
 ALSA_LIB_SUFFIX		:= tar.bz2
 ALSA_LIB_URL		:= \
-- 
2.34.1

[ptxdist] [PATCH] alsa-utils: Version bump. 1.2.9 -> 1.2.10

[Christian Melki]

Mostly bugfixes.
https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.10

* Forward patch, but fix some fuzz.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...sactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch | 6 +++---
 patches/{alsa-utils-1.2.9 => alsa-utils-1.2.10}/series      | 0
 rules/alsa-utils.make                                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename patches/{alsa-utils-1.2.9 => alsa-utils-1.2.10}/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch (94%)
 rename patches/{alsa-utils-1.2.9 => alsa-utils-1.2.10}/series (100%)

diff --git a/patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch b/patches/alsa-utils-1.2.10/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
similarity index 94%
rename from patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
rename to patches/alsa-utils-1.2.10/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
index 2298f0037..6f4fe5848 100644
--- a/patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
+++ b/patches/alsa-utils-1.2.10/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 3e4b9486d720..af55206b8484 100644
+index 1d648d870381..aeff16babb19 100644
 --- a/alsactl/info.c
 +++ b/alsactl/info.c
 @@ -22,9 +22,9 @@
@@ -94,9 +94,9 @@ index 3e4b9486d720..af55206b8484 100644
 +#ifdef __ALSA_RAWMIDI_H
  	first = true;
  	if (err >= 0)
- 		err = rawmidi_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first);
+ 		err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_INPUT, &first);
  	if (err >= 0)
- 		err = rawmidi_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first);
+ 		err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_OUTPUT, &first);
 +#endif
  
  	if (err >= 0)
diff --git a/patches/alsa-utils-1.2.9/series b/patches/alsa-utils-1.2.10/series
similarity index 100%
rename from patches/alsa-utils-1.2.9/series
rename to patches/alsa-utils-1.2.10/series
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 2d7162144..46d110823 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.9
-ALSA_UTILS_MD5		:= 095a31a5924695a7cc5b40f9574ba85e
+ALSA_UTILS_VERSION	:= 1.2.10
+ALSA_UTILS_MD5		:= 4fc281a85abb74d6c29363fb0ba2c7b8
 ALSA_UTILS		:= alsa-utils-$(ALSA_UTILS_VERSION)
 ALSA_UTILS_SUFFIX	:= tar.bz2
 ALSA_UTILS_URL		:= \
-- 
2.34.1

Re: [ptxdist] [APPLIED] alsa-lib: Version bump. 1.2.9 -> 1.2.10

[Michael Olbrich]

Thanks, applied as 26ac3245af560a0490bffd06fae4f77e34c78b1d.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:19 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Some bugfixes and enhancements. Looks like midi-2.0 made it.
> https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.10
> 
> * Remove patchset. Afacit, largefile is finally included in this release.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230903183958.724911-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch
> deleted file mode 100644
> index c90e11441c6f..000000000000
> --- a/patches/alsa-lib-1.2.9/0001-add-largefile-support.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From: Lucas Stach <l.stach@pengutronix.de>
> -Date: Tue, 17 Oct 2017 12:29:22 +0200
> -Subject: [PATCH] add largefile support
> -
> -Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ----
> - configure.ac | 5 +++++
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index b6266651b9d6..b89dbb2bc6fb 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -38,6 +38,9 @@ AM_PROG_LIBTOOL
> - 
> - CC_NOUNDEFINED
> - 
> -+dnl enable largefile
> -+AC_SYS_LARGEFILE
> -+
> - dnl Checks for header files.
> - AC_HEADER_STDC
> - AC_CONFIG_HEADERS(include/config.h)
> -@@ -743,6 +746,8 @@ if test ! -L "$srcdir"/include/alsa ; then
> -   ln -sf . "$srcdir"/include/alsa
> - fi
> - 
> -+CPPFLAGS='-include $(CONFIG_HEADER)'
> -+
> - AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
> - 	  include/Makefile include/sound/Makefile include/sound/uapi/Makefile \
> - 	  src/Versions src/Makefile \
> diff --git a/patches/alsa-lib-1.2.9/autogen.sh b/patches/alsa-lib-1.2.9/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/alsa-lib-1.2.9/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/alsa-lib-1.2.9/series b/patches/alsa-lib-1.2.9/series
> deleted file mode 100644
> index f96f3345c2af..000000000000
> --- a/patches/alsa-lib-1.2.9/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-add-largefile-support.patch
> -# 28c8f5e33d509bdb14724d1cc3204a4d  - git-ptx-patches magic
> diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> index 65f8cc4991a8..0c582ec2e293 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.9
> -ALSA_LIB_MD5		:= d29f5ebe9a4ff1be70508ecbf6655318
> +ALSA_LIB_VERSION	:= 1.2.10
> +ALSA_LIB_MD5		:= aced5acdb6161ed86e5ca3bb10618ca1
>  ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
>  ALSA_LIB_SUFFIX		:= tar.bz2
>  ALSA_LIB_URL		:= \

Re: [ptxdist] [APPLIED] alsa-utils: Version bump. 1.2.9 -> 1.2.10

[Michael Olbrich]

Thanks, applied as 8cda3821c55405cc69b7a0db69de47601ef14bb6.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:25 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly bugfixes.
> https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.10
> 
> * Forward patch, but fix some fuzz.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230903183958.724911-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch b/patches/alsa-utils-1.2.10/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
> similarity index 94%
> rename from patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
> rename to patches/alsa-utils-1.2.10/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
> index 2298f0037eae..6f4fe5848cf6 100644
> --- a/patches/alsa-utils-1.2.9/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch
> +++ b/patches/alsa-utils-1.2.10/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 3e4b9486d720..af55206b8484 100644
> +index 1d648d870381..aeff16babb19 100644
>  --- a/alsactl/info.c
>  +++ b/alsactl/info.c
>  @@ -22,9 +22,9 @@
> @@ -94,9 +94,9 @@ index 3e4b9486d720..af55206b8484 100644
>  +#ifdef __ALSA_RAWMIDI_H
>   	first = true;
>   	if (err >= 0)
> - 		err = rawmidi_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first);
> + 		err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_INPUT, &first);
>   	if (err >= 0)
> - 		err = rawmidi_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first);
> + 		err = rawmidi_device_list(ctl, SND_RAWMIDI_STREAM_OUTPUT, &first);
>  +#endif
>   
>   	if (err >= 0)
> diff --git a/patches/alsa-utils-1.2.9/series b/patches/alsa-utils-1.2.10/series
> similarity index 100%
> rename from patches/alsa-utils-1.2.9/series
> rename to patches/alsa-utils-1.2.10/series
> diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
> index 2d7162144eab..46d110823c7f 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.9
> -ALSA_UTILS_MD5		:= 095a31a5924695a7cc5b40f9574ba85e
> +ALSA_UTILS_VERSION	:= 1.2.10
> +ALSA_UTILS_MD5		:= 4fc281a85abb74d6c29363fb0ba2c7b8
>  ALSA_UTILS		:= alsa-utils-$(ALSA_UTILS_VERSION)
>  ALSA_UTILS_SUFFIX	:= tar.bz2
>  ALSA_UTILS_URL		:= \