From e2a338c9bbe6c03873acf3a71728cfce002bb1ac Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Fri, 13 Nov 2020 09:34:37 +0100 Subject: media-sound/ardour: removed obsolete 6.2-r1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Miroslav Šulc --- media-sound/ardour/Manifest | 1 - media-sound/ardour/ardour-6.2-r1.ebuild | 157 ------- .../ardour/files/ardour-6.2-fix-no-nls.patch | 474 --------------------- ...-6.2-use-signed-int-for-atomic-operations.patch | 69 --- 4 files changed, 701 deletions(-) delete mode 100644 media-sound/ardour/ardour-6.2-r1.ebuild delete mode 100644 media-sound/ardour/files/ardour-6.2-fix-no-nls.patch delete mode 100644 media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch (limited to 'media-sound') diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index c97770ccc71c..a713cb887b99 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,2 +1 @@ -DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0 diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild deleted file mode 100644 index a35b090054a2..000000000000 --- a/media-sound/ardour/ardour-6.2-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -PYTHON_REQ_USE='threads(+)' -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="https://ardour.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" - inherit git-r3 -else - KEYWORDS="amd64 x86" - SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -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-libs/boost:= - >=dev-libs/glib-2.10.1:2 - dev-libs/libsigc++:2 - >=dev-libs/libxml2-2.6:2 - dev-libs/libxslt - >=gnome-base/libgnomecanvas-2 - media-libs/alsa-lib - media-libs/aubio - media-libs/flac - 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/raptor:2 - >=media-libs/rubberband-1.6.0 - >=media-libs/taglib-1.7 - 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/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... - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - jack? ( virtual/jack ) - sys-devel/gettext - 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" -} - -pkg_setup() { - if has_version \>=dev-libs/libsigc++-2.6 ; then - append-cxxflags -std=c++11 - fi - python-any-r1_pkg_setup -} - -src_prepare() { - default - sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die - MARCH=$(get-flag march) - OPTFLAGS="" - if use cpu_flags_x86_sse; then - if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the flags now, but please consider switching your march in make.conf!" - fi - OPTFLAGS="sse" - fi - if use cpu_flags_x86_mmx; then - if [[ ${MARCH} == "i486" ]]; then - elog "You enabled mmx with i486 set as march! You have been warned!" - fi - OPTFLAGS="${OPTFLAGS} mmx" - fi - if use cpu_flags_x86_3dnow; then - OPTFLAGS="${OPTFLAGS} 3dnow" - fi - sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ - -i "${S}"/wscript || die - sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die - append-flags "-lboost_system" - python_fix_shebang "${S}"/wscript - python_fix_shebang "${S}"/waf - my_lcmsg() { - rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po - } - l10n_for_each_disabled_locale_do my_lcmsg -} - -src_configure() { - local backends="alsa" - use jack && backends+=",jack" - use pulseaudio && backends+=",pulseaudio" - - tc-export CC CXX - mkdir -p "${D}" - waf-utils_src_configure \ - --destdir="${D}" \ - --configdir=/etc \ - --optimize \ - --with-backends=${backends} \ - $(usex doc "--docs" '') \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(usex phonehome "--phone-home" "--no-phone-home") \ - $(usex nls "--nls" "--no-nls") -#not possible right now --use-external-libs -} -src_compile() { - waf-utils_src_compile - use nls && waf-utils_src_compile i18n -} -src_install() { - waf-utils_src_install - mv ${PN}.1 ${PN}${SLOT}.1 - doman ${PN}${SLOT}.1 - newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png - make_desktop_entry ardour6 ardour6 ardour6 AudioVideo -} - -pkg_postinst() { - elog "Please do _not_ report problems with the package to ${PN} upstream." - elog "If you think you've found a bug, check the upstream binary package" - elog "before you report anything to upstream." -} 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 -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 - --#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 - #include - --#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 - --#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 - - #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 - --#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 - - #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 - - #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 -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 - - #include "pbd/error.h" --#include "pbd/i18n.h" - - #include "ardour/session.h" - #include "ardour/lv2_plugin.h" -@@ -62,6 +61,8 @@ - #include - #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 - - #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 - - #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 -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 -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 -- cgit v1.2.3-65-gdbad