From 1846948f9fa938f209070f727f72558a2d21fd1a Mon Sep 17 00:00:00 2001 From: Damian Kurek Date: Thu, 21 Jan 2021 09:34:00 +0100 Subject: [PATCH 1/3] testing/openimageio: upgrade to 2.2.10.1 --- .../0001-fix-sign-compare-error.patch | 27 ------------------- testing/openimageio/APKBUILD | 13 +++++---- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 testing/openimageio/0001-fix-sign-compare-error.patch diff --git a/testing/openimageio/0001-fix-sign-compare-error.patch b/testing/openimageio/0001-fix-sign-compare-error.patch deleted file mode 100644 index ebf0d078e8f..00000000000 --- a/testing/openimageio/0001-fix-sign-compare-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2cc50c1d923c4eeb7c55b970a77f1a6cbf7f8af2 Mon Sep 17 00:00:00 2001 -From: Leon Marz -Date: Thu, 6 Aug 2020 13:41:19 +0200 -Subject: [PATCH] fix sign compare error - -Fixes Compilation error on armv7, x86 -Already in upstream. See https://github.com/OpenImageIO/oiio/pull/2660 ---- - src/libOpenImageIO/exif.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp -index d7835b2..b47b993 100644 ---- a/src/libOpenImageIO/exif.cpp -+++ b/src/libOpenImageIO/exif.cpp -@@ -783,7 +783,7 @@ read_exif_tag(ImageSpec& spec, const TIFFDirEntry* dirp, cspan buf, - if (dir.tdir_tag == TIFFTAG_EXIFIFD || dir.tdir_tag == TIFFTAG_GPSIFD) { - // Special case: It's a pointer to a private EXIF directory. - // Handle the whole thing recursively. -- unsigned int offset = dirp->tdir_offset; // int stored in offset itself -+ int offset = dirp->tdir_offset; // int stored in offset itself - if (swab) - swap_endian(&offset); - if (offset >= buf.size()) { --- -2.28.0 - diff --git a/testing/openimageio/APKBUILD b/testing/openimageio/APKBUILD index e29cd339abe..4a4b40bcd0a 100644 --- a/testing/openimageio/APKBUILD +++ b/testing/openimageio/APKBUILD @@ -1,12 +1,13 @@ # Contributor: Mark Riedesel # Maintainer: Mark Riedesel pkgname=openimageio -pkgver=2.1.18.1 -pkgrel=2 +pkgver=2.2.10.1 +pkgrel=0 pkgdesc="Image I/O library supporting a multitude of image formats" options="!check" # 100 out of 120 tests fail url="https://sites.google.com/site/openimageio/" -arch="all !mips !mips64 !s390x" +arch="all !armv7 !armhf !mips !mips64 !s390x" +# armv7, armhf: unsupported Neon A64 instructions # s390x, mips, mips64 has missing dependency ptex-dev license="BSD-3-Clause" # NOTE: OpenColorIO and OpenImageIO are cross dependent. If an ABI incompatible @@ -16,8 +17,7 @@ makedepends="cmake boost-dev tiff-dev openexr-dev bzip2-dev freetype-dev hdf5-de libraw-dev openjpeg-dev ptex-dev ptex mesa-dev libwebp-dev qt5-qtbase-dev fmt-dev python3-dev py3-pybind11-dev" subpackages="py3-$pkgname:_python $pkgname-dev $pkgname-doc $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/OpenImageIO/oiio/archive/Release-$pkgver.tar.gz - 0001-fix-sign-compare-error.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/OpenImageIO/oiio/archive/Release-$pkgver.tar.gz" builddir="$srcdir/oiio-Release-$pkgver" build() { @@ -64,5 +64,4 @@ _python() { mv "$pkgdir"/usr/lib/python$pyver* "$subpkgdir"/usr/lib/ } -sha512sums="4ce0f7f104e391bc20f1491dd5519aecb8044efcd0cacd1c4e941ec1e383276024b4e85c5db8c88d234568a65525beb50bf1fa81feed0dd401cb602eee5c782a openimageio-2.1.18.1.tar.gz -25788863c278ac68356b2eb6b1f2b31e1867366f4c1aa6654cfcf8c708de084f69695093de6c2038137742a67908a21f1c3ecc7c679919eaccac6d5b310da087 0001-fix-sign-compare-error.patch" +sha512sums="6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a openimageio-2.2.10.1.tar.gz" -- GitLab From 2ebe18d0d0ed1bb3420cbe842db91e8e813b2611 Mon Sep 17 00:00:00 2001 From: Damian Kurek Date: Thu, 21 Jan 2021 09:36:15 +0100 Subject: [PATCH 2/3] testing/osl: upgrade to 1.11.10.0 --- testing/osl/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/osl/APKBUILD b/testing/osl/APKBUILD index 1b7bb01b9cd..d23af238fec 100644 --- a/testing/osl/APKBUILD +++ b/testing/osl/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Damian Kurek # Maintainer: Damian Kurek pkgname=osl -pkgver=1.11.9.0 -pkgrel=1 +pkgver=1.11.10.0 +pkgrel=0 pkgdesc="advanced shading language for production GI renderers" options="!check" # All tests fail url="https://opensource.imageworks.com/osl.html" -arch="all !s390x !mips64" # openimageio +arch="all !armv7 !armhf !s390x !mips64" # openimageio license="BSD-3-Clause" _llvmver=10 makedepends="openexr-dev zlib-dev cmake boost-dev openimageio-dev pugixml-dev @@ -72,4 +72,4 @@ _osl() { amove usr/lib/osl.imageio.so } -sha512sums="f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65 osl-1.11.9.0.tar.gz" +sha512sums="c81e784ada4d6aed5923c979eb9f601595630c3d4a59098bfb69459364480a7cd6022f9f4c18dd724a3bba2026e40f5a157d91683a1d76bdb1e8e30f97f495a1 osl-1.11.10.0.tar.gz" -- GitLab From 1bdc5bdd59dd3c82e258fa6d653ef0063c2bc830 Mon Sep 17 00:00:00 2001 From: Damian Kurek Date: Mon, 25 Jan 2021 07:20:52 +0100 Subject: [PATCH 3/3] testing/blender: rebuild against openimageio-2.2.10.1 --- testing/blender/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD index bc7a140eec0..d795d482b01 100644 --- a/testing/blender/APKBUILD +++ b/testing/blender/APKBUILD @@ -4,7 +4,7 @@ pkgname=blender pkgver=2.91.2 _pkgver=${pkgver%.[0-9]} -pkgrel=0 +pkgrel=1 pkgdesc="3D Creation/Animation/Publishing System" url="https://www.blender.org/" arch="x86_64" # only on x86_64, mainly because of openvdb @@ -15,7 +15,7 @@ makedepends="cmake libx11-dev libjpeg-turbo-dev libpng-dev freetype-dev python3- fftw-dev tiff-dev libxi-dev libsndfile-dev boost-dev openexr-dev py3-numpy-dev opensubdiv-dev lzo-dev libxrender-dev openjpeg-dev openxr-dev libtbb-dev libtbb llvm10-dev eigen-dev sdl2-dev jack-dev alembic-dev osl-dev osl embree-dev - embree-static openvdb-dev gmp-dev potrace-dev" + embree-static openvdb-dev gmp-dev potrace-dev pugixml-dev" subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname:python" source="https://download.blender.org/source/blender-$pkgver.tar.xz 0001-musl-fixes.patch -- GitLab