gentoo resync : 25.11.2020

6 files changed, 39 insertions, 589 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 58b190ba40c6..069467807534 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,6 @@
-AUX ardour-6.2-fix-no-nls.patch 13153 BLAKE2B e246105d9c4b43c109155716903de02051bde2e1c77035e6c1295ec44fa7483e2a1cb0a92cfd7d26ebb7df9919390e462a50e269a38174d6ff54c6c5e358eb51 SHA512 98b3d10d6b7ee371ce2b32c2ec730555739188b555f273198b6e096972d58f37d49d205e6de97299b8cfcaa8ad5c27d461207fa6ea02999dc0ddc7e375c5fd9e
-AUX ardour-6.2-use-signed-int-for-atomic-operations.patch 2015 BLAKE2B 535da9c7318a2c5e12f2d531acb09a47ebcb570bd59583e5683df05c1067d81e09f0fbd7a45f89843571fbc3a655c68bf11313c4aa73f9ce02fdc52c68414fae SHA512 720ee2920cbb88ff5266202ffdf5464503550f47fa440466aa241e89380548c31079700a1cf55dd9dd76a4e9185be6fff9ee8d499cc5e0bfc7976a7ebd0869fe
-DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
-EBUILD ardour-6.2-r1.ebuild 4531 BLAKE2B bb80b35e9ee409319f2179d9d899d5c3364dc56db33f241d1881723a29bb16ad7f8ebff99c348163a17b0a3c27fa9de086a465b99d7d0f6866c7e0198018dd19 SHA512 9c37a9e9086300d93e2e462f3de52bb0f4985ae6b52790d54327b5eeeb71bab91afcff2db39091919d43fdb46c1399f18bfd97b8ac72157dd8f7eab53d373483
-EBUILD ardour-6.3.ebuild 4420 BLAKE2B b4d034279e29e9db62c0c890e28b216c44c37697b57f51c5f5a4db0f5ed3e3b1bd0432f3022a0e4179fe8df7cd7792b7362af88b8aecb58998d9c3db228b9383 SHA512 45b0ab3bf7e5fc8e27e7d6c0520b324d52f546ec3831dc4cf66203d37f4361b9c4851092f7ddbd77069eddca4f73de3b81f4c03bff65c53eb41c59dea0b5dbcb
-EBUILD ardour-9999.ebuild 4200 BLAKE2B cc1cc69ddb90f45526ad638f551b266a4742525634386cc24c48cbcd30986ec9c1c2e2cb6ebc88c654ae94e13583dc8dfda6491ef7110799d3aa8987fb9597b1 SHA512 863550b9a61b77aa128fe30d4772c2a2b6394d8cb3eddcd24da792ab94f788c0743c18d431cd055ac21a7bd1bfe976f94651721dfc87a9cf8654b3d83f2543a7
+DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
+EBUILD ardour-6.3.ebuild 4419 BLAKE2B d8ec8546041eb45e1aef45b41139af34e427d06094cf2cb852188e362f694283e24ccdb9d54d1a9767325755c5d243935eae05aaec1e1021decf3fd8107bf83c SHA512 8bfa2d6eec80d481544abd581ccbd8295d980a13569e2263534e412b25a83f70dd5908f099558844e13340d287d14432433a273cb9239b31388ebc45b6ea80eb
+EBUILD ardour-6.5.ebuild 4310 BLAKE2B b225682af4b2313a1b19d1783213e697db309087035342badbb16a859182a2dce8f2552ba1cc5aaccae230a28513e14050701a7bcdbb62a274c351be1b0a035e SHA512 ffc827acc249c59c0d9db99e0043ec4aeb99fb9caafc47f13e7a24d8fea0cce3375efba72ccc321f3e5a92f19309557c83a09ae7a9c3916507a47af8b0f52e6a
+EBUILD ardour-9999.ebuild 4090 BLAKE2B c3da061eefaee34c10f45e19c8d52be1a1de40fd2cc56f8668aabf932d7f18807dbc16885307548f77dc5c5007e6a30810636473d92f9c7d625c229675abbbcc SHA512 f527f0fce3f64cabf7be4555cb9bac3cb346eec8b25125c6a15449486b8449e30ac476fb315edf00d2cf4284aab7953f7df42e3d944a3b5d84736063b8b517eb
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 75cb0848c611..fa0b243c2ab8 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -8,13 +8,13 @@ PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 735fd6555384..1630d2192905 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -8,13 +8,13 @@ PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
@@ -24,13 +24,13 @@ SLOT="6"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	media-libs/rubberband
+	media-libs/taglib
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
 	virtual/libusb:1
 	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -70,11 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-no-nls.patch"
