Update version.

3 files changed, 18 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99b04ad4dde8..d70e7bb6ba53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-opencolorio
 	pkgdesc = A color management framework for visual effects and animation (mingw-w64)
-	pkgver = 2.2.1
-	pkgrel = 4
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://opencolorio.org/
 	arch = any
 	license = BSD-3-Clause
@@ -20,9 +20,7 @@ pkgbase = mingw-w64-opencolorio
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = opencolorio-2.2.1.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.2.1.tar.gz
-	source = minizip-ng-4.patch
-	sha256sums = 36f27c5887fc4e5c241805c29b8b8e68725aa05520bcaa7c7ec84c0422b8580e
-	sha256sums = 2f63b50e09d493b0e29d98ce579722a53a296834bf244819823764b41f5bedbd
+	source = opencolorio-2.3.0.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.3.0.tar.gz
+	sha256sums = 32b7be676c110d849a77886d8a409159f0367309b2b2f5dae5aa0c38f42b445a
 
 pkgname = mingw-w64-opencolorio
diff --git a/PKGBUILD b/PKGBUILD
index 8491efb6e07d..d1fe51c36b67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=opencolorio
 pkgname=mingw-w64-${_pkgname}
-pkgver=2.2.1
-pkgrel=4
+pkgver=2.3.0
+pkgrel=1
 pkgdesc='A color management framework for visual effects and animation (mingw-w64)'
 arch=(any)
 url='https://opencolorio.org/'
@@ -22,19 +22,14 @@ depends=(
 checkdepends=('mingw-w64-wine')
 options=('!strip' '!buildflags' 'staticlibs')
 _repo='OpenColorIO'
-source=(
-	"$_pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/${_repo}/archive/v${pkgver}.tar.gz"
-	'minizip-ng-4.patch'
-)
-sha256sums=('36f27c5887fc4e5c241805c29b8b8e68725aa05520bcaa7c7ec84c0422b8580e'
-            '2f63b50e09d493b0e29d98ce579722a53a296834bf244819823764b41f5bedbd')
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/${_repo}/archive/v${pkgver}.tar.gz")
+sha256sums=('32b7be676c110d849a77886d8a409159f0367309b2b2f5dae5aa0c38f42b445a')
 
 _srcdir="${_repo}-${pkgver}"
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-DNDEBUG -msse4.2'
+_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-DNDEBUG -msse4.2 -mxsave'
 	-DOCIO_BUILD_APPS=OFF
-	-DOCIO_USE_SSE=ON
-	-DOCIO_BUILD_PYTHON=OFF 
+	-DOCIO_BUILD_PYTHON=OFF
 	-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON -DCMAKE_CXX_VISIBILITY_PRESET=hidden
 	-DCMAKE_CXX_STANDARD=20
 	-DOCIO_INSTALL_EXT_PACKAGES=NONE )
@@ -44,34 +39,33 @@ prepare() {
 	sed -i 's/if(NOT WIN32)/if(NOT WIN32 OR MINGW)/' 'src/OpenColorIO/CMakeLists.txt'
 	sed -i 's/if(WIN32)/if(WIN32 AND NOT MINGW)/' 'src/OpenColorIO/CMakeLists.txt'
 	sed -i 's/_str/str/g;s/_l(/(/g;s/_l (/ (/g;s/, loc.local//g;s|static const Locale loc;|//static const Locale loc;|' 'src/utils/NumberUtils.h'
-	#sed -i -r 's|#include "minizip-ng/(.*)"|#include <\1>|' 'src/OpenColorIO/OCIOZArchive.cpp'
 	sed -i 's/std::tstring/std::string/g;s/std::tostringstream/std::ostringstream/g' 'src/OpenColorIO/SystemMonitor_windows.cpp'
 	sed -i 's/targetName.monitorFriendlyDeviceName : L""/Platform::Utf16ToUtf8(targetName.monitorFriendlyDeviceName) : ""/' 'src/OpenColorIO/SystemMonitor_windows.cpp'
 	sed -i 's/Platform::Utf16ToUtf8(deviceName)/deviceName/' 'src/OpenColorIO/SystemMonitor_windows.cpp'
-	rm -f 'share/cmake/modules/Findminizip-ng.cmake'
-	sed -i 's|${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findminizip-ng.cmake||' 'CMakeLists.txt'
-	sed -i 's/find_package(minizip-ng 3.0.7 REQUIRED)/find_package(minizip-ng REQUIRED)/' 'share/cmake/modules/FindExtPackages.cmake'
-	
-	patch -p1 -i '../minizip-ng-4.patch'
 	
 	rm -f 'share/cmake/modules/Findyaml-cpp.cmake'
 	sed -i 's|${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findyaml-cpp.cmake||' 'CMakeLists.txt'
+	
+	sed -i 's/#if _MSC_VER/#if _WIN32/' 'src/OpenColorIO/CPUInfo.cpp'
 }
 
 build() {	
 	for _arch in ${_architectures}; do
-		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}-static" "${_flags[@]}" -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF \
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}-static" "${_flags[@]}" \
+			-DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF \
 			-DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr/${_arch}/static"
 		cmake --build "build-${_arch}-static"
 		
