Merge branch 'main' into v2.17.x

5 files changed, 11 insertions, 12 deletions

diff --git a/cscript b/cscript
index 4ce3ec4f1..d789c713c 100644
--- a/cscript
+++ b/cscript
@@ -795,6 +795,8 @@ def package_rpm(target, cpu, version, options):
 
     make_spec('dcpomatic2.spec', version, target, options, requires)
     cmd = 'rpmbuild --define "_topdir %s" -bb dcpomatic2.spec' % topdir
+    # On Centos 7 we build and install boost ourselves, so we must look for it in the right place
+    target.set('LINKFLAGS', '-L/usr/local/lib')
     target.command(cmd)
     rpms = []
 
diff --git a/src/lib/ffmpeg_film_encoder.cc b/src/lib/ffmpeg_film_encoder.cc
index 2d100f7bc..a2d26fd66 100644
--- a/src/lib/ffmpeg_film_encoder.cc
+++ b/src/lib/ffmpeg_film_encoder.cc
@@ -102,7 +102,7 @@ FFmpegFilmEncoder::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 @@ FFmpegFilmEncoder::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;
 }
 
diff --git a/src/lib/wscript b/src/lib/wscript
index 86cf2e0b6..a4758c737 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -237,7 +237,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/src/wx/supporters.cc b/src/wx/supporters.cc
index 514b53d7b..b39dbd5dc 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"));
@@ -318,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"));
@@ -655,6 +657,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 +686,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"));
@@ -861,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"));
diff --git a/wscript b/wscript
index 27b554df4..801c3b156 100644
--- a/wscript
+++ b/wscript
@@ -39,7 +39,7 @@ libdcp_version = '1.8.73'
 libsub_version = '1.6.42'
 
 this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
-git_head = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
+git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], stdout=subprocess.PIPE).communicate()[0]
 
 # Python 2/3 compatibility; I don't really understand what's going on here
 if not isinstance(this_version, str):
@@ -219,7 +219,6 @@ def configure(conf):
                                int main() { std::locale::global (boost::locale::generator().generate ("")); }\n
                                """,
                                msg='Checking for boost locale library',
-                               libpath='/usr/local/lib',
                                lib=['boost_locale%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                                uselib_store='BOOST_LOCALE')
 
@@ -242,7 +241,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.
@@ -273,7 +271,7 @@ def configure(conf):
                        mandatory=True,
                        msg='Checking for libicu',
                        okmsg='yes',
-                       libpath=['/usr/local/lib', '/usr/lib', '/usr/lib/x86_64-linux-gnu'],
+                       libpath=['/usr/lib', '/usr/lib/x86_64-linux-gnu'],
                        lib=['icuio', 'icui18n', 'icudata', 'icuuc'],
                        uselib_store='ICU')
 
@@ -423,7 +421,6 @@ def configure(conf):
                             int main() { struct jpeg_compress_struct compress; jpeg_create_compress (&compress); return 0; }
                             """,
                    msg='Checking for libjpeg',
-                   libpath='/usr/local/lib',
                    lib=['jpeg'],
                    uselib_store='JPEG')
 
@@ -434,7 +431,6 @@ def configure(conf):
                                 int main() { ext4_mount("ext4_fs", "/mp/", false); }\n
                                 """,
                                 msg='Checking for lwext4 library',
-                                libpath='/usr/local/lib',
                                 lib=['lwext4', 'blockdev'],
                                 uselib_store='LWEXT4')
 
@@ -573,7 +569,6 @@ def configure(conf):
 			    int main() { boost::thread t; }\n
 			    """,
                        msg='Checking for boost threading library',
-                       libpath='/usr/local/lib',
                        lib=[boost_thread, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_THREAD')
 
@@ -582,7 +577,6 @@ def configure(conf):
     			    int main() { boost::filesystem::copy_file ("a", "b"); }\n
 			    """,
                        msg='Checking for boost filesystem library',
-                       libpath='/usr/local/lib',
                        lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_FILESYSTEM')
 
@@ -591,7 +585,6 @@ def configure(conf):
     			    int main() { boost::gregorian::day_clock::local_day(); }\n
 			    """,
                        msg='Checking for boost datetime library',
-                       libpath='/usr/local/lib',
                        lib=['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
                        uselib_store='BOOST_DATETIME')