From 2abb8519553baccb68b0e013dec5c06e87bbf898 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:37:35 +0300 Subject: [PATCH 01/16] MINGWUpdate OpenEXR --- .../MINGW-packages/mingw-w64-openexr/PKGBUILD | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD index e06f3be48..14991af7e 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD @@ -3,16 +3,16 @@ _realname=openexr pkgbase=mingw-w64-natron_${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-natron_${_realname}") -pkgver=3.1.8 +pkgver=3.2.1 pkgrel=99.1 pkgdesc='A high dynamic-range image file format library (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://www.openexr.com/" -license=('BSD') +license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-natron_imath" + "${MINGW_PACKAGE_PREFIX}-libdeflate" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" - "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") @@ -26,9 +26,11 @@ replaces=( "${MINGW_PACKAGE_PREFIX}-pyilmbase" ) source=("https://github.com/openexr/openexr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" - 0006-cmake-soversion.patch) -sha256sums=('3ff47111ef7e5da6f69330e66e1e90ae620b79df1cedf2512bb9bffe86c2c617' - 'e65852ac2e5545472ad90830c97e964aa2c71e1795979a8b9867155d578d45ed') + 0006-cmake-soversion.patch + 0007-export-TypedAttribute-value.patch) +sha256sums=('61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b' + 'a5ce463815e8d05c879dbe6a255e9f8ac2697cd3ef4242dac1e5cb331f78ed02' + '204777b48cde1c4d390789f10c5e429d5295be701f68a7937a90d0ecf271c048') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -43,7 +45,8 @@ prepare(){ cd "${srcdir}/${_realname}-${pkgver}" apply_patch_with_msg \ - 0006-cmake-soversion.patch + 0006-cmake-soversion.patch \ + 0007-export-TypedAttribute-value.patch } build() { @@ -56,10 +59,6 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then - extra_config+=("-DOPENEXR_BUILD_TOOLS=OFF") - fi - CXXFLAGS+=" -Wno-ignored-attributes" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ @@ -70,7 +69,6 @@ build() { -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ -DOPENEXR_INSTALL_EXAMPLES=OFF \ - -DOPENEXR_INSTALL_PKG_CONFIG=ON \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/cmake --build . From 1f0417d7011a3e1a33db89ee459fea297d70fd57 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:43:22 +0300 Subject: [PATCH 02/16] update --- .../0007-export-TypedAttribute-value.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch diff --git a/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch b/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch new file mode 100644 index 000000000..f5367144f --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch @@ -0,0 +1,19 @@ +--- a/src/lib/OpenEXR/ImfAttribute.h ++++ b/src/lib/OpenEXR/ImfAttribute.h +@@ -215,14 +215,14 @@ + } + + template +-inline T& ++T& + TypedAttribute::value () + { + return _value; + } + + template +-inline const T& ++const T& + TypedAttribute::value () const + { + return _value; From 4e5dd8a0236062c3586ec2173973c80a03e6fb71 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:43:51 +0300 Subject: [PATCH 03/16] Update 0007-export-TypedAttribute-value.patch --- .../0007-export-TypedAttribute-value.patch | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch b/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch index f5367144f..8b1378917 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch +++ b/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch @@ -1,19 +1 @@ ---- a/src/lib/OpenEXR/ImfAttribute.h -+++ b/src/lib/OpenEXR/ImfAttribute.h -@@ -215,14 +215,14 @@ - } - - template --inline T& -+T& - TypedAttribute::value () - { - return _value; - } - - template --inline const T& -+const T& - TypedAttribute::value () const - { - return _value; + From 287097c8139fe18cb1bc789b9ae331d13c644c61 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:44:10 +0300 Subject: [PATCH 04/16] Update 0007-export-TypedAttribute-value.patch From 580e8b20b1ab2f9edbca76f5eedf1d770f548172 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:45:15 +0300 Subject: [PATCH 05/16] Delete tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr directory --- .../mingw-w64-openexr/0007-export-TypedAttribute-value.patch | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch diff --git a/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch b/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch deleted file mode 100644 index 8b1378917..000000000 --- a/tools/MINGW-packages/mingw-w64-openexr/mingw-w64-openexr/0007-export-TypedAttribute-value.patch +++ /dev/null @@ -1 +0,0 @@ - From f9889413092e30f7e620abe96a228aa30fc1cda1 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:45:58 +0300 Subject: [PATCH 06/16] Update --- .../0007-export-TypedAttribute-value.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch diff --git a/tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch b/tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch new file mode 100644 index 000000000..f5367144f --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-openexr/0007-export-TypedAttribute-value.patch @@ -0,0 +1,19 @@ +--- a/src/lib/OpenEXR/ImfAttribute.h ++++ b/src/lib/OpenEXR/ImfAttribute.h +@@ -215,14 +215,14 @@ + } + + template +-inline T& ++T& + TypedAttribute::value () + { + return _value; + } + + template +-inline const T& ++const T& + TypedAttribute::value () const + { + return _value; From 0aebfc77634e49e428b9c3a67515ddaf0bf24b31 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:49:26 +0300 Subject: [PATCH 07/16] Update --- .../mingw-w64-openexr/0006-cmake-soversion.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch b/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch index 23e600e30..34bc71db3 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch +++ b/tools/MINGW-packages/mingw-w64-openexr/0006-cmake-soversion.patch @@ -17,8 +17,8 @@ Description: OpenEXR image library Version: @OPENEXR_VERSION@ --Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR${libsuffix} -lOpenEXRUtil${libsuffix} -lOpenEXRCore${libsuffix} -lIex${libsuffix} -lIlmThread${libsuffix} -+Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR -lOpenEXRUtil -lOpenEXRCore -lIex -lIlmThread +-Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR${libsuffix} -lOpenEXRUtil${libsuffix} -lOpenEXRCore${libsuffix} -lIex${libsuffix} -lIlmThread${libsuffix} @EXR_DEFLATE_LDFLAGS@ ++Libs: @exr_pthread_libs@ -L${libdir} -lOpenEXR -lOpenEXRUtil -lOpenEXRCore -lIex -lIlmThread @EXR_DEFLATE_LDFLAGS@ Cflags: -I${includedir} -I${OpenEXR_includedir} @exr_pthread_cflags@ Requires: Imath Libs.private: @zlib_link@ From e087d97acdebe93791b9c95ca279bf3bcb4532bd Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 19:57:07 +0300 Subject: [PATCH 08/16] Update --- tools/MINGW-packages/mingw-w64-openexr/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD index 14991af7e..f3c715bfd 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD @@ -12,7 +12,7 @@ url="https://www.openexr.com/" license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-natron_imath" "${MINGW_PACKAGE_PREFIX}-libdeflate" - "${MINGW_PACKAGE_PREFIX}-libwinpthread-git" + "${MINGW_PACKAGE_PREFIX}-libwinpthread-git") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") From f8a0caad8a2771489d585faccfd41592bc2ebc6b Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Sun, 22 Oct 2023 20:08:51 +0300 Subject: [PATCH 09/16] Fix --- tools/MINGW-packages/mingw-w64-openexr/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD index f3c715bfd..f2c2780a2 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD @@ -26,8 +26,8 @@ replaces=( "${MINGW_PACKAGE_PREFIX}-pyilmbase" ) source=("https://github.com/openexr/openexr/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" - 0006-cmake-soversion.patch - 0007-export-TypedAttribute-value.patch) + 0006-cmake-soversion.patch + 0007-export-TypedAttribute-value.patch) sha256sums=('61e175aa2203399fb3c8c2288752fbea3c2637680d50b6e306ea5f8ffdd46a9b' 'a5ce463815e8d05c879dbe6a255e9f8ac2697cd3ef4242dac1e5cb331f78ed02' '204777b48cde1c4d390789f10c5e429d5295be701f68a7937a90d0ecf271c048') From 0bee2a7336c14c6c3874f890ece75fb24b85e98f Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Mon, 23 Oct 2023 08:32:23 +0300 Subject: [PATCH 10/16] add libdeflate --- .../mingw-w64-libdeflate/002-pkg-config.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tools/MINGW-packages/mingw-w64-libdeflate/002-pkg-config.patch diff --git a/tools/MINGW-packages/mingw-w64-libdeflate/002-pkg-config.patch b/tools/MINGW-packages/mingw-w64-libdeflate/002-pkg-config.patch new file mode 100644 index 000000000..e82ee71ac --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libdeflate/002-pkg-config.patch @@ -0,0 +1,17 @@ +--- libdeflate-1.15/libdeflate.pc.in.orig 2022-12-05 05:40:10.000000000 +0100 ++++ libdeflate-1.15/libdeflate.pc.in 2022-12-05 20:32:35.832915600 +0100 +@@ -7,12 +7,5 @@ + Description: Fast implementation of DEFLATE, zlib, and gzip + Version: @PROJECT_VERSION@ + Libs: -L${libdir} -ldeflate +-Cflags: -I${includedir} +- +-# Note: this library's public header allows LIBDEFLATE_DLL to be defined when +-# linking to the DLL on Windows, to make __declspec(dllimport) be used. +-# However, the only way to define a shared-library-only flag in a pkgconfig file +-# is to use the weird workaround of unconditionally defining it in Cflags, then +-# undefining it in Cflags.private. Just don't bother with this, since +-# __declspec(dllimport) is optional anyway. It is a very minor performance +-# optimization that is irrelevant for most use cases of libdeflate. ++Cflags: -I${includedir} -DLIBDEFLATE_DLL ++Cflags.private: -ULIBDEFLATE_DLL From a8a9ebf51d1bb33d1d440fada9ea9ad2c3de370f Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Mon, 23 Oct 2023 08:38:34 +0300 Subject: [PATCH 11/16] add mingw libdeflate --- .../mingw-w64-libdeflate/PKGBUILD | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD diff --git a/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD b/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD new file mode 100644 index 000000000..75aaa79c1 --- /dev/null +++ b/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Miloš Komarčević + +_realname=libdeflate +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=1.19 +pkgrel=99.1 +pkgdesc="Heavily optimized library for DEFLATE/zlib/gzip compression and decompression (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +url='https://github.com/ebiggers/libdeflate' +license=('spdx:MIT') +makedepends=( + "${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" +) +source=(${_realname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz" + "002-pkg-config.patch") +sha256sums=('27bf62d71cd64728ff43a9feb92f2ac2f2bf748986d856133cc1e51992428c25' + '7feb96b6466375824af54a829dfe0d5cbd641970d64ef9fe0f9f4ab5e18040dd') + +prepare() { + cd "${srcdir}"/${_realname}-${pkgver} + + patch -p1 -i "${srcdir}"/002-pkg-config.patch +} + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + "${MINGW_PREFIX}"/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + "${extra_config[@]}" \ + ../${_realname}-${pkgver} + + "${MINGW_PREFIX}"/bin/cmake.exe --build . +} + +package() { + cd "${srcdir}/build-${MSYSTEM}" + + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . + + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING +} From 9efbe1baa119ed34a5b5bdc71f2a262b5a486d90 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Mon, 23 Oct 2023 17:41:03 +0300 Subject: [PATCH 12/16] build --- tools/MINGW-packages/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/MINGW-packages/build.sh b/tools/MINGW-packages/build.sh index 4c46741f4..f4e264d63 100644 --- a/tools/MINGW-packages/build.sh +++ b/tools/MINGW-packages/build.sh @@ -6,6 +6,7 @@ mingw-w64-qt4 mingw-w64-shiboken mingw-w64-pyside mingw-w64-imath +mingw-w64-libdeflate mingw-w64-openexr mingw-w64-libraw-gpl2 mingw-w64-opencolorio2-git From f8f07c3cbc8b7fcd4f3e025b1d39be563425c623 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Mon, 23 Oct 2023 17:42:03 +0300 Subject: [PATCH 13/16] Update build --- tools/MINGW-packages/build_natron_package_repo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/MINGW-packages/build_natron_package_repo.sh b/tools/MINGW-packages/build_natron_package_repo.sh index ae87d01ef..44318a1ea 100644 --- a/tools/MINGW-packages/build_natron_package_repo.sh +++ b/tools/MINGW-packages/build_natron_package_repo.sh @@ -6,6 +6,7 @@ CWD=$(pwd) PKGS=" mingw-w64-natron-setup mingw-w64-imath +mingw-w64-libdeflate mingw-w64-openexr mingw-w64-libraw-gpl2 mingw-w64-opencolorio2-git From 2cc0643d20bd6f59e56a399888ddb0049dc74d9e Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Mon, 23 Oct 2023 17:47:49 +0300 Subject: [PATCH 14/16] Update --- tools/MINGW-packages/get.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/MINGW-packages/get.sh b/tools/MINGW-packages/get.sh index 93a08e2b1..935b6437e 100644 --- a/tools/MINGW-packages/get.sh +++ b/tools/MINGW-packages/get.sh @@ -5,8 +5,9 @@ VERSION="current" TMP="${CWD}/tmp-${VERSION}" URL="https://sourceforge.net/projects/natron/files/MINGW-packages" PKGS=" -mingw-w64-x86_64-imath-3.1.7-99.1-any.pkg.tar.zst -mingw-w64-x86_64-openexr-3.1.7-99.1-any.pkg.tar.zst +mingw-w64-x86_64-imath-3.1.9-99.1-any.pkg.tar.zst +mingw-w64-x86_64-libdeflate-1.19-99.1-any.pkg.tar.zst +mingw-w64-x86_64-openexr-3.2.1-99.1-any.pkg.tar.zst mingw-w64-x86_64-opencolorio-git-1356.66b7b7d5-99.1-any.pkg.tar.zst mingw-w64-x86_64-openimageio-2.4.10.0-99.1-any.pkg.tar.zst mingw-w64-x86_64-ffmpeg-gpl2-4.4.3-99.1-any.pkg.tar.zst From 5d3ff357e72218e744f686b959cf260ece74cc82 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Tue, 14 Nov 2023 18:39:05 +0200 Subject: [PATCH 15/16] mingw openexr off --- tools/MINGW-packages/mingw-w64-openexr/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD index f2c2780a2..89a5661cf 100644 --- a/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-openexr/PKGBUILD @@ -69,6 +69,7 @@ build() { -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTING=OFF \ -DOPENEXR_INSTALL_EXAMPLES=OFF \ + -DOPENEXR_BUILD_TOOLS=OFF \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/cmake --build . From 1a25edcb2e22ba8ca157adf893f2fff44532e006 Mon Sep 17 00:00:00 2001 From: Todica Ionut Date: Tue, 14 Nov 2023 22:26:09 +0200 Subject: [PATCH 16/16] Remove mingw --- tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD b/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD index 75aaa79c1..ea09405c8 100644 --- a/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD +++ b/tools/MINGW-packages/mingw-w64-libdeflate/PKGBUILD @@ -1,5 +1,3 @@ -# Maintainer: Miloš Komarčević - _realname=libdeflate pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"