From cabde45fd92b9b679981288e4e10019a46b7a067 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 4 Jan 2017 10:20:09 -0600 Subject: [PATCH] Update to latest upstream release. Fixes FTBFS on aarch64 (BZ#1408883). --- .gitignore | 1 + OpenImageIO-1.7.7-i686_fix.patch | 11 ----------- OpenImageIO-1.7.9-man.patch | 12 ------------ OpenImageIO.spec | 14 +++++++++----- sources | 2 +- 5 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 OpenImageIO-1.7.7-i686_fix.patch delete mode 100644 OpenImageIO-1.7.9-man.patch diff --git a/.gitignore b/.gitignore index 7fc01be..f55473e 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ clog /OpenImageIO-1.6.16.tar.gz /OpenImageIO-1.7.7.tar.gz /OpenImageIO-1.7.9.tar.gz +/OpenImageIO-1.7.10.tar.gz diff --git a/OpenImageIO-1.7.7-i686_fix.patch b/OpenImageIO-1.7.7-i686_fix.patch deleted file mode 100644 index 2cd8540..0000000 --- a/OpenImageIO-1.7.7-i686_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libtexture/texturesys.cpp -+++ b/src/libtexture/texturesys.cpp -@@ -2477,6 +2477,8 @@ TextureSystemImpl::sample_bicubic (int n - } else { - wx = evalBSplineWeights (float4(sfrac)); - wy = evalBSplineWeights (float4(tfrac)); -+ dwx = float4::Zero(); -+ dwy = float4::Zero(); - } - - // figure out lerp weights so we can turn the filter into a sequence of lerp's diff --git a/OpenImageIO-1.7.9-man.patch b/OpenImageIO-1.7.9-man.patch deleted file mode 100644 index 25e0551..0000000 --- a/OpenImageIO-1.7.9-man.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/doc/CMakeLists.txt -+++ b/src/doc/CMakeLists.txt -@@ -18,7 +18,8 @@ find_package(PythonInterp) - if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND) - message (STATUS "Unix man page documentation will be generated") - set (cli_tools oiiotool iinfo maketx idiff igrep iconvert) -- if (IV_BUILT) -+ find_program(IV_FOUND iv) -+ if (IV_FOUND) - list (APPEND cli_tools iv) - endif() - diff --git a/OpenImageIO.spec b/OpenImageIO.spec index cc8c2bc..a5d1a44 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -2,8 +2,8 @@ #global beta beta1 Name: OpenImageIO -Version: 1.7.9 -Release: 2%{?dist} +Version: 1.7.10 +Release: 1%{?dist} Summary: Library for reading and writing images Group: Development/Libraries @@ -14,7 +14,7 @@ Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version} # Images for test suite #Source1: oiio-images.tar.gz -Patch0: OpenImageIO-1.7.9-man.patch +Patch0: OpenImageIO-man.patch BuildRequires: cmake gcc-c++ BuildRequires: txt2man @@ -163,12 +163,12 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %files utils %exclude %{_bindir}/iv %{_bindir}/* -#%exclude %{_mandir}/man1/iv.1.gz +%exclude %{_mandir}/man1/iv.1.gz %{_mandir}/man1/*.1.gz %files iv %{_bindir}/iv -#%{_mandir}/man1/iv.1.gz +%{_mandir}/man1/iv.1.gz %files devel %doc src/doc/*.pdf @@ -178,6 +178,10 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Mon Jan 2 2017 Richard Shaw - 1.7.10-1 +- Update to latest upstream release. +- Fixes FTBFS on aarch64 (BZ#1408883). + * Tue Dec 27 2016 Jon Ciesla - 1.7.9-2 - Rebuild for new LibRaw. diff --git a/sources b/sources index fc56da1..d6c6620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca9f64b8a12b5a774f5f855a154f88b2 OpenImageIO-1.7.9.tar.gz +SHA512 (OpenImageIO-1.7.10.tar.gz) = b3884a534c87dec85a82736f482540a83a22f629d884c591b1683214038977aceb9cc9808bc683549aaad25987bec4e9f35a42cdd1b100aab76a6526ec8391b2