diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,6 +1,5 @@ PORTNAME= alsa-lib -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.9 DISTVERSIONPREFIX= v CATEGORIES= audio MASTER_SITES= GH diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo --- a/audio/alsa-lib/distinfo +++ b/audio/alsa-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1634081449 -SHA256 (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = ad4fa29e3927c5bec0f71b24b6a88523f4e386905341fc9047abef5744805023 -SIZE (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = 780688 +TIMESTAMP = 1688072279 +SHA256 (alsa-project-alsa-lib-v1.2.9_GH0.tar.gz) = 95bbac3c04e7a722439e0c282232881e8657562ae55a90b85e58a8f5aa140ac0 +SIZE (alsa-project-alsa-lib-v1.2.9_GH0.tar.gz) = 844507 diff --git a/audio/alsa-lib/files/patch-src_async.c b/audio/alsa-lib/files/patch-src_async.c deleted file mode 100644 --- a/audio/alsa-lib/files/patch-src_async.c +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $ - ---- src/async.c.orig 2020-02-19 09:35:39 UTC -+++ src/async.c -@@ -54,6 +54,15 @@ static LIST_HEAD(snd_async_handlers); - - static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED) - { -+#if defined(__DragonFly__) || defined(__FreeBSD__) -+ /* XXX XXX XXX */ -+ struct list_head *i; -+ list_for_each(i, &snd_async_handlers) { -+ snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist); -+ if (h->callback) -+ h->callback(h); -+ } -+#else - int fd; - struct list_head *i; - //assert(siginfo->si_code == SI_SIGIO); -@@ -66,6 +75,7 @@ static void snd_async_handler(int signo ATTRIBUTE_UNUS - if (h->fd == fd && h->callback) - h->callback(h); - } -+#endif - } - - /** diff --git a/audio/alsa-lib/files/patch-src_conf_alsa.conf b/audio/alsa-lib/files/patch-src_conf_alsa.conf --- a/audio/alsa-lib/files/patch-src_conf_alsa.conf +++ b/audio/alsa-lib/files/patch-src_conf_alsa.conf @@ -1,13 +1,15 @@ ---- src/conf/alsa.conf.orig 2020-02-19 09:35:39 UTC -+++ src/conf/alsa.conf -@@ -8,8 +8,8 @@ +--- src/conf/alsa.conf.orig 2023-06-29 14:25:31.334796000 -0400 ++++ src/conf/alsa.conf 2023-06-29 14:27:23.680832000 -0400 +@@ -8,10 +8,8 @@ { func load files [ +- "/var/lib/alsa/conf.d" +- "/usr/etc/alsa/conf.d" - "/etc/alsa/conf.d" -- "/etc/asound.conf" +- "/etc/asound.conf|||/usr/etc/asound.conf" + "%%PREFIX%%/etc/alsa/conf.d" + "%%PREFIX%%/etc/asound.conf" "~/.asoundrc" - ] - errors false + { + @func concat diff --git a/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c b/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c --- a/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c +++ b/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c @@ -1,20 +1,12 @@ ---- src/pcm/pcm_direct.c.orig 2016-03-31 13:10:39 UTC -+++ src/pcm/pcm_direct.c -@@ -44,12 +44,17 @@ +--- src/pcm/pcm_direct.c.orig 2023-06-29 17:05:13.940920000 -0400 ++++ src/pcm/pcm_direct.c 2023-06-29 17:05:53.104228000 -0400 +@@ -44,7 +44,8 @@ * */ -+#if !defined(__DragonFly__) && !defined(__OpenBSD__) \ -+ && !(defined(__FreeBSD__) && __FreeBSD__ < 12) +-#if !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__ANDROID__) ++#if !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__ANDROID__) \ ++ && !(defined(__FreeBSD__) && __FreeBSD__ < 12) union semun { int val; /* Value for SETVAL */ struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */ - unsigned short *array; /* Array for GETALL, SETALL */ -+#ifdef __linux__ - struct seminfo *__buf; /* Buffer for IPC_INFO (Linux specific) */ -+#endif - }; -+#endif - - /* - * FIXME: diff --git a/audio/alsa-lib/files/patch-test_midifile.c b/audio/alsa-lib/files/patch-test_midifile.c deleted file mode 100644 --- a/audio/alsa-lib/files/patch-test_midifile.c +++ /dev/null @@ -1,20 +0,0 @@ ---- test/midifile.c.orig 2016-03-31 13:10:39 UTC -+++ test/midifile.c -@@ -71,7 +71,7 @@ - #endif - - #include --#include -+#include - - #include - /*void exit(), free();*/ -@@ -328,7 +328,7 @@ readtrack () /* read a track chunk */ - - if (Mf_interactive) - { -- Mf_toberead = MAXINT; -+ Mf_toberead = INT_MAX; - } - else - {