From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1290721-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 446BD1382C5
for <garchives@archives.gentoo.org>; Sat, 5 Jun 2021 20:09:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 217C8E08C8;
Sat, 5 Jun 2021 20:09:53 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id EC370E08C8
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Jun 2021 20:09:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 392D5340D73
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Jun 2021 20:09:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CBA91733
for <gentoo-commits@lists.gentoo.org>; Sat, 5 Jun 2021 20:09:49 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1622923756.a151fbb00ab4a8d9be82dc84a1c920a83777f52e.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/alsa-lib/Manifest media-libs/alsa-lib/alsa-lib-1.2.5.ebuild media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
X-VCS-Directories: media-libs/alsa-lib/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: a151fbb00ab4a8d9be82dc84a1c920a83777f52e
X-VCS-Branch: master
Date: Sat, 5 Jun 2021 20:09:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 044dc136-af8c-4082-875d-935594cdde60
X-Archives-Hash: 31fc3e9c051908cac87753860058f942
commit: a151fbb00ab4a8d9be82dc84a1c920a83777f52e
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com>
AuthorDate: Thu Jun 3 19:02:32 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 20:09:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a151fbb0
media-libs/alsa-lib: updates to a snapshot for many important fixes
This commit updates alsa-lib to a snapshot from June 4, 2021 containing
a fix for missing HDMI audio profiles that many people reported across
distributions. Also multiple fixes for possible crashes or worse.
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> (HDMI issue)
Thanks-to: Wim Taymans <wtaymans <AT> redhat.com> (_alibpref clarification)
Thanks-to: Jaroslav Kysela <perex <AT> perex.cz> (Fedora patchset)
Bug: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1251
Closes: https://bugs.gentoo.org/793410
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 2 +-
...1.2.5.ebuild => alsa-lib-1.2.5_p20210604.ebuild} | 21 ++++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 088fbc2ca50..ece4621318c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,4 +1,4 @@
DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-DIST alsa-lib-1.2.5.tar.bz2 1068496 BLAKE2B 84fe4e22d4316bfc84f15f2493f40f113eb3db7722f230550586533e80daf214140164e8ddc1a399b82a3fd0fb21125ff225cfeb45eaa19320c2e2aa3997c662 SHA512 d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
+DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
similarity index 69%
rename from media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
index 8183119b95e..df1ce950ded 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
@@ -6,9 +6,20 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools multilib-minimal python-single-r1
+# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
+COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
+SNAPSHOT_PV="1.2.5_p20210604"
+
DESCRIPTION="Advanced Linux Sound Architecture Library"
HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+if [[ -n ${COMMIT} ]]; then
+ SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+ # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
LICENSE="LGPL-2.1"
SLOT="0"
@@ -28,6 +39,14 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
)
+pkg_pretend() {
+ if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
+ eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
+ elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
+ eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
+ fi
+}
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}