From nobody Sat Feb 03 05:10:06 2024 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 4TRggg25Rzz58KhD; Sat, 3 Feb 2024 05:10:07 +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 4TRggg1Wycz42K4; Sat, 3 Feb 2024 05:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706937007; 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=wGRronnzHPBbrLEOFpTylEr6CGIpFzg2uisRFr5GsAk=; b=lcNCWHDVUrlT/01Fi6QhJO2GTFWq9UKTKHeba/F7qjocn9Pk0aVr+buXcuXlEX/0rgZxo5 9pOwA9oFZxBzYv3y8sjmTbFTnAAxjiF/5iyPZldCZlvtR/t0hitw2AAl26B8DwZklN0xxK 1CA/nPHsXYEVaaxd4RnprpjgTGByOROrlLDdZv1H/soetrTOPXEO+1CvVDo0ni6dvKY6Ja 1he1x7WrrvpLeC3FvQE4m5xoEhRWBKSzrz0dOUHfUwQTr2nqtvydiLWIMMIHsDEh2JDmSv T8bsCesAwKCXjUliUMpNcnAwvLmIew77D1ltFAFRi5SXY3nN5eBtt4pDP2EaCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706937007; 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=wGRronnzHPBbrLEOFpTylEr6CGIpFzg2uisRFr5GsAk=; b=Y+ZtskrIm2h13MUK7ifwlcDYLrKb/YkZD08pGn5a5NCBdSl1911YyrQluQ4+FqhjxenN2t R5NVRSnPCtZXgKIeqJpR/CpIZ0s1NPjm2InUpY9aYPGhAjBoeXSC21x9lQSmAnOsbiTtDV OH9OGswG4E0s167up2XwMqy//JcnVTKPWf8v5AijtaBQZ3P5EKfo03fWwfjfaWvADp64pG i2J2iJDNKhJF1fxv0xQpRqo69EDP//9VjCFoov9S7WO9V92+lFJQy1YobDWgb4i3Yuj1E9 PQxRGot1PoxeE1UKeLqcgdvDtEqyEEhCUN5sLhLMRTMjcA+OpS60ewpNIY8RFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706937007; a=rsa-sha256; cv=none; b=ybFAwe4hXWfXBjB6oUpedueu+RvvK+TGwS44dcZCE92kec5gCRMqjRJLkU59ELa4zvmth6 QG7HaoRTY57wsZbIK50Daf2K4Vj9nZBiGdPjyAgyLeCIeEKZfOwNR71CE4PoN9qjCqbOvg t8Qyqwse5k1kb0xeEV3xguUu4ypikkfbYtj53bN2uYUsf7GZvJzTebxflD5pTpxePJJpvq rS7Y79yf2eW32B6OwzepKXjoQLk28lhuLNlsbUfzsEspHDC2wX380S4J+0Nozn4uDTMTQr Pn9WYvJIA6E8440J+9IqpdzKZDULHf9Ir5wTekEjWSbTWSWB9ujB+2HVsPBywQ== 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 4TRggg0TQrz11FZ; Sat, 3 Feb 2024 05:10:07 +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 4135A6Oh071396; Sat, 3 Feb 2024 05:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4135A6es071391; Sat, 3 Feb 2024 05:10:06 GMT (envelope-from git) Date: Sat, 3 Feb 2024 05:10:06 GMT Message-Id: <202402030510.4135A6es071391@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1ad9c73b5625 - main - audio/linux-c7-alsa-plugins-oss: install vendor config after 077152a79ad8 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ad9c73b5625f7a2457931c435f8d2e34f199a0c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ad9c73b5625f7a2457931c435f8d2e34f199a0c commit 1ad9c73b5625f7a2457931c435f8d2e34f199a0c Author: Jan Beich AuthorDate: 2024-02-03 04:56:13 +0000 Commit: Jan Beich CommitDate: 2024-02-03 05:09:13 +0000 audio/linux-c7-alsa-plugins-oss: install vendor config after 077152a79ad8 linux-c7-alsa-lib uses default config from alsa-lib since 1aaf3941aa56. $ /compat/linux/usr/bin/aplay foo.wav ALSA lib pcm.c:2565:(snd_pcm_open_noupdate) Unknown PCM oss aplay: main:828: audio open error: No such file or directory PR: 245321 --- audio/linux-c7-alsa-plugins-oss/Makefile | 5 +++-- .../linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf | 15 +++++++++++++++ audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 | 2 ++ audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 | 2 ++ audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 | 2 ++ 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile index 27781106b113..d2d0fcaab550 100644 --- a/audio/linux-c7-alsa-plugins-oss/Makefile +++ b/audio/linux-c7-alsa-plugins-oss/Makefile @@ -1,7 +1,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.1.6 DISTVERSIONSUFFIX= -1.el7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio linux MASTER_SITES= CENTOS_LINUX MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/Source/SPackages/ \ @@ -105,6 +105,7 @@ do-install: ${LOCALBASE}/bin/gmake install-strip \ DESTDIR=${STAGEDIR}${LINUXBASE}) ${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la - ${RM} -r ${STAGEDIR}${LINUXBASE}/etc ${STAGEDIR}${LINUXBASE}/usr/share + ${LN} -sf ../../../usr/share/alsa/alsa.conf.d/50-oss.conf \ + ${STAGEDIR}${LINUXBASE}/etc/alsa/conf.d .include diff --git a/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf b/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf new file mode 100644 index 000000000000..47f7c1d9773b --- /dev/null +++ b/audio/linux-c7-alsa-plugins-oss/files/patch-oss_50-oss.conf @@ -0,0 +1,15 @@ +https://github.com/alsa-project/alsa-plugins/commit/ed6684849298 + +ALSA lib pcm_oss.c:863:(_snd_pcm_oss_open) Unknown field port + +--- oss/50-oss.conf.orig 2018-04-03 07:02:58 UTC ++++ oss/50-oss.conf +@@ -5,7 +5,7 @@ pcm.oss { + default "/dev/dsp" + } + type oss +- port $DEVICE ++ device $DEVICE + hint { + show { + @func refer diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 index 894c95e4baa9..e129cafc77ba 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.aarch64 @@ -1,2 +1,4 @@ +etc/alsa/conf.d/50-oss.conf usr/lib64/alsa-lib/libasound_module_ctl_oss.so usr/lib64/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 index d2715433a1ff..8340ccff7658 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 @@ -1,4 +1,6 @@ +etc/alsa/conf.d/50-oss.conf usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so usr/lib64/alsa-lib/libasound_module_ctl_oss.so usr/lib64/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 index f1114fa640b9..fdedf964fa72 100644 --- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 +++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.i386 @@ -1,2 +1,4 @@ +etc/alsa/conf.d/50-oss.conf usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so +usr/share/alsa/alsa.conf.d/50-oss.conf