The package rpms/OpenImageIO.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/OpenImageIO.git/commit/?id=e77166....
Change:
-%ifarch ppc ppc64
Thanks.
Full change:
============
commit 13f46268a89dd47a6d4ae652665932951a23cc33
Merge: 62f7b5b 70d3591
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Jun 1 22:40:12 2020 -0500
Merge branch 'master' into f32
commit 70d3591dad2f7f5405828f2d15ff06dd5adb2c1f
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Jun 1 22:19:57 2020 -0500
Patch for partial fix to test suite.
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 11ce77c..f4da0d6 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -13,6 +13,8 @@ Source0:
https://github.com/%{name}/oiio/archive/Release-%{version}/%{nam
# Images for test suite
#Source1:
https://github.com/OpenImageIO/oiio-images/archive/master/oiio-images.tar.gz
+Patch0: oiio-test.patch
+
# Utilities
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -120,8 +122,6 @@ rm -rf src/include/tbb
#tar --strip-components=1 -xzf %{SOURCE1}
#popd
-sed -i "s|python|python3|g" src/cmake/oiio_macros.cmake
-
%build
mkdir -p build/linux && pushd build/linux
@@ -131,7 +131,6 @@ mkdir -p build/linux && pushd build/linux
-DCMAKE_SKIP_RPATH:BOOL=TRUE \
-DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \
-DPYTHON_VERSION=%{python3_version} \
- -DPYTHON_SITE_DIR=%{python3_sitelib} \
-DPYLIB_INSTALL_DIR:PATH=%{python3_sitearch} \
-DBUILD_DOCS:BOOL=TRUE \
-DINSTALL_DOCS:BOOL=FALSE \
diff --git a/oiio-test.patch b/oiio-test.patch
new file mode 100644
index 0000000..31385e2
--- /dev/null
+++ b/oiio-test.patch
@@ -0,0 +1,22 @@
+Index: oiio-Release-2.1.16.0/src/cmake/oiio_macros.cmake
+===================================================================
+--- oiio-Release-2.1.16.0.orig/src/cmake/oiio_macros.cmake
++++ oiio-Release-2.1.16.0/src/cmake/oiio_macros.cmake
+@@ -197,7 +197,7 @@ macro (oiio_add_tests)
+ set (_testname "${_testname}-broken")
+ endif ()
+
+- set (_runtest python "${CMAKE_SOURCE_DIR}/testsuite/runtest.py"
${_testdir})
++ set (_runtest ${PYTHON_EXECUTABLE}
"${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
+ if (MSVC_IDE)
+ set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
+ --solution-path
"${CMAKE_BINARY_DIR}" )
+@@ -215,7 +215,7 @@ macro (oiio_add_tests)
+ if (_testname MATCHES "texture")
+ set (_testname ${_testname}.batch)
+ set (_testdir ${_testdir}.batch)
+- set (_runtest python
"${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
++ set (_runtest ${PYTHON_EXECUTABLE}
"${CMAKE_SOURCE_DIR}/testsuite/runtest.py" ${_testdir})
+ if (MSVC_IDE)
+ set (_runtest ${_runtest} --devenv-config $<CONFIGURATION>
+ --solution-path
"${CMAKE_BINARY_DIR}" )
commit e77166da819cca2e22a3f5de6469d2a8b30a826f
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Jun 1 21:58:15 2020 -0500
Update to 2.1.16.
diff --git a/.gitignore b/.gitignore
index 15319b5..089777d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@ clog
/OpenImageIO-2.1.13.0.tar.gz
/OpenImageIO-2.1.14.0.tar.gz
/OpenImageIO-2.1.15.0.tar.gz
+/OpenImageIO-2.1.16.0.tar.gz
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index cab5bf0..11ce77c 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,8 +1,8 @@
%global sover 2.1
Name: OpenImageIO
-Version: 2.1.15.0
-Release: 4%{?dist}
+Version: 2.1.16.0
+Release: 1%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -11,12 +11,13 @@ License: BSD and MIT
URL:
https://sites.google.com/site/openimageio/home
Source0:
https://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{vers...
# Images for test suite
-#Source1: oiio-images.tar.gz
+#Source1:
https://github.com/OpenImageIO/oiio-images/archive/master/oiio-images.tar.gz
# Utilities
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: txt2man
+BuildRequires: /usr/bin/pathfix.py
# Libraries
BuildRequires: boost-devel
BuildRequires: boost-python3-devel
@@ -115,11 +116,11 @@ rm -f src/include/OpenImageIO/pugixml.hpp \
rm -rf src/include/tbb
# Install test images
-#rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images
+#mkdir ../oiio-images && pushd ../oiio-images
#tar --strip-components=1 -xzf %{SOURCE1}
+#popd
-# Try disabeling old CMP
-sed -i "s/SET CMP0046 OLD/SET CMP0046 NEW/" CMakeLists.txt
+sed -i "s|python|python3|g" src/cmake/oiio_macros.cmake
%build
@@ -130,6 +131,7 @@ mkdir -p build/linux && pushd build/linux
-DCMAKE_SKIP_RPATH:BOOL=TRUE \
-DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \
-DPYTHON_VERSION=%{python3_version} \
+ -DPYTHON_SITE_DIR=%{python3_sitelib} \
-DPYLIB_INSTALL_DIR:PATH=%{python3_sitearch} \
-DBUILD_DOCS:BOOL=TRUE \
-DINSTALL_DOCS:BOOL=FALSE \
@@ -138,9 +140,6 @@ mkdir -p build/linux && pushd build/linux
-DUSE_OPENSSL:BOOL=TRUE \
-DSTOP_ON_WARNING:BOOL=FALSE \
-DUSE_CPP:STRING=14 \
-%ifarch ppc ppc64
- -DNOTHREADS:BOOL=FALSE \
-%endif
-DJPEG_INCLUDE_DIR=%{_includedir} \
-DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
-DOpenGL_GL_PREFERENCE=GLVND \
@@ -149,6 +148,9 @@ mkdir -p build/linux && pushd build/linux
%make_build
+#ifarch ppc ppc64
+# -DNOTHREADS:BOOL=FALSE \
+#endif
%install
pushd build/linux
@@ -193,6 +195,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Tue Jun 02 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.16.0-1
+- Update to 2.1.16.
+
* Fri May 29 2020 Jonathan Wakely <jwakely(a)redhat.com> - 2.1.15.0-4
- Rebuilt for Boost 1.73
diff --git a/sources b/sources
index ba74894..78a6ce8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OpenImageIO-2.1.15.0.tar.gz) =
9099beeab9bda87a2ec576e9c6b61486ed65806be2bce384fea54786a5900845bc286a1cd44d7341f9062a20d791a883231f5e00852c880438c9f3b3fb060f28
+SHA512 (OpenImageIO-2.1.16.0.tar.gz) =
30de5e5f915ba319d6e63d0bac2c30c5368f8ebd1434e91cb5bcfad3d39efda5b1779a3fedbcdf0c94ec09f1d1370da0b785af06a1fb8f164dfa52adec0db6cb
commit 490d881cac4e0d7c4100bf3a96e9fcd3b7052b67
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Fri May 29 01:01:27 2020 +0100
Rebuilt for Boost 1.73
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index fb94af6..cab5bf0 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -2,7 +2,7 @@
Name: OpenImageIO
Version: 2.1.15.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -193,6 +193,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Fri May 29 2020 Jonathan Wakely <jwakely(a)redhat.com> - 2.1.15.0-4
+- Rebuilt for Boost 1.73
+
* Tue May 26 2020 Miro Hronok <mhroncok(a)redhat.com> - 2.1.15.0-3
- Rebuilt for Python 3.9
commit 32df27a6ffe8829611130974f1dc5e21c342826c
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue May 26 02:39:29 2020 +0200
Rebuilt for Python 3.9
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 310fce4..fb94af6 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -2,7 +2,7 @@
Name: OpenImageIO
Version: 2.1.15.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -193,6 +193,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Tue May 26 2020 Miro Hronok <mhroncok(a)redhat.com> - 2.1.15.0-3
+- Rebuilt for Python 3.9
+
* Mon May 11 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 2.1.15.0-2
- Rebuild for new LibRaw
commit 3dc9ba16abc6a69fd30b79a1f16692598956dc2b
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Mon May 11 15:41:31 2020 -0500
Libraw rebuild
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 99d88c8..310fce4 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -2,7 +2,7 @@
Name: OpenImageIO
Version: 2.1.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for reading and writing images
License: BSD and MIT
@@ -193,6 +193,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Mon May 11 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 2.1.15.0-2
+- Rebuild for new LibRaw
+
* Mon May 11 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.15.0-1
- Update to 2.1.15.0.
- Adds support for libRaw 0.20, fixes RHBZ#1833450.
commit 45b618aa6868901ae609a47f1cb0dc66b6a23b17
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon May 11 07:03:50 2020 -0500
Update to 2.1.15.0.
Adds support for libRaw 0.20, fixes RHBZ#1833450.
diff --git a/.gitignore b/.gitignore
index 32a7128..15319b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@ clog
/OpenImageIO-2.1.12.0.tar.gz
/OpenImageIO-2.1.13.0.tar.gz
/OpenImageIO-2.1.14.0.tar.gz
+/OpenImageIO-2.1.15.0.tar.gz
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index d3d86f0..99d88c8 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,7 +1,7 @@
%global sover 2.1
Name: OpenImageIO
-Version: 2.1.14.0
+Version: 2.1.15.0
Release: 1%{?dist}
Summary: Library for reading and writing images
@@ -193,6 +193,10 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
+* Mon May 11 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.15.0-1
+- Update to 2.1.15.0.
+- Adds support for libRaw 0.20, fixes RHBZ#1833450.
+
* Sat May 02 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.1.14.0-1
- Update to 2.1.14.0.
diff --git a/sources b/sources
index fc552a6..ba74894 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OpenImageIO-2.1.14.0.tar.gz) =
6357433a4fcbeef0d7a97679f648ca88e2d4b2b2f0795d0cd96190594d0124092409823ddca30523eef3dbaebb6bde1fc218596531a69648cc805e661b5357a6
+SHA512 (OpenImageIO-2.1.15.0.tar.gz) =
9099beeab9bda87a2ec576e9c6b61486ed65806be2bce384fea54786a5900845bc286a1cd44d7341f9062a20d791a883231f5e00852c880438c9f3b3fb060f28