Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libffado/
Date: Sun, 19 Sep 2021 11:28:52
Message-Id: 1632050919.49bf146fe32b66b7c98806841bdd2c704f183d81.marecki@gentoo
1 commit: 49bf146fe32b66b7c98806841bdd2c704f183d81
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 19 11:23:01 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 11:28:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49bf146f
7
8 media-libs/libffado: use newer config.guess
9
10 Needed for libffado to build successfully on riscv. Doesn't seem to
11 break anything on previously supported arches - or at least not on
12 amd64.
13
14 Invoking maintainer time-out.
15
16 Closes: https://bugs.gentoo.org/808853
17 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
18
19 media-libs/libffado/Manifest | 1 +
20 media-libs/libffado/libffado-2.4.4-r1.ebuild | 9 ++++++++-
21 2 files changed, 9 insertions(+), 1 deletion(-)
22
23 diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
24 index 77489ffd8af..fe54b5b552b 100644
25 --- a/media-libs/libffado/Manifest
26 +++ b/media-libs/libffado/Manifest
27 @@ -1 +1,2 @@
28 +DIST config.guess-45e181800a6a27268a9c5d79dcc60492fef9a9a0 49348 BLAKE2B 9cb4d625261700bd6c1ece41134ebdabc4b0abaa7c792d73732de8e9e292e65bb155c6bdbabf39feef6a69b08c56b7dc0d07121fe27b391b8e823918abdc1623 SHA512 8d5ab910acd2a795045c36703b5fc4cd6db0a5838ff980d0b62bd108e2cd8213519c6f2a754c49249346d78d4c9d2c8db4346895e02a9b4f5d7f42553c1a706c
29 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
30
31 diff --git a/media-libs/libffado/libffado-2.4.4-r1.ebuild b/media-libs/libffado/libffado-2.4.4-r1.ebuild
32 index 1945430cb85..ab72adf2a6e 100644
33 --- a/media-libs/libffado/libffado-2.4.4-r1.ebuild
34 +++ b/media-libs/libffado/libffado-2.4.4-r1.ebuild
35 @@ -14,7 +14,9 @@ if [[ "${PV}" = "9999" ]]; then
36 inherit subversion
37 ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
38 else
39 - SRC_URI="http://www.ffado.org/files/${P}.tgz"
40 + CONFIG_GUESS_COMMIT="45e181800a6a27268a9c5d79dcc60492fef9a9a0"
41 + SRC_URI="http://www.ffado.org/files/${P}.tgz
42 + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${CONFIG_GUESS_COMMIT} -> config.guess-${CONFIG_GUESS_COMMIT}"
43 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
44 fi
45
46 @@ -79,6 +81,11 @@ myescons() {
47 src_prepare() {
48 default
49
50 + # Bug #808853
51 + if [[ -n "${CONFIG_GUESS_COMMIT}" ]]; then
52 + cp -a "${DISTDIR}"/config.guess-${CONFIG_GUESS_COMMIT} admin/config.guess || die "Failed to update config.guess"
53 + fi
54 +
55 # Always use Qt5
56 sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die