From 72e5fab7855636498a98e97d3f0463944c29682d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Thu, 3 Jun 2021 09:08:05 +0000
Subject: [PATCH] main/alsa-lib: upgrade to 1.2.5
remove fix-dlo.patch, fixed upstream
add fix-PATH_MAX-on-ppc64le.patch to fix missing PATH_MAX on ppc64le
---
main/alsa-lib/APKBUILD | 12 ++++----
main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch | 15 ++++++++++
main/alsa-lib/fix-dlo.patch | 32 ---------------------
3 files changed, 22 insertions(+), 37 deletions(-)
create mode 100644 main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch
delete mode 100644 main/alsa-lib/fix-dlo.patch
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 76cd6de3fab9..c214f1c66dcc 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
url="http://www.alsa-project.org"
arch="all"
@@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-dbg"
makedepends="linux-headers"
source="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$pkgver.tar.bz2
remove-test.patch
- fix-dlo.patch"
+ fix-PATH_MAX-on-ppc64le.patch"
build() {
./configure \
@@ -37,6 +37,8 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844 alsa-lib-1.2.4.tar.bz2
+sha512sums="
+d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725 alsa-lib-1.2.5.tar.bz2
e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512 remove-test.patch
-60899bc1cef971c7d0b10d916fa5ab6c2495011991c33d47241c9947230f043b7f6a2e177ca2112448669a36b55e16e7208d3e38b0ca5ae5d1784fef6142881a fix-dlo.patch"
+f980d153c2f179e2f8fd90180d19250e5a5e12388f31d86a233d89be72ae7e96b944a8f435f0a11c6140378ac38eaa937175e1c100395ec4f635a9a6a4b1ae25 fix-PATH_MAX-on-ppc64le.patch
+"
diff --git a/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch b/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch
new file mode 100644
index 000000000000..96cc8a541685
--- /dev/null
+++ b/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch
@@ -0,0 +1,15 @@
+Author: Milan P. Stanić <mps@arvanta.net>
+Date: Thu Jun 3 09:08:05 2021 +0000
+
+Fix missing PATH_MAX on ppc64le
+
+--- a/src/ucm/ucm_exec.c 2021-05-27 21:30:16.000000000 +0000
++++ b/src/ucm/ucm_exec.c 2021-06-03 11:37:52.626982547 +0000
+@@ -31,6 +31,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <dirent.h>
++#include <limits.h>
+
+ static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
+
diff --git a/main/alsa-lib/fix-dlo.patch b/main/alsa-lib/fix-dlo.patch
deleted file mode 100644
index 7c7d8887cc7f..000000000000
--- a/main/alsa-lib/fix-dlo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Patch is from master branch:
-https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
-
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index c9517c55..f20eb593 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
-
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
--
GitLab