summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-04-26 22:48:41 -0400
committerMatt Turner <mattst88@gentoo.org>2021-04-26 22:48:52 -0400
commit4e848e1a42b49ba606f7e7bcf45ab97d09f1e57c (patch)
tree5d628e3ddf0caa008b0d805c061b57d37e02f763 /media-sound
parentdev-cpp/gconfmm: Fix build with glib-2.68 (diff)
downloadgentoo-4e848e1a42b49ba606f7e7bcf45ab97d09f1e57c.tar.gz
gentoo-4e848e1a42b49ba606f7e7bcf45ab97d09f1e57c.tar.bz2
gentoo-4e848e1a42b49ba606f7e7bcf45ab97d09f1e57c.zip
media-sound/ardour: Fix build with glib-2.68
Thanks to Greg Turner for tracking down the upstream patches necessary to resolve these bugs. Closes: https://bugs.gentoo.org/777711 Closes: https://bugs.gentoo.org/784383 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/ardour/Manifest1
-rw-r--r--media-sound/ardour/ardour-6.6-r1.ebuild3
-rw-r--r--media-sound/mangler/metadata.xml2
3 files changed, 5 insertions, 1 deletions
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index f22a710c46f0..400b25ec05af 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
+DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
diff --git a/media-sound/ardour/ardour-6.6-r1.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
index d55b9f5ed21a..fd67dc625453 100644
--- a/media-sound/ardour/ardour-6.6-r1.ebuild
+++ b/media-sound/ardour/ardour-6.6-r1.ebuild
@@ -16,6 +16,7 @@ if [[ ${PV} == *9999* ]]; then
else
KEYWORDS="amd64 x86"
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+ SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-volatile-atomic-glib-2.68.patch.gz"
S="${WORKDIR}/Ardour-${PV}.0"
fi
@@ -87,6 +88,8 @@ src_prepare() {
default
xdg_src_prepare
+ eapply "${WORKDIR}/${P}-volatile-atomic-glib-2.68.patch"
+
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
OPTFLAGS=""
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index 1ca96e6372cb..cd29bd7d1973 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -8,7 +8,7 @@
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>