From 777f8b0bfee98c52d726419c7c57557c0bab4a87 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 23 Mar 2024 23:25:43 +0100 Subject: [PATCH 01/16] Fix detection of SSE, removing unnecessary --target-macos-arm64. --- wscript | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wscript b/wscript index a62b5c2c3..f6f73a52a 100644 --- a/wscript +++ b/wscript @@ -61,7 +61,6 @@ def options(opt): opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') opt.add_option('--target-windows-64', action='store_true', default=False, help='set up to do a cross-compile for Windows 64-bit') opt.add_option('--target-windows-32', action='store_true', default=False, help='set up to do a cross-compile for Windows 32-bit') - opt.add_option('--target-macos-arm64', action='store_true', default=False, help='set up to do a cross-compile for macOS arm64') opt.add_option('--static-dcpomatic', action='store_true', default=False, help='link to components of DCP-o-matic statically') opt.add_option('--static-boost', action='store_true', default=False, help='link statically to Boost') opt.add_option('--static-wxwidgets', action='store_true', default=False, help='link statically to wxWidgets') @@ -103,6 +102,8 @@ def configure(conf): else: conf.env.INSTALL_PREFIX = conf.options.destdir + conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE') + # Common CXXFLAGS conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', @@ -129,8 +130,8 @@ def configure(conf): if conf.options.warnings_are_errors: conf.env.append_value('CXXFLAGS', '-Werror') - if not conf.options.target_macos_arm64: - conf.env.append_value('CXXFLAGS', '-msse') + if conf.env.SSE: + conf.env.append_value('CXXFLAGS', ['-msse', '-mfpmath=sse']) if conf.options.enable_asan: conf.env.append_value('CXXFLAGS', '-fsanitize=address') @@ -172,7 +173,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN') conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H') conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') - conf.env.append_value('CXXFLAGS', '-mfpmath=sse') conf.env.append_value('CXXFLAGS', '-Wcast-align') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) @@ -209,7 +209,6 @@ def configure(conf): # Linux if conf.env.TARGET_LINUX: - conf.env.append_value('CXXFLAGS', '-mfpmath=sse') conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') -- 2.30.2 From dbc52b7e48d7f59f74cc36b61d8ec774fcae8e88 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Mar 2024 22:31:48 +0100 Subject: [PATCH 02/16] Hack to local build script to use environment if ~/build if present. --- run/environment | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run/environment b/run/environment index aabb463f3..aa4f77187 100644 --- a/run/environment +++ b/run/environment @@ -1,6 +1,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" build=$DIR/../build -export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then + export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH +fi export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib export DCPOMATIC_GRAPHICS=$DIR/../graphics -- 2.30.2 From 714aa61dd8a0dac8a7625c4c66806685b36a05d0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 29 Mar 2024 23:17:34 +0100 Subject: [PATCH 03/16] Add VideoContent::rotate_size(). --- src/lib/video_content.cc | 9 +++++++++ src/lib/video_content.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 91ed11855..6c027ff11 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -722,3 +722,12 @@ VideoContent::actual_crop () const ); } + +void +VideoContent::rotate_size() +{ + if (_size) { + std::swap(_size->width, _size->height); + } +} + diff --git a/src/lib/video_content.h b/src/lib/video_content.h index e7e8eb1b3..495d000e1 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -220,6 +220,8 @@ public: void modify_position (std::shared_ptr film, dcpomatic::DCPTime& pos) const; void modify_trim_start (dcpomatic::ContentTime& pos) const; + void rotate_size(); + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint); private: -- 2.30.2 From 00301ddfa6a7f4c79593d8c86a0ff208aa3be68a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 29 Mar 2024 23:18:01 +0100 Subject: [PATCH 04/16] Fix video scaling when the video needs rotation (#2791). --- src/lib/ffmpeg_content.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index c788e7cb1..4a7c87b34 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -295,8 +295,10 @@ FFmpegContent::examine (shared_ptr film, shared_ptr job) _filters.push_back(*Filter::from_id("hflip")); } else if (fabs (rot - 90) < 1.0) { _filters.push_back(*Filter::from_id("90clock")); + video->rotate_size(); } else if (fabs (rot - 270) < 1.0) { _filters.push_back(*Filter::from_id("90anticlock")); + video->rotate_size(); } } if (examiner->has_alpha()) { -- 2.30.2 From bdcaf60ec37ec694f1e221a33b090f670bf974d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 29 Mar 2024 23:18:14 +0100 Subject: [PATCH 05/16] Fix lack of video rotation in some cases (#2971). Setting the optional to 0 here means we never even looked at the packet side data. This seems to be more of a problem with the v2.17.x branch for some reason. --- src/lib/ffmpeg_examiner.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 15cb14ad5..787198e4a 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -182,7 +182,6 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptrstreams[*_video_stream]; auto rotate_tag = av_dict_get (stream->metadata, "rotate", 0, 0); uint8_t* displaymatrix = av_stream_get_side_data (stream, AV_PKT_DATA_DISPLAYMATRIX, 0); - _rotation = 0; if (rotate_tag && *rotate_tag->value && strcmp(rotate_tag->value, "0")) { char *tail; -- 2.30.2 From 027a6534067edc6fe9390d9ecc750e9982d5437c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 29 Mar 2024 23:58:36 +0100 Subject: [PATCH 06/16] Fix crash introduced in previous commit. --- src/lib/ffmpeg_examiner.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index 787198e4a..51ade8e89 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -195,7 +195,9 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr c, shared_ptr Date: Mon, 1 Apr 2024 01:04:41 +0200 Subject: [PATCH 07/16] Fix hanging/overlapping dvb subtitles (#2792). This reverts a change made in 8ca6fd6d97e6d42492afddb655fa85130946853c "Fix doubled subtitles if subtitle stop times are specified." That change breaks the case where a subtitle _does_ have a stop time, but it's wrong (30s from the start time) and we want the next subtitle to clear the previous one. I can't now see how reverting this could cause doubled subtitles, so maybe that problem wlil come back. At least now there's a test for #2792. --- src/lib/ffmpeg_decoder.cc | 2 +- test/subtitle_timing_test.cc | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 7f7a07863..6130d8e5f 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -668,11 +668,11 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet) */ ContentTime from; from = sub_period.from + _pts_offset; + _have_current_subtitle = true; if (sub_period.to) { _current_subtitle_to = *sub_period.to + _pts_offset; } else { _current_subtitle_to = optional(); - _have_current_subtitle = true; } ContentBitmapText bitmap_text(from); diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc index 79cc68849..8bb18f304 100644 --- a/test/subtitle_timing_test.cc +++ b/test/subtitle_timing_test.cc @@ -21,8 +21,13 @@ #include "lib/content.h" #include "lib/content_factory.h" +#include "lib/content_text.h" +#include "lib/dcpomatic_time.h" #include "lib/film.h" +#include "lib/ffmpeg_content.h" +#include "lib/ffmpeg_decoder.h" #include "lib/text_content.h" +#include "lib/text_decoder.h" #include "lib/video_content.h" #include "test.h" #include @@ -33,6 +38,9 @@ #include +using std::dynamic_pointer_cast; + + BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change) { Cleanup cl; @@ -72,3 +80,66 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change) cl.run(); } + +BOOST_AUTO_TEST_CASE(dvb_subtitles_replace_the_last) +{ + /* roh.mkv contains subtitles that come out of FFmpeg with incorrect stop times (30s + * after the start, which seems to be some kind of DVB "standard" timeout). + * Between actual subtitles it contains blanks that are apparently supposed to clear + * the previous subtitle. Make sure that happens. + */ + auto content = content_factory(TestPaths::private_data() / "roh.mkv"); + BOOST_REQUIRE(!content.empty()); + auto film = new_test_film2("dvb_subtitles_replace_the_last", { content[0] }); + + FFmpegDecoder decoder(film, dynamic_pointer_cast(content[0]), false); + BOOST_REQUIRE(!decoder.text.empty()); + + struct Event { + std::string type; + dcpomatic::ContentTime time; + + bool operator==(Event const& other) const { + return type == other.type && time == other.time; + } + }; + + std::vector events; + + auto start = [&events](ContentBitmapText text) { + events.push_back({"start", text.from()}); + }; + + auto stop = [&events](dcpomatic::ContentTime time) { + if (!events.empty() && events.back().type == "stop") { + /* We'll get a bad (too-late) stop time, then the correct one + * when the "clearing" subtitle arrives. + */ + events.pop_back(); + } + events.push_back({"stop", time}); + }; + + decoder.text.front()->BitmapStart.connect(start); + decoder.text.front()->Stop.connect(stop); + + while (!decoder.pass()) {} + + using dcpomatic::ContentTime; + + std::vector correct = { + { "start", ContentTime(439872) }, // 4.582000s actual subtitle #1 + { "stop", ContentTime(998400) }, // 10.400000s stop caused by incoming blank + { "start", ContentTime(998400) }, // 10.400000s blank + { "stop", ContentTime(1141248) }, // 11.888000s stop caused by incoming subtitle #2 + { "start", ContentTime(1141248) }, // 11.888000s subtitle #2 + { "stop", ContentTime(1455936) }, // 15.166000s ... + { "start", ContentTime(1455936) }, // 15.166000s + { "stop", ContentTime(1626816) }, // 16.946000s + { "start", ContentTime(1626816) }, // 16.946000s + }; + + BOOST_REQUIRE(events.size() > correct.size()); + BOOST_CHECK(std::vector(events.begin(), events.begin() + correct.size()) == correct); +} + -- 2.30.2 From e3b7f39d7fb90f2efd6dc34d8531007d932661bd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2024 23:13:00 +0200 Subject: [PATCH 08/16] Don't use --target-macos-arm64 any more, since it's not supported. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 53d2beb7b..4ee24e45d 100644 --- a/cscript +++ b/cscript @@ -589,7 +589,7 @@ def configure_options(target, options, for_package=False): opt += ' --enable-disk' if target.platform == 'osx' and target.arch == 'arm64': - opt += ' --target-macos-arm64 --wx-config=%s/wx-config' % target.bin + opt += ' --wx-config=%s/wx-config' % target.bin return opt -- 2.30.2 From be2deae96d8839ee9bc8190972a50d8acceb8c98 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2024 23:25:22 +0200 Subject: [PATCH 09/16] Bump libdcp for more relaxed CPL parsing (#2797). --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 4ee24e45d..dd7f9c44a 100644 --- a/cscript +++ b/cscript @@ -535,7 +535,7 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.98')) + deps.append(('libdcp', 'v1.8.99')) deps.append(('libsub', 'v1.6.47')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) -- 2.30.2 From cc411a5ab156565c54282c3e9e0ed044d279de86 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Apr 2024 23:30:12 +0200 Subject: [PATCH 10/16] Supporters update. --- src/wx/supporters.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 711b6bbad..514b53d7b 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -126,6 +126,7 @@ supported_by.Add (wxT ("Phillip Branford")); supported_by.Add (wxT ("Ingebjørg Braseth")); supported_by.Add (wxT ("Studio Brauneis")); supported_by.Add (wxT ("Thomas Bray")); +supported_by.Add (wxT ("Thomas Bray")); supported_by.Add (wxT ("queerfilm festival Bremen")); supported_by.Add (wxT ("Martin Brenneis")); supported_by.Add (wxT ("Petra-Puk Bresser")); @@ -233,6 +234,7 @@ supported_by.Add (wxT ("Adam Cousins")); supported_by.Add (wxT ("Aria Covamonas")); supported_by.Add (wxT ("Tom Cowan")); supported_by.Add (wxT ("Jill Cox")); +supported_by.Add (wxT ("Tate Cozza")); supported_by.Add (wxT ("Stefano Cravero")); supported_by.Add (wxT ("Phillip Crawford")); supported_by.Add (wxT ("Root && Rust Creative")); @@ -372,6 +374,7 @@ supported_by.Add (wxT ("Marc Fiebig")); supported_by.Add (wxT ("Moshel Film")); supported_by.Add (wxT ("Juli Film")); supported_by.Add (wxT ("Pató Film")); +supported_by.Add (wxT ("HisStory Film")); supported_by.Add (wxT ("Hoppe Film")); supported_by.Add (wxT ("“How to Successfully Fail in Hollywood” Film")); supported_by.Add (wxT ("Hamann Film")); @@ -443,6 +446,7 @@ supported_by.Add (wxT ("Francesca Garau")); supported_by.Add (wxT ("Jordi Miró Garcia")); supported_by.Add (wxT ("Francisco Montoro Garcia")); supported_by.Add (wxT ("Stefano Gariglio")); +supported_by.Add (wxT ("Tom Garner")); supported_by.Add (wxT ("Bethwyn Garswood")); supported_by.Add (wxT ("Andris Gauja")); supported_by.Add (wxT ("DocCollection GbR")); @@ -569,6 +573,7 @@ supported_by.Add (wxT ("Shinya Isobe")); supported_by.Add (wxT ("Theodore Ivanov")); supported_by.Add (wxT ("Julien Ivanowich")); supported_by.Add (wxT ("Denis Ivashvkevych")); +supported_by.Add (wxT ("June Nho Ivers")); supported_by.Add (wxT ("Emilia Izquierdo")); supported_by.Add (wxT ("Mahboobani Jackie")); supported_by.Add (wxT ("Alexzandra Jackson")); @@ -813,6 +818,7 @@ supported_by.Add (wxT ("Kenjo McCurtain")); supported_by.Add (wxT ("Dawn McElligott")); supported_by.Add (wxT ("Caitlin Mcgrath")); supported_by.Add (wxT ("Neil McGrath")); +supported_by.Add (wxT ("Tom Mcintire")); supported_by.Add (wxT ("Andrew McKee")); supported_by.Add (wxT ("Gordon McLeod")); supported_by.Add (wxT ("Britt McTammany")); @@ -908,6 +914,7 @@ supported_by.Add (wxT ("Didier Oriol")); supported_by.Add (wxT ("Kevin Orman")); supported_by.Add (wxT ("George Orr")); supported_by.Add (wxT ("orwoid.com")); +supported_by.Add (wxT ("Neil Oseman")); supported_by.Add (wxT ("Danilo Marichal Osorio")); supported_by.Add (wxT ("Norbert Ostendorf")); supported_by.Add (wxT ("Peter Östlund")); @@ -927,6 +934,7 @@ supported_by.Add (wxT ("Christian Passeri")); supported_by.Add (wxT ("Sharad Patel")); supported_by.Add (wxT ("Panagiotis Patsiaouras")); supported_by.Add (wxT ("Anand Patwardhan")); +supported_by.Add (wxT ("Tomaz Pavkovic")); supported_by.Add (wxT ("Stanko Pavlica")); supported_by.Add (wxT ("Konstantinos Pavlidis")); supported_by.Add (wxT ("Natalie Peart")); @@ -985,6 +993,7 @@ supported_by.Add (wxT ("Pentimenti Productions")); supported_by.Add (wxT ("Hitman Productions")); supported_by.Add (wxT ("WLFK Productions")); supported_by.Add (wxT ("Ceridwen Productions")); +supported_by.Add (wxT ("ZooTime Productions")); supported_by.Add (wxT ("A Tractor Productions")); supported_by.Add (wxT ("Second Wind Productions")); supported_by.Add (wxT ("Locomotive Productions")); @@ -1060,6 +1069,7 @@ supported_by.Add (wxT ("Objectif 13 S.C.S.")); supported_by.Add (wxT ("Neil Sadwelkar")); supported_by.Add (wxT ("Hakan Sahin")); supported_by.Add (wxT ("Sebastien Saint-Cricq")); +supported_by.Add (wxT ("Milena Salazar")); supported_by.Add (wxT ("Lasse Salling")); supported_by.Add (wxT ("Community TV Salzburg")); supported_by.Add (wxT ("Keith Sanborn")); -- 2.30.2 From d5f5a9d9f5635f84a5e372181dea1c7cbb0ae732 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2024 10:12:25 +0200 Subject: [PATCH 11/16] Add missing GUI-side verification note descriptions. --- src/wx/verify_dcp_dialog.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index c77f68ea1..c7a32e5dd 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -449,6 +449,12 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr job case dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT: add(i, _("The in a in CPL %id is empty")); break; + case dcp::VerificationNote::Code::INVALID_CPL_NAMESPACE: + add(i, _("The CPL %f has an invalid namespace %n")); + break; + case dcp::VerificationNote::Code::MISSING_CPL_CONTENT_VERSION: + add(i, _("The CPL %n has no tag")); + break; } } -- 2.30.2 From ab479fa7f20d84ea31ab35c0330f524ac0c48d21 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2024 14:00:07 +0200 Subject: [PATCH 12/16] Missed update to private test repo version. --- run/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/tests b/run/tests index 6f43290c4..bf4c5732e 100755 --- a/run/tests +++ b/run/tests @@ -3,7 +3,7 @@ # e.g. --run_tests=foo set -e -PRIVATE_GIT="5298360d6bbae434fb4625fda1cc9dd6be101df3" +PRIVATE_GIT="881c48805e352dfe150993814757ca974282be18" if [ "$1" == "--check" ]; then shift 1 -- 2.30.2 From ff12ccdde76c54d3b9e69799a63750db9edf0023 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Apr 2024 00:38:14 +0200 Subject: [PATCH 13/16] Revert "Tweak how lzma is linked." This reverts commit 604a5f9343eebfa0108a19bb6b8ec60bc81f4819. I don't know why I did this, and it breaks the mac-old (10.8) target as the lzma.5.dylib is not present on those machines. --- src/lib/wscript | 2 +- wscript | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/wscript b/src/lib/wscript index 7dd3bfe35..87a1ca787 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -228,7 +228,7 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX - SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++ + SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT LIBZ """ diff --git a/wscript b/wscript index f6f73a52a..e5164cc52 100644 --- a/wscript +++ b/wscript @@ -219,7 +219,6 @@ def configure(conf): if conf.env.TARGET_OSX: conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-DGL_SILENCE_DEPRECATION']) conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names') - conf.env.append_value('LINKFLAGS', '-llzma') # # Dependencies. -- 2.30.2 From 1542a9512ba7bd0c99105839741f4e0b41bd8e67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Apr 2024 02:11:29 +0200 Subject: [PATCH 14/16] Supporters update. --- src/wx/supporters.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 514b53d7b..89551cf9d 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -102,6 +102,7 @@ supported_by.Add (wxT ("Kenneth Biswabic")); supported_by.Add (wxT ("Mike Blakesley")); supported_by.Add (wxT ("Cyrille Blanc")); supported_by.Add (wxT ("Stijn De Blieck")); +supported_by.Add (wxT ("Nathan Block")); supported_by.Add (wxT ("Félix Blume")); supported_by.Add (wxT ("Theodor Boder")); supported_by.Add (wxT ("Thorsten Boehnke")); @@ -655,6 +656,7 @@ supported_by.Add (wxT ("Dieter Kovacic")); supported_by.Add (wxT ("Filip Kovcin")); supported_by.Add (wxT ("Alan Kraemer")); supported_by.Add (wxT ("Joel Krantz")); +supported_by.Add (wxT ("Oliver Krause")); supported_by.Add (wxT ("Ralph-Raimund Krause")); supported_by.Add (wxT ("Christian Kreil")); supported_by.Add (wxT ("Sebastian Kreis")); @@ -683,6 +685,7 @@ supported_by.Add (wxT ("Angela En-yu Lao")); supported_by.Add (wxT ("Daniel Martinez Lara")); supported_by.Add (wxT ("Gabriel Montagné Láscaris-Comneno")); supported_by.Add (wxT ("Marga Laube")); +supported_by.Add (wxT ("James Lauchlan")); supported_by.Add (wxT ("Nicholas Lavigne")); supported_by.Add (wxT ("Philip Lawrence")); supported_by.Add (wxT ("David Lawrence")); -- 2.30.2 From 4401895dfbb25834d4385621824e72ae19c8962c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Apr 2024 22:34:51 +0200 Subject: [PATCH 15/16] Fix silent stereo mixdown exports when the project audio channel count is > 6. This became much more of a problem when we started defaulting to 8 channels in projects. --- src/lib/ffmpeg_encoder.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 60241b233..c1170f098 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -102,7 +102,7 @@ FFmpegEncoder::stereo_map() const map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB); map.set(dcp::Channel::LS, 0, overall_gain); break; - case 6: + default: map.set(dcp::Channel::LEFT, 0, overall_gain); map.set(dcp::Channel::RIGHT, 1, overall_gain); map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB); @@ -111,7 +111,6 @@ FFmpegEncoder::stereo_map() const map.set(dcp::Channel::RS, 1, overall_gain); break; } - /* XXX: maybe we should do something better for >6 channel DCPs */ return map; } -- 2.30.2 From b3563f2bea0b853864dcc34acb97c2cff2a7a4d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Apr 2024 11:20:53 +0200 Subject: [PATCH 16/16] Supporters update. --- src/wx/supporters.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 89551cf9d..b39dbd5dc 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -319,6 +319,7 @@ supported_by.Add (wxT ("Guy Edmonds")); supported_by.Add (wxT ("Simon Edwards")); supported_by.Add (wxT ("Arthur Edwards")); supported_by.Add (wxT ("Si Edwards")); +supported_by.Add (wxT ("NEU-Deli Einbeck")); supported_by.Add (wxT ("Thomas Eingartner")); supported_by.Add (wxT ("Gabriel Eiriz")); supported_by.Add (wxT ("Chris Eller")); @@ -864,6 +865,7 @@ supported_by.Add (wxT ("Rigoberto Mora")); supported_by.Add (wxT ("Pierre-Jean Moreau")); supported_by.Add (wxT ("Stanislas Moreau")); supported_by.Add (wxT ("Ted Morée")); +supported_by.Add (wxT ("Daniel Morez")); supported_by.Add (wxT ("Paolo Morini")); supported_by.Add (wxT ("Lars Moritz")); supported_by.Add (wxT ("Lindsay Morris")); -- 2.30.2