From owner-dev-commits-ports-all@freebsd.org Mon Sep 20 10:07:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A12067C243; Mon, 20 Sep 2021 10:07:51 +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 4HCgGv1L00z4cnn; Mon, 20 Sep 2021 10:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0271C6475; Mon, 20 Sep 2021 10:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18KA7oHc095403; Mon, 20 Sep 2021 10:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18KA7oV1095402; Mon, 20 Sep 2021 10:07:50 GMT (envelope-from git) Date: Mon, 20 Sep 2021 10:07:50 GMT Message-Id: <202109201007.18KA7oV1095402@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 232ed872c5e4 - main - audio/libsndfile: apply upstream patch for ALSA MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 232ed872c5e412a2a492035c1b97befce1cb49f5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 10:07:51 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=232ed872c5e412a2a492035c1b97befce1cb49f5 commit 232ed872c5e412a2a492035c1b97befce1cb49f5 Author: Adriaan de Groot AuthorDate: 2021-09-20 09:57:05 +0000 Commit: Adriaan de Groot CommitDate: 2021-09-20 10:07:48 +0000 audio/libsndfile: apply upstream patch for ALSA When ALSA is installed, some preprocessor-defines may have overlapping values. This patch was proposed (I think) in the PR mentioned, and then upstreamed. PR: 258362 Reported by: user WHR Obtained from: upstream repository Approved by: tcberner (multimedia@) --- audio/libsndfile/Makefile | 4 ++++ audio/libsndfile/distinfo | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index 95cf2fe40b87..e2396e620863 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -2,9 +2,13 @@ PORTNAME= libsndfile DISTVERSION= 1.0.31 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ +PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ +PATCHFILES= cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch:-p1 + MAINTAINER= multimedia@FreeBSD.org COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo index 74794f1ef4cb..00e9b34e060c 100644 --- a/audio/libsndfile/distinfo +++ b/audio/libsndfile/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1611780647 +TIMESTAMP = 1632130804 SHA256 (libsndfile-1.0.31.tar.bz2) = a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163 SIZE (libsndfile-1.0.31.tar.bz2) = 875335 +SHA256 (cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch) = 51607b67698d0427ef03488c1486e40a0da61e91f6404fa876c1776b197b9c44 +SIZE (cc342f9e45315f9f3de12ae493bc6b3a2bd0a0b1.patch) = 793