tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 95a03bbd..9ce32264 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -123,7 +123,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
6 find_package(Imath REQUIRED)
7 find_package(nlohmann_json REQUIRED)
8 find_package(ZLIB REQUIRED)
9-find_package(minizip REQUIRED)
10+find_package(minizip-ng REQUIRED)
11 find_package(OpenTimelineIO REQUIRED)
12
13 # OpenColorIO dependencies
14diff --git a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
15index 513e7351..2db48491 100644
16--- a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
17+++ b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
18@@ -1,10 +1,10 @@
19 find_package(ZLIB REQUIRED)
20-find_package(minizip REQUIRED)
21+find_package(minizip-ng REQUIRED)
22 find_package(OpenColorIO REQUIRED)
23
24 set(source main.cpp)
25
26 add_executable(OpenColorIOTest ${header} ${source})
27-target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip ZLIB::ZLIB)
28+target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip-ng ZLIB::ZLIB)
29
30 add_test(OpenColorIOTest OpenColorIOTest)
31diff --git a/lib/tlCore/CMakeLists.txt b/lib/tlCore/CMakeLists.txt
32index d02fa96a..877c8462 100644
33--- a/lib/tlCore/CMakeLists.txt
34+++ b/lib/tlCore/CMakeLists.txt
35@@ -40,7 +40,7 @@ else()
36 endif()
37
38 set(LIBRARIES tlResource feather-tk::feather-tk-core OTIO::opentimelineio Imath::Imath nlohmann_json::nlohmann_json)
39-set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip ZLIB::ZLIB)
40+set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip-ng ZLIB::ZLIB)
41 if(TLRENDER_OCIO)
42 list(APPEND LIBRARIES OpenColorIO::OpenColorIO)
43 endif()
44diff --git a/lib/tlTimeline/CMakeLists.txt b/lib/tlTimeline/CMakeLists.txt
45index ad384749..82a6aacb 100644
46--- a/lib/tlTimeline/CMakeLists.txt
47+++ b/lib/tlTimeline/CMakeLists.txt
48@@ -49,7 +49,7 @@ set(SOURCE
49 Video.cpp)
50
51 add_library(tlTimeline ${HEADERS} ${PRIVATE_HEADERS} ${SOURCE})
52-target_link_libraries(tlTimeline tlIO)
53+target_link_libraries(tlTimeline tlIO MINIZIP::minizip-ng)
54 set_target_properties(tlTimeline PROPERTIES FOLDER lib)
55 set_target_properties(tlTimeline PROPERTIES PUBLIC_HEADER "${HEADERS}")
56
57diff --git a/lib/tlTimeline/TimelineCreate.cpp b/lib/tlTimeline/TimelineCreate.cpp
58index 9596ab21..c8884435 100644
59--- a/lib/tlTimeline/TimelineCreate.cpp
60+++ b/lib/tlTimeline/TimelineCreate.cpp
61@@ -99,7 +99,7 @@ namespace tl
62 public:
63 ZipReader(const std::string& fileName)
64 {
65- mz_zip_reader_create(&reader);
66+ reader = mz_zip_reader_create();
67 if (!reader)
68 {
69 throw std::runtime_error(feather_tk::Format(
70diff --git a/lib/tlTimeline/Util.cpp b/lib/tlTimeline/Util.cpp
71index 611f02ad..338df840 100644
72--- a/lib/tlTimeline/Util.cpp
73+++ b/lib/tlTimeline/Util.cpp
74@@ -662,7 +662,7 @@ namespace tl
75 }
76
77 // Open the output file.
78- mz_zip_writer_create(&_writer);
79+ _writer = mz_zip_writer_create();
80 if (!_writer)
81 {
82 throw std::runtime_error(feather_tk::Format("Cannot create writer: \"{0}\"").arg(fileName));
83diff --git a/tlRenderConfig.cmake.in b/tlRenderConfig.cmake.in
84index 11312d32..e6ec1184 100644
85--- a/tlRenderConfig.cmake.in
86+++ b/tlRenderConfig.cmake.in
87@@ -9,7 +9,7 @@ include(CMakeFindDependencyMacro)
88 find_package(Imath REQUIRED)
89 find_package(nlohmann_json REQUIRED)
90 find_package(ZLIB REQUIRED)
91-find_package(minizip REQUIRED)
92+find_package(minizip-ng REQUIRED)
93 find_package(OpenTimelineIO REQUIRED)
94
95 # OpenColorIO dependencies