diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index e4f3ceec6dbf5..f92cdb551931c 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,21 +1,15 @@ PORTNAME= alsa-lib -PORTVERSION= 1.2.2 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 1.2.10 CATEGORIES= audio -MASTER_SITES= GH +MASTER_SITES= https://www.alsa-project.org/files/pub/lib/ -USE_GITHUB= yes -GH_ACCOUNT= alsa-project -GH_PROJECT= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= ALSA compatibility library WWW= https://www.alsa-project.org/ LICENSE= LGPL21+ -USES= autoreconf cpe libtool:keepla tar:bzip2 +USES= cpe libtool:keepla tar:bzip2 CPE_VENDOR= alsa-project CPE_PRODUCT= alsa USE_LDCONFIG= yes @@ -32,8 +26,8 @@ CPPFLAGS+= -I${FILESDIR} # to these undefined symbols. LDFLAGS+= -Wl,--undefined-version -OPTIONS_DEFINE= PYTHON -OPTIONS_SUB= yes +OPTIONS_DEFINE= PYTHON +OPTIONS_SUB= yes PYTHON_USES= gettext-runtime python PYTHON_CONFIGURE_ENABLE= mixer-pymods python diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo index 2e5d1eeeb2e51..7340d0a43ba4d 100644 --- 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 = 1695515195 +SHA256 (alsa-lib-1.2.10.tar.bz2) = c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e +SIZE (alsa-lib-1.2.10.tar.bz2) = 1107007 diff --git a/audio/alsa-lib/files/patch-src_async.c b/audio/alsa-lib/files/patch-src_async.c deleted file mode 100644 index a510736e9607e..0000000000000 --- 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 index 4c2c9d6f565ba..d85c2d9d874cc 100644 --- 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.orig 2022-01-01 09:52:43 UTC +++ src/conf/alsa.conf -@@ -8,8 +8,8 @@ +@@ -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 deleted file mode 100644 index ec8600e63c9d2..0000000000000 --- a/audio/alsa-lib/files/patch-src_pcm_pcm__direct.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/pcm/pcm_direct.c.orig 2016-03-31 13:10:39 UTC -+++ src/pcm/pcm_direct.c -@@ -44,12 +44,17 @@ - * - */ - -+#if !defined(__DragonFly__) && !defined(__OpenBSD__) \ -+ && !(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 index 7c970b7548af5..0000000000000 --- 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 - { diff --git a/audio/alsa-lib/pkg-plist b/audio/alsa-lib/pkg-plist index 5b6f5bfe28732..d9477b58d2bd5 100644 --- a/audio/alsa-lib/pkg-plist +++ b/audio/alsa-lib/pkg-plist @@ -4,6 +4,7 @@ include/alsa/asoundlib.h include/alsa/conf.h include/alsa/control.h include/alsa/control_external.h +include/alsa/control_plugin.h include/alsa/error.h include/alsa/global.h include/alsa/hwdep.h @@ -42,6 +43,8 @@ include/alsa/sound/uapi/sscape_ioctl.h include/alsa/sound/uapi/tlv.h include/alsa/timer.h include/alsa/topology.h +include/alsa/ump.h +include/alsa/ump_msg.h include/alsa/use-case.h include/alsa/version.h include/asoundlib.h @@ -119,6 +122,7 @@ share/alsa/cards/YMF744.conf share/alsa/cards/aliases.conf share/alsa/cards/pistachio-card.conf share/alsa/cards/vc4-hdmi.conf +share/alsa/ctl/default.conf share/alsa/pcm/center_lfe.conf share/alsa/pcm/default.conf share/alsa/pcm/dmix.conf