diff --git a/mingw-w64-openimageio/0000-fix-mingw-w64.patch b/mingw-w64-openimageio/0000-fix-mingw-w64.patch index 9745042a6b..763ad3737f 100644 --- a/mingw-w64-openimageio/0000-fix-mingw-w64.patch +++ b/mingw-w64-openimageio/0000-fix-mingw-w64.patch @@ -69,17 +69,6 @@ #include "dassert.h" #include "typedesc.h" ---- a/CMakeLists.txt 2013-12-30 01:06:13.042400000 +0400 -+++ b/CMakeLists.txt 2013-12-30 01:06:22.293200000 +0400 -@@ -423,7 +423,7 @@ - set (CPACK_GENERATOR "TGZ;STGZ;PackageMaker") - set (CPACK_SOURCE_GENERATOR "TGZ") - endif () --if (WIN32) -+if (MSVC) - set (CPACK_GENERATOR "NSIS") - set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer") - # set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer") --- a/src/cmake/modules/FindFFmpeg.cmake.orig 2016-07-11 14:14:12.042802600 +0300 +++ b/src/cmake/modules/FindFFmpeg.cmake 2016-07-11 14:14:56.699302600 +0300 @@ -64,6 +64,7 @@ diff --git a/mingw-w64-openimageio/0015-python-module-ext.patch b/mingw-w64-openimageio/0015-python-module-ext.patch index 41d18b119a..a189eccf9f 100644 --- a/mingw-w64-openimageio/0015-python-module-ext.patch +++ b/mingw-w64-openimageio/0015-python-module-ext.patch @@ -1,10 +1,10 @@ --- oiio-Release-2.1.16.0/src/cmake/pythonutils.cmake.orig 2020-06-01 19:32:35.000000000 +0300 +++ oiio-Release-2.1.16.0/src/cmake/pythonutils.cmake 2020-06-10 09:51:36.116399600 +0300 -@@ -159,9 +159,11 @@ +@@ -106,9 +106,11 @@ endif() if (WIN32) -+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig, sys; get = distutils.sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.pyd');" ++ execute_process(COMMAND ${Python_EXECUTABLE} -c "import distutils.sysconfig, sys; get = distutils.sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.pyd');" + OUTPUT_VARIABLE PYTHON_MOD_EXT) set_target_properties (${target_name} PROPERTIES DEBUG_POSTFIX "_d" diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index 712d8f039a..d80e195f4c 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -3,7 +3,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.2.7.0 +pkgver=2.2.9.0 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') @@ -30,6 +30,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-openexr" "${MINGW_PACKAGE_PREFIX}-openjpeg" "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-openvdb" "${MINGW_PACKAGE_PREFIX}-ptex" "${MINGW_PACKAGE_PREFIX}-pugixml" "${MINGW_PACKAGE_PREFIX}-zlib") @@ -51,13 +52,13 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi 0015-python-module-ext.patch 0017-cmake-compiler-remove-Werror.patch 0018-link-hdf5.patch) -sha256sums=('857ac83798d6d2bda5d4d11a90618ff19486da2e5a4c4ff022c5976b5746fe8c' +sha256sums=('255cfec0d9e94c8cf412bb2187ca85ad22ed1447342e51f2d439c2e1f8f7b96e' 'SKIP' - 'df1bd86c6f8113940d66ca5027fe729197577bf13b6e5ab4d9b4069a82467796' + '25c71ed54150546dbed782e705d0e114ec080873f624e521bc72d263b592a1dd' '9e4e21333676268a91c0f4e7676aeab7658e5f748e7e5cfe43a92f0fd7931229' '3fa875a999044c5ba758e91df2f213be1ca217307fc9b0085902efe77ca286a0' 'bc37ea8326f7f5f26068051b537f2491e9554a380e6584bf55aaad111d33eb81' - '7e9ab73459f1d4fe859d51682da75c2e0eaa42e3a14deb1b012db31867a45fa7' + 'e943eaf234af935429211c14ad89d5a2a77d84ab8bd3327279d6197ba1f4b0ed' '5a124550e06ce928b928f7fef52ba86cf87ed4ade1cc5848288fad620e84c9ec' '066de45a500ae4eaa5fbdd99bb6ea7904ddc88389ad1d726d629edf5d9527b26')