-	"${FILESDIR}/${P}-use-signed-int-for-atomic-operations.patch"
-)
-
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9e5b5ec26e19..b4637a515b8a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -8,7 +8,7 @@ PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
 inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
@@ -24,13 +24,13 @@ SLOT="6"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	media-libs/rubberband
+	media-libs/taglib
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
 	virtual/libusb:1
 	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
deleted file mode 100644
index cc03d0baff50..000000000000
--- a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:39:32 +0200
-Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361
-
-Ardour's "pbd/i18n.h" needs to be included last,
-after any include that may indirectly pull in getext or libintl.
-
-For that reason "pbd/i18n.h" must not be used in header files either.
----
- libs/ardour/ardour/disk_reader.h                           | 7 +------
- libs/ardour/ardour/disk_writer.h                           | 4 +---
- libs/ardour/ardour/transport_master.h                      | 3 +--
- libs/ardour/disk_reader.cc                                 | 6 ++++++
- libs/ardour/disk_writer.cc                                 | 6 ++++++
- libs/ardour/port.cc                                        | 3 ++-
- libs/ardour/port_engine_shared.cc                          | 3 ++-
- libs/ardour/region.cc                                      | 3 ++-
- libs/ardour/transport_fsm.cc                               | 3 ++-
- libs/ardour/transport_master.cc                            | 2 +-
- libs/surfaces/contourdesign/button_config_widget.cc        | 3 ++-
- libs/surfaces/contourdesign/contourdesign_gui.cc           | 4 ++--
- libs/surfaces/contourdesign/jump_distance_widget.cc        | 2 +-
- .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++-
- 14 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
-index 724c091b3..d9773bbeb 100644
---- a/libs/ardour/ardour/disk_reader.h
-+++ b/libs/ardour/ardour/disk_reader.h
-@@ -22,8 +22,6 @@
- 
- #include <boost/optional.hpp>
- 
--#include "pbd/i18n.h"
--
- #include "evoral/Curve.h"
- 
- #include "ardour/disk_io.h"
-@@ -46,10 +44,7 @@ public:
- 
- 	bool set_name (std::string const& str);
- 
--	std::string display_name () const
--	{
--		return std::string (_("player"));
--	}
-+	std::string display_name () const;
- 
- 	static samplecnt_t chunk_samples ()
- 	{
-diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
-index 2bd753a00..511b6bc4f 100644
---- a/libs/ardour/ardour/disk_writer.h
-+++ b/libs/ardour/ardour/disk_writer.h
-@@ -23,8 +23,6 @@
- #include <list>
- #include <vector>
- 
--#include "pbd/i18n.h"
--
- #include "ardour/disk_io.h"
- #include "ardour/midi_buffer.h"
- 
-@@ -42,7 +40,7 @@ public:
- 	~DiskWriter ();
- 
- 	bool set_name (std::string const& str);
--	std::string display_name () const { return std::string (_ ("recorder")); }
-+	std::string display_name () const;
- 
- 	bool recordable () const { return _flags & Recordable; }
- 
-diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
-index d6b554ef8..af98c0b3a 100644
---- a/libs/ardour/ardour/transport_master.h
-+++ b/libs/ardour/ardour/transport_master.h
-@@ -29,7 +29,6 @@
- 
- #include <ltc.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/properties.h"
- #include "pbd/signals.h"
- #include "pbd/statefuldestructible.h"
-@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
- 
- 		do {
- 			if (tries == 10) {
--				std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
-+				std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
- 				Glib::usleep (20);
- 				tries = 0;
- 			}
-diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
-index 252a84a65..5fa694485 100644
---- a/libs/ardour/disk_reader.cc
-+++ b/libs/ardour/disk_reader.cc
-@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
- 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
- }
- 
-+std::string
-+DiskReader::display_name () const
-+{
-+	return std::string (_("player"));
-+}
-+
- void
- DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
-index aee4f9301..34aa3f1e9 100644
---- a/libs/ardour/disk_writer.cc
-+++ b/libs/ardour/disk_writer.cc
-@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
- 	return 65536;
- }
- 
-+std::string
-+DiskWriter::display_name () const
-+{
-+	return std::string (_ ("recorder"));
-+}
-+
- void
- DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
-index 9bc318a14..8be47efbd 100644
---- a/libs/ardour/port.cc
-+++ b/libs/ardour/port.cc
-@@ -26,7 +26,6 @@
- #include "pbd/compose.h"
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -34,6 +33,8 @@
- #include "ardour/port_engine.h"
- #include "ardour/rc_configuration.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
-index f8ab0e204..ad32762f0 100644
---- a/libs/ardour/port_engine_shared.cc
-+++ b/libs/ardour/port_engine_shared.cc
-@@ -21,10 +21,11 @@
- #include <regex.h>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/port_engine_shared.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- 
- BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index cb42f1d2c..ab6042af3 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -30,7 +30,6 @@
- 
- #include <glibmm/threads.h>
- 
--#include "pbd/i18n.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
- 
-@@ -47,6 +46,8 @@
- #include "ardour/transient_detector.h"
- #include "ardour/types_convert.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
-index 484106785..59de3d1de 100644
---- a/libs/ardour/transport_fsm.cc
-+++ b/libs/ardour/transport_fsm.cc
-@@ -22,7 +22,6 @@
- #include <boost/none.hpp>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- #include "pbd/pthread_utils.h"
- #include "pbd/stacktrace.h"
- 
-@@ -31,6 +30,8 @@
- #include "ardour/session.h"
- #include "ardour/transport_fsm.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- 
-diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
-index ea56a860b..e76fd5eb6 100644
---- a/libs/ardour/transport_master.cc
-+++ b/libs/ardour/transport_master.cc
-@@ -21,7 +21,6 @@
- 
- #include "pbd/boost_debug.h"
- #include "pbd/debug.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -32,6 +31,7 @@
- #include "ardour/types_convert.h"
- #include "ardour/utils.h"
- 
-+#include "pbd/i18n.h"
- 
- namespace ARDOUR {
- 	namespace Properties {
-diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
-index 785c8c6b1..f46f80f12 100644
---- a/libs/surfaces/contourdesign/button_config_widget.cc
-+++ b/libs/surfaces/contourdesign/button_config_widget.cc
-@@ -24,12 +24,13 @@
- #include "gtkmm2ext/actions.h"
- #include "gtkmm2ext/action_model.h"
- 
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/signals.h"
- 
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace ArdourSurface;
-diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
-index 3d061b060..ed58c787d 100644
---- a/libs/surfaces/contourdesign/contourdesign_gui.cc
-+++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
-@@ -37,12 +37,12 @@
- 
- #include "widgets/ardour_button.h"
- 
--#include "pbd/i18n.h"
--
- #include "contourdesign.h"
- #include "jump_distance_widget.h"
- #include "button_config_widget.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ArdourSurface;
- 
- class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
-diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
-index 8469658a1..dacc3a752 100644
---- a/libs/surfaces/contourdesign/jump_distance_widget.cc
-+++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
-@@ -21,10 +21,10 @@
- #include <gtkmm/spinbutton.h>
- 
- #include "gtkmm2ext/utils.h"
--#include "pbd/i18n.h"
- 
- #include "jump_distance_widget.h"
- 
-+#include "pbd/i18n.h"
- 
- using namespace std;
- using namespace Gtk;
-diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-index c5ba0b794..31e5383dc 100644
---- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-@@ -41,7 +41,6 @@
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
-@@ -66,6 +65,8 @@
- 
- #include "pbd/abstract_ui.cc" // instantiate template
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Glib;
--- 
-2.28.0
-
-
-From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:40:02 +0200
-Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361
-
----
- gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
- gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
- gtk2_ardour/pt_import_selector.cc   | 3 ++-
- gtk2_ardour/startup_fsm.cc          | 3 ++-
- gtk2_ardour/template_dialog.cc      | 4 ++--
- gtk2_ardour/transport_control.cc    | 4 ++--
- session_utils/fix_bbtppq.cc         | 3 ++-
- 7 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
-index 7986e2ca3..781b65262 100644
---- a/gtk2_ardour/ardour_ui_access_web.cc
-+++ b/gtk2_ardour/ardour_ui_access_web.cc
-@@ -36,12 +36,13 @@
- #include "gtk2ardour-version.h"
- #endif
- 
--#include "pbd/i18n.h"
- #include "pbd/openuri.h"
- 
- #include "ardour_message.h"
- #include "ardour_ui.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Gtk;
-diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
-index d28ae7c14..24810d3e7 100644
---- a/gtk2_ardour/ardour_ui_dependents.cc
-+++ b/gtk2_ardour/ardour_ui_dependents.cc
-@@ -33,7 +33,6 @@
- #include <cstdio>
- 
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/session.h"
- #include "ardour/lv2_plugin.h"
-@@ -62,6 +61,8 @@
- #include <gdk/gdkx.h>
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace PBD;
- 
-diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
-index da65bcb72..318da1e35 100644
---- a/gtk2_ardour/pt_import_selector.cc
-+++ b/gtk2_ardour/pt_import_selector.cc
-@@ -22,7 +22,6 @@
- #include <iostream>
- 
- #include "pbd/gstdio_compat.h"
--#include "pbd/i18n.h"
- #include "pbd/file_utils.h"
- 
- #include "ptformat/ptformat.h"
-@@ -33,6 +32,8 @@
- 
- #include "pt_import_selector.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
-index c52b0ecea..dfdd01ce4 100644
---- a/gtk2_ardour/startup_fsm.cc
-+++ b/gtk2_ardour/startup_fsm.cc
-@@ -26,7 +26,6 @@
- #include "pbd/basename.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- 
- #include "ardour/audioengine.h"
- #include "ardour/filename_extensions.h"
-@@ -58,6 +57,8 @@
- #include "gtk2ardour-version.h"
- #endif
- 
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace Gtk;
- using namespace Gtkmm2ext;
-diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
-index e0c5590ee..c9c37d00e 100644
---- a/gtk2_ardour/template_dialog.cc
-+++ b/gtk2_ardour/template_dialog.cc
-@@ -40,7 +40,6 @@
- #include "pbd/error.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/xml++.h"
- 
- #include "gtkmm2ext/gui_thread.h"
-@@ -52,9 +51,10 @@
- #include "ardour/template_utils.h"
- 
- #include "progress_reporter.h"
--
- #include "template_dialog.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace PBD;
-diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
-index a7be5903d..0828febb6 100644
---- a/gtk2_ardour/transport_control.cc
-+++ b/gtk2_ardour/transport_control.cc
-@@ -16,8 +16,6 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include "pbd/i18n.h"
--
- #include "ardour/location.h"
- #include "ardour/session.h"
- 
-@@ -25,6 +23,8 @@
- #include "ardour_ui.h"
- #include "transport_control.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- 
- TransportControlProvider::TransportControlProvider ()
-diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
-index e3767c8cd..81b148bcc 100644
---- a/session_utils/fix_bbtppq.cc
-+++ b/session_utils/fix_bbtppq.cc
-@@ -25,7 +25,6 @@
- #include <glibmm.h>
- 
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/stateful.h"
- 
- #include "ardour/region_factory.h"
-@@ -44,6 +43,8 @@
- 
- #include "common.h"
- 
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace SessionUtils;
--- 
-2.28.0
-
diff --git a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
deleted file mode 100644
index 90454593b68d..000000000000
--- a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 16:13:21 +0200
-Subject: [PATCH] Use signed int for atomic operations -- #8314
-
----
- libs/pbd/pbd/mpmc_queue.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h
-index a7909a901..2c08068e1 100644
---- a/libs/pbd/pbd/mpmc_queue.h
-+++ b/libs/pbd/pbd/mpmc_queue.h
-@@ -82,7 +82,7 @@ public:
- 	push_back (T const& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_enqueue_pos);
-+		gint    pos = g_atomic_int_get (&_enqueue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -108,7 +108,7 @@ public:
- 	pop_front (T& data)
- 	{
- 		cell_t* cell;
--		guint   pos = g_atomic_int_get (&_dequeue_pos);
-+		gint    pos = g_atomic_int_get (&_dequeue_pos);
- 		for (;;) {
- 			cell         = &_buffer[pos & _buffer_mask];
- 			guint    seq = g_atomic_int_get (&cell->_sequence);
-@@ -138,8 +138,8 @@ private:
- 	cell_t* _buffer;
- 	size_t  _buffer_mask;
- 
--	volatile guint _enqueue_pos;
--	volatile guint _dequeue_pos;
-+	volatile gint _enqueue_pos;
-+	volatile gint _dequeue_pos;
- };
- 
- } /* end namespace */
--- 
-2.28.0
-
-From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 18:07:14 +0200
-Subject: [PATCH] Use signed int for atomic operations part II -- #8314
-
----
- libs/ardour/ardour/session.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
-index dcc8c88ed..f491f7f17 100644
---- a/libs/ardour/ardour/session.h
-+++ b/libs/ardour/ardour/session.h
-@@ -1762,7 +1762,7 @@ private:
- 		OnlyLoop,
- 	};
- 
--	volatile guint _punch_or_loop; // enum PunchLoopLock
-+	volatile gint _punch_or_loop; // enum PunchLoopLock
- 	gint current_usecs_per_track;
- 
- 	bool punch_active () const;
--- 
-2.28.0