Bump asdcplib for Windows UTF-8 filename fix.
authorCarl Hetherington <cth@carlh.net>
Tue, 24 Dec 2024 13:19:06 +0000 (14:19 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 26 Dec 2024 15:46:02 +0000 (16:46 +0100)
cscript
test/filename_charset_test.cc [new file with mode: 0644]
test/wscript

diff --git a/cscript b/cscript
index 92dedee785e54695dab658c005472f0cd70c4843..20db9a3be8da1df2e35c92277efeade9d55e844f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -531,7 +531,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
 def dependencies(target, options):
-    deps = [('libdcp', 'v1.10.0', {'c++17': target.platform.startswith('osx')})]
+    deps = [('libdcp', 'v1.10.1', {'c++17': target.platform.startswith('osx')})]
     deps.append(('libsub', 'v1.6.52'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))
diff --git a/test/filename_charset_test.cc b/test/filename_charset_test.cc
new file mode 100644 (file)
index 0000000..10afe1f
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+    Copyright (C) 2024 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/dcp_content.h"
+#include "test.h"
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
+
+/* Check that a DCP can be imported from a non-ASCII path */
+BOOST_AUTO_TEST_CASE(utf8_filename_handling_test)
+{
+       auto const dir = boost::filesystem::path("build/test/utf8_filename_handling_test_input/ᴟᶒḃↈ");
+       boost::filesystem::remove_all(dir);
+       boost::filesystem::create_directories(dir);
+
+       for (auto i: boost::filesystem::directory_iterator("test/data/dcp_digest_test_dcp")) {
+               boost::filesystem::copy_file(i, dir / i.path().filename());
+       }
+
+       auto content = std::make_shared<DCPContent>(dir);
+       auto film = new_test_film("utf8_filename_handling_test", { content });
+}
+
index e32ec9acb2ba3d3d035706c770aa1f0c9545a685..229330265b54f6a69fdc5e04ef973b90865b13e1 100644 (file)
@@ -98,6 +98,7 @@ def build(bld):
                  file_group_test.cc
                  file_log_test.cc
                  file_naming_test.cc
+                 filename_charset_test.cc
                  film_test.cc
                  film_metadata_test.cc
                  find_missing_test.cc