openimageio: update to 2.4.4.1

This commit is contained in:
مهدي شينون (Mehdi Chinoune)
2022-09-24 09:18:06 +01:00
parent f112e04368
commit cfbfaec49d
4 changed files with 22 additions and 40 deletions

View File

@@ -0,0 +1,11 @@
--- a/src/include/OpenImageIO/imagebuf.h
+++ b/src/include/OpenImageIO/imagebuf.h
@@ -1299,7 +1299,7 @@
pos(m_x, m_y, m_z);
}
/// Increment to the next pixel in the region.
- void OIIO_API operator++(int) { ++(*this); }
+ void operator++(int) { ++(*this); }
/// Return the iteration range
ROI range() const

View File

@@ -1,12 +0,0 @@
--- oiio-Release-1.8.16/src/pnm.imageio/pnminput.cpp.orig 2018-11-30 21:59:59.037519700 +0300
+++ oiio-Release-1.8.16/src/pnm.imageio/pnminput.cpp 2018-11-30 22:00:26.981118000 +0300
@@ -331,7 +331,8 @@
PNMInput::read_file_header()
{
try {
- unsigned int width, height;
+ unsigned int width = 0;
+ unsigned int height = 0;
char c;
if (!m_file)
return false;

View File

@@ -1,10 +0,0 @@
--- a/src/field3d.imageio/CMakeLists.txt
+++ b/src/field3d.imageio/CMakeLists.txt
@@ -11,6 +11,6 @@
add_oiio_plugin (field3dinput.cpp field3doutput.cpp
INCLUDE_DIRS ${FIELD3D_INCLUDES}
LINK_LIBRARIES ${FIELD3D_LIBRARIES}
- # ${HDF5_LIBRARIES}
+ ${HDF5_LIBRARIES}
${SZIP_LIBRARY})
endif()

View File

@@ -3,35 +3,31 @@
_realname=openimageio
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.3.19.0
pkgrel=2
pkgver=2.4.4.1
pkgrel=1
pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://www.openimageio.org/"
license=('spdx:BSD-3-Clause')
depends=("${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-bzip2"
$([[ "${MSYSTEM}" == "CLANG32" ]] || echo "${MINGW_PACKAGE_PREFIX}-dcmtk")
"${MINGW_PACKAGE_PREFIX}-field3d"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-fmt8"
"${MINGW_PACKAGE_PREFIX}-jasper"
"${MINGW_PACKAGE_PREFIX}-fmt"
"${MINGW_PACKAGE_PREFIX}-giflib"
"${MINGW_PACKAGE_PREFIX}-glew"
"${MINGW_PACKAGE_PREFIX}-hdf5"
"${MINGW_PACKAGE_PREFIX}-libheif"
"${MINGW_PACKAGE_PREFIX}-libjpeg"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-libraw"
"${MINGW_PACKAGE_PREFIX}-libsquish"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-opencolorio"
"${MINGW_PACKAGE_PREFIX}-opencv"
"${MINGW_PACKAGE_PREFIX}-openexr"
"${MINGW_PACKAGE_PREFIX}-openjpeg2"
"${MINGW_PACKAGE_PREFIX}-openssl"
"${MINGW_PACKAGE_PREFIX}-openvdb"
"${MINGW_PACKAGE_PREFIX}-ptex"
"${MINGW_PACKAGE_PREFIX}-pugixml"
@@ -41,7 +37,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-qt5-base"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-robin-map"
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-pybind11"
"${MINGW_PACKAGE_PREFIX}-python-numpy")
@@ -50,12 +46,10 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-base: iv image viewer"
options=('strip' 'buildflags' '!debug')
source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archive/v${pkgver}.tar.gz
0000-workaround-ansidecl-h-PTR-define-conflict.patch
0012-maybe-uninitialized-errors.patch
0018-link-hdf5.patch)
sha256sums=('602c146aebee775f123459a6c6be753054144b8d82777de26965f2cc3e88113a'
0001-do-not-export-operator++.patch)
sha256sums=('3e81dff415bf58f4df889ab24a26d77c19a109ace4c5d55371925b5b00491588'
'9e4e21333676268a91c0f4e7676aeab7658e5f748e7e5cfe43a92f0fd7931229'
'bc37ea8326f7f5f26068051b537f2491e9554a380e6584bf55aaad111d33eb81'
'8228acf86ca69dc462aa398efdf509bc3c7568bdcbe0dbd3dc229c11234618e4')
'b16ea9b4bf769466feab25f8cc516217598873a51760c6bcda84fcb28b1de039')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -70,8 +64,7 @@ prepare() {
cd ${srcdir}/oiio-${pkgver}
apply_patch_with_msg \
0000-workaround-ansidecl-h-PTR-define-conflict.patch \
0012-maybe-uninitialized-errors.patch \
0018-link-hdf5.patch
0001-do-not-export-operator++.patch
}
build() {
@@ -86,7 +79,6 @@ build() {
fi
local _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))")
unset CI GITHUB_ACTIONS # otherwise it forces -Werror
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
@@ -102,6 +94,7 @@ build() {
-DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
-DUSE_EXTERNAL_PUGIXML=ON \
-DOIIO_BUILD_TESTS=OFF \
-DBUILD_TESTING=OFF \
-DSTOP_ON_WARNING=OFF \
${extra_config} \
../oiio-${pkgver}