-		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" \
+			-DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF
 		cmake --build "build-${_arch}"
 	done
 }
 
 check() {
 	for _arch in ${_architectures}; do
-		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DOCIO_BUILD_TESTS=ON -DOCIO_BUILD_GPU_TESTS=OFF
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" \
+			-DOCIO_BUILD_TESTS=ON -DOCIO_BUILD_GPU_TESTS=OFF
 		cmake --build "build-${_arch}"
 		cmake --build "build-${_arch}" --target test
 	done
diff --git a/minizip-ng-4.patch b/minizip-ng-4.patch
deleted file mode 100644
index 079a1993514a..000000000000
--- a/minizip-ng-4.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
-index 85fc7bb7..5b77685f 100644
---- a/src/OpenColorIO/OCIOZArchive.cpp
-+++ b/src/OpenColorIO/OCIOZArchive.cpp
-@@ -225,7 +225,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
-     std::string configStr = ss.str();
- 
-     // Write zip to memory stream.
--    mz_stream_mem_create(&write_mem_stream);
-+    write_mem_stream = mz_stream_mem_create();
-     mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024);
-     mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE);
- 
-@@ -237,7 +237,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
-     options.compress_level  = ArchiveCompressionLevels::BEST;
- 
-     // Create the writer handle.
--    mz_zip_writer_create(&archiver);
-+    archiver = mz_zip_writer_create();
- 
-     // Archive options.
-     // Compression method
-@@ -332,7 +332,7 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
-     std::string outputDestination = pystring::os::path::normpath(destination);
- 
-     // Create zip reader.
--    mz_zip_reader_create(&extracter);
-+    extracter = mz_zip_reader_create();
- 
-     MinizipNgHandlerGuard extracterGuard(extracter, false, false);
- 
-@@ -450,7 +450,7 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
-     std::vector<uint8_t> buffer;
- 
-     // Create the reader object.
--    mz_zip_reader_create(&reader);
-+    reader = mz_zip_reader_create();
- 
-     MinizipNgHandlerGuard extracterGuard(reader, false, true);
- 
-@@ -510,7 +510,7 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
-     void *reader = NULL;
- 
-     // Create the reader object.
--    mz_zip_reader_create(&reader);
-+    reader = mz_zip_reader_create();
- 
-     MinizipNgHandlerGuard extracterGuard(reader, false, false);
- 
-@@ -630,4 +630,4 @@ void CIOPOciozArchive::buildEntries()
-     getEntriesMappingFromArchiveFile(m_archiveAbsPath, m_entries);
- }
- 
--} // namespace OCIO_NAMESPACE
-\ No newline at end of file
-+} // namespace OCIO_NAMESPACE
-diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
-index 190cadee..93c622dc 100644
---- a/src/apps/ocioarchive/main.cpp
-+++ b/src/apps/ocioarchive/main.cpp
-@@ -235,7 +235,7 @@ int main(int argc, const char **argv)
-         }
- 
-         std::string path = args[0];
--        mz_zip_reader_create(&reader);
-+        reader = mz_zip_reader_create();
-         struct tm tmu_date;
-         
-         err = mz_zip_reader_open_file(reader, path.c_str());