From nobody Sun Oct 22 15:10:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SD1ws3gpnz4xR17; Sun, 22 Oct 2023 15:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SD1ws3DdWz4NF6; Sun, 22 Oct 2023 15:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pN70tL4lIl1U0o0d0dAeVReMThOhWyGiAenALxF8u1o=; b=pjjpl0fGTNs5pFNz99FW/3sLM6gsHk7MaYZreCntd1O5MqpS4Tvn77LZxVeYcxOi8jwLTu N2ErTlKVRW8KSoEINGPBQdkU6sn9HTmymiTwTiXDJdbG047f5T+pWWX5wj9Eh9WMAXGtGu mA6k2eXXlyNvnc0KZAqYxuPjAT71ITJT4WOqNa2TZpzwtD8gZO0z1tD1mJI2brUQkUika3 yPejTB+gPBJq/I6/F6PsFXkWzHNbxcCxvbTwsePN6upjsjXWFjDd8Fhm2oIlwJ7JdA/CZ1 HXSsB3s6PJ0MUBrhNLXRvpIGwo/KJ9IQ9ebqmsEfN2ZSWyEWn80ddErAxFkAQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697987453; a=rsa-sha256; cv=none; b=R7fGHJLyEPYTU+IiLlFgjGoIN72xBO5p+2kMDl87j8zr50o5qNVMnsZzqCgIzOirW97ZqQ 2mBIuu8C+/67s7/EXriZL8HR+H+KwigJS3XQ6tN9bc6KpBL8FYpK3C4mV7MJWhOA4SAWew iUswQmF8lgBn0VtsOqlU+DzD2G64JcKOqYY7YnK+uPXguBN/oaHf+J1IslRHoko4hbXc0R 7FD2hD84zLSP0eQ4ATCOjlyT1tBTEdUwZq7OmYVbcsWKhIhZFfclR3+GpJ/Jjm6F7MhWNf cUVBCalR9bTMGho7pkYJ2Aj16qusnDmdU9xXaWvGOwEQGl5hqMGE/XyZmcstLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697987453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pN70tL4lIl1U0o0d0dAeVReMThOhWyGiAenALxF8u1o=; b=wi+vQInCNjxpEIiOC2GXsemEqNkSYXD0fROfwTq4FXNk80ClKkhFS/LbH8/FtNLS93npsq h56fdbKGdOhiX+Zrlu89BhqzIMSrABUNwEPKNHkBys/JWPjPggiFlY0TNdVCX9xVIywpzZ LHWSZXWwmf7C55vF/z5LiNWmgbWUdsYl1ELqfPRnU3DOIzyr0H6gSC4HcWU5mb9cB1iEha mOBb8fu6hCqHq19MplJdzgD4pmk29kWP7s0LBmofpLksfO2LtfZ3SsnlbsU8Ncwmr07csD OUNteF/cRw0d0s3rtkvHIHwASOwSirmCRaNuTdVnUeaDFMyomCc4Sf3S67gN6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SD1ws2Jwbz12PN; Sun, 22 Oct 2023 15:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39MFArqE043253; Sun, 22 Oct 2023 15:10:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MFArp5043250; Sun, 22 Oct 2023 15:10:53 GMT (envelope-from git) Date: Sun, 22 Oct 2023 15:10:53 GMT Message-Id: <202310221510.39MFArp5043250@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: a32155c6975a - main - audio/alsa-lib: Update to version 1.2.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a32155c6975a0fcd266639ae11d4aceb2bf0122e Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=a32155c6975a0fcd266639ae11d4aceb2bf0122e commit a32155c6975a0fcd266639ae11d4aceb2bf0122e Author: Rodrigo Osorio AuthorDate: 2023-10-03 10:12:03 +0000 Commit: Rodrigo Osorio CommitDate: 2023-10-22 15:07:38 +0000 audio/alsa-lib: Update to version 1.2.10 Full Changelog: https://github.com/alsa-project/alsa-lib/tags PR: 262089 --- audio/alsa-lib/Makefile | 18 +++++---------- audio/alsa-lib/distinfo | 6 ++--- audio/alsa-lib/files/patch-src_async.c | 28 ------------------------ audio/alsa-lib/files/patch-src_conf_alsa.conf | 12 +++++----- audio/alsa-lib/files/patch-src_pcm_pcm__direct.c | 20 ----------------- audio/alsa-lib/files/patch-test_midifile.c | 20 ----------------- audio/alsa-lib/pkg-plist | 4 ++++ 7 files changed, 20 insertions(+), 88 deletions(-) diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index e4f3ceec6dbf..f92cdb551931 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 2e5d1eeeb2e5..7340d0a43ba4 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 a510736e9607..000000000000 --- 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 4c2c9d6f565b..d85c2d9d874c 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 ec8600e63c9d..000000000000 --- 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 7c970b7548af..000000000000 --- 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 5b6f5bfe2873..d9477b58d2bd 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