[rpms/ardour7] rawhide: Merge branch 'f43' into rawhide

[Nils Philippsen <nils@tiptoe.de>]

A new commit has been pushed.

Repo   : rpms/ardour7
Branch : rawhide
Commit : 6b4e95ebb5ec623216b85211ec38fe4b61a62f4c
Author : Nils Philippsen <nils@tiptoe.de>
Date   : 2026-08-10T22:23:56+02:00
Stats  : +142/-1 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/ardour7/c/6b4e95ebb5ec623216b85211ec38fe4b61a62f4c?branch=rawhide

Log:
Merge branch 'f43' into rawhide

---
diff --git a/0001-Add-C++17-option-to-force-compiles-to-use-std-cxx17.patch b/0001-Add-C++17-option-to-force-compiles-to-use-std-cxx17.patch
new file mode 100644
index 0000000..5091a63
--- /dev/null
+++ b/0001-Add-C++17-option-to-force-compiles-to-use-std-cxx17.patch
@@ -0,0 +1,47 @@
+From 0ed82d2f506bdd641b72f994181be2f4a55256b1 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Sat, 14 Sep 2024 16:05:47 +0200
+Subject: [PATCH] Add C++17 option to force compiles to use std=cxx17
+
+---
+ wscript | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/wscript b/wscript
+index f5aa95d68f2..f6d13854d69 100644
+--- a/wscript
++++ b/wscript
+@@ -566,9 +566,14 @@ int main() { return 0; }''',
+         cxx_flags.append('--stdlib=libc++')
+         linker_flags.append('--stdlib=libc++')
+ 
+-    if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura' ]:
++    if conf.options.cxx17 or conf.env['build_host'] in [ 'bigsur', 'monterey', 'ventura' ]:
++        conf.check_cxx(cxxflags=["-std=c++17"])
++        cxx_flags.append('-std=c++17')
++    elif conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]:
+         conf.check_cxx(cxxflags=["-std=c++11"])
+         cxx_flags.append('-std=c++11')
++
++    if conf.options.cxx11 or conf.options.cxx17 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura' ]:
+         if platform == "darwin":
+             # Mavericks and later changed the syntax to be used when including Carbon headers,
+             # from requiring a full path to requiring just the header name.
+@@ -960,6 +965,8 @@ def options(opt):
+                     help='Do not ask questions that require confirmation during the build')
+     opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11',
+                     help='Turn on c++11 compiler flags (-std=c++11)')
++    opt.add_option('--cxx17', action='store_true', default=False, dest='cxx17',
++                    help='Turn on c++17 compiler flags (-std=c++17)')
+     opt.add_option('--use-libc++', action='store_true', default=False, dest='use_libcpp',
+                     help='Use libc++ instead of default or auto-detected stdlib')
+     opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan',
+@@ -1267,7 +1274,7 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
+         conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW')
+         conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS')
+         conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW')
+-        if conf.options.cxx11:
++        if conf.options.cxx11 or conf.options.cxx17:
+             conf.env.append_value('CFLAGS', '-D_USE_MATH_DEFINES')
+             conf.env.append_value('CXXFLAGS', '-D_USE_MATH_DEFINES')
+             conf.env.append_value('CFLAGS', '-DWIN32')

diff --git a/0002-Fix-for-Boost-1.8.5.patch b/0002-Fix-for-Boost-1.8.5.patch
new file mode 100644
index 0000000..ece6424
--- /dev/null
+++ b/0002-Fix-for-Boost-1.8.5.patch
@@ -0,0 +1,34 @@
+From f94bde59d740d65e67c5cd13af4d7ea51453aeaa Mon Sep 17 00:00:00 2001
+From: Fabio Pesari <posta@parallelo.eu>
+Date: Sun, 15 Sep 2024 11:04:30 +0200
+Subject: [PATCH] Fix for Boost 1.8.5
+
+Recent boost prevents calls to `get_child` with temporary
+default values.
+---
+ libs/surfaces/websockets/message.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libs/surfaces/websockets/message.cc b/libs/surfaces/websockets/message.cc
+index eff8e48ac39..0aee14d0dfd 100644
+--- a/libs/surfaces/websockets/message.cc
++++ b/libs/surfaces/websockets/message.cc
+@@ -58,14 +58,16 @@ NodeStateMessage::NodeStateMessage (void* buf, size_t len)
+ 
+ 		_state = NodeState (root.get<std::string> ("node"));
+ 
+-		pt::ptree addr = root.get_child ("addr", pt::ptree ());
++		pt::ptree addr = pt::ptree ();
++		addr = root.get_child ("addr", addr);
+ 
+ 		for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) {
+ 			// throws if datatype not uint32_t
+ 			_state.add_addr (boost::lexical_cast<uint32_t> (it->second.data ()));
+ 		}
+ 
+-		pt::ptree val = root.get_child ("val", pt::ptree ());
++		pt::ptree val = pt::ptree ();
++		val = root.get_child ("val", val);
+ 
+ 		for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) {
+ 			std::string val = it->second.data ();

diff --git a/0004-Potential-fix-for-taglib-v2.0-crashes-when-exporting.patch b/0004-Potential-fix-for-taglib-v2.0-crashes-when-exporting.patch
new file mode 100644
index 0000000..464298d
--- /dev/null
+++ b/0004-Potential-fix-for-taglib-v2.0-crashes-when-exporting.patch
@@ -0,0 +1,29 @@
+From 35686baa2be5de8bc87983b47926c3a15ee1d92b Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Sat, 17 Feb 2024 00:50:29 +0100
+Subject: [PATCH] Potential fix for taglib v2.0 crashes when exporting wav
+
+Note that taglib's documentation states that ID3v2Tag()
+always returns a valid pointer regardless of whether or not
+the file on disk has an ID3v2 tag.
+---
+ libs/ardour/audiofile_tagger.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc
+index 591b8e92385..4c132cbcc68 100644
+--- a/libs/ardour/audiofile_tagger.cc
++++ b/libs/ardour/audiofile_tagger.cc
+@@ -88,11 +88,9 @@ AudiofileTagger::tag_file (std::string const& filename, SessionMetadata const& m
+ 		TagLib::RIFF::Info::Tag* info_tag = dynamic_cast<TagLib::RIFF::Info::Tag*> (wav_file->InfoTag ());
+ 		assert (info_tag);
+ 		tag_riff_info (*info_tag, metadata);
+-#if 1 // Also add id3v2 header to .wav
+-		TagLib::ID3v2::Tag* id3v2_tag = dynamic_cast<TagLib::ID3v2::Tag*> (wav_file->tag ());
++		TagLib::ID3v2::Tag* id3v2_tag = wav_file->ID3v2Tag ();
+ 		assert (id3v2_tag);
+ 		tag_id3v2 (*id3v2_tag, metadata);
+-#endif
+ 	}
+ 
+ 	TagLib::RIFF::AIFF::File* aiff_file;

diff --git a/0005-Add-missing-include-for-iostream-needed-for-taglib-2.patch b/0005-Add-missing-include-for-iostream-needed-for-taglib-2.patch
new file mode 100644
index 0000000..fed2021
--- /dev/null
+++ b/0005-Add-missing-include-for-iostream-needed-for-taglib-2.patch
@@ -0,0 +1,23 @@
+From f331ce72528a7cca35ede168d2fa26f9872a6e1e Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Tue, 20 Feb 2024 16:38:37 +0100
+Subject: [PATCH] Add missing include for iostream, needed for taglib >= 2
+
+Signed-off-by: David Runge <dave@sleepmap.de>
+---
+ libs/ardour/audiofile_tagger.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc
+index 4c132cbcc68..e7445613464 100644
+--- a/libs/ardour/audiofile_tagger.cc
++++ b/libs/ardour/audiofile_tagger.cc
+@@ -34,6 +34,8 @@
+ #include <taglib/taglib.h>
+ #include <taglib/xiphcomment.h>
+ 
++#include <iostream>
++
+ /* Convert string to TagLib::String */
+ #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8)
+ 

diff --git a/ardour7.spec b/ardour7.spec
index 656d967..bcf5f00 100644
--- a/ardour7.spec
+++ b/ardour7.spec
@@ -54,6 +54,14 @@ Patch4:     0001-Fix-failure-to-build-with-libxml2-version-2.12.patch
 
 Patch5:     ardour7-c99.patch
 
+# Fix for GCC 16 which defaults to C++20
+Patch6:     0001-Add-C++17-option-to-force-compiles-to-use-std-cxx17.patch
+Patch7:     0002-Fix-for-Boost-1.8.5.patch
+
+# Fixes for taglib version 2.x
+Patch8:     0004-Potential-fix-for-taglib-v2.0-crashes-when-exporting.patch
+Patch9:     0005-Add-missing-include-for-iostream-needed-for-taglib-2.patch
+
 # Search VST plugins in lib64 paths on 64-bit platforms. This isn't according
 # to the VST standard, but enough packaged plugins use these paths to make it
 # worthwhile. Patch number >= 100 applies this only on 64-bit systems.
@@ -190,7 +198,7 @@ export LC_ALL=C.UTF-8
 %if %{with system_libs}
     --use-external-libs \
 %endif
-    --cxx11 \
+    --cxx17 \
     --freedesktop \
     --with-backends=dummy,alsa,jack,pulseaudio