Update to 1.2.3.
This commit is contained in:
commit
445f69a935
|
@ -18,3 +18,4 @@ clog
|
||||||
/oiio-Release-1.1.13.tar.gz
|
/oiio-Release-1.1.13.tar.gz
|
||||||
/oiio-Release-1.2.0.tar.gz
|
/oiio-Release-1.2.0.tar.gz
|
||||||
/oiio-Release-1.2.1.tar.gz
|
/oiio-Release-1.2.1.tar.gz
|
||||||
|
/oiio-Release-1.2.3.tar.gz
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: OpenImageIO
|
Name: OpenImageIO
|
||||||
Version: 1.2.1
|
Version: 1.2.3
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Library for reading and writing images
|
Summary: Library for reading and writing images
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -19,8 +19,8 @@ Source101: FindTBB.cmake
|
||||||
Patch0: oiio-arm.patch
|
Patch0: oiio-arm.patch
|
||||||
Patch1: oiio-ppc.patch
|
Patch1: oiio-ppc.patch
|
||||||
Patch2: oiio-s390.patch
|
Patch2: oiio-s390.patch
|
||||||
Patch3: oiio-hdf5.patch
|
Patch3: oiio-cmake.patch
|
||||||
Patch4: oiio-cmake.patch
|
Patch4: oiio-spin_mutex.patch
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
BuildRequires: cmake28
|
BuildRequires: cmake28
|
||||||
|
@ -94,9 +94,8 @@ Development files for package %{name}
|
||||||
%setup -q -n oiio-Release-%{version}
|
%setup -q -n oiio-Release-%{version}
|
||||||
%patch0 -p1 -b .arm
|
%patch0 -p1 -b .arm
|
||||||
%patch1 -p1 -b .ppc
|
%patch1 -p1 -b .ppc
|
||||||
#patch2 -p1 -b .s390
|
%patch3 -p1 -b .cmake
|
||||||
%patch3 -p1 -b .hdf5
|
%patch4 -p1 -b .spin_mutex
|
||||||
%patch4 -p1 -b .cmake
|
|
||||||
|
|
||||||
# Install FindTBB.cmake
|
# Install FindTBB.cmake
|
||||||
install %{SOURCE101} src/cmake/modules/
|
install %{SOURCE101} src/cmake/modules/
|
||||||
|
@ -174,6 +173,23 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.2.3-3
|
||||||
|
- rebuild (openexr)
|
||||||
|
|
||||||
|
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 1.2.3-2
|
||||||
|
- rebuilt for GLEW 1.10
|
||||||
|
|
||||||
|
* Wed Nov 6 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.3-1
|
||||||
|
- Update to latest upstream release.
|
||||||
|
- Fix ppc builds (BZ#1021977).
|
||||||
|
- Add conditionals to build requirements for EPEL 6.
|
||||||
|
|
||||||
|
* Wed Oct 2 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.2-1
|
||||||
|
- Update to latest upstream release.
|
||||||
|
|
||||||
|
* Sun Sep 08 2013 Rex Dieter <rdieter@fedoraproject.org> 1.2.1-2
|
||||||
|
- rebuild (ilmbase/openexr)
|
||||||
|
|
||||||
* Thu Aug 8 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.1-1
|
* Thu Aug 8 2013 Richard Shaw <hobbes1069@gmail.com> - 1.2.1-1
|
||||||
- Update to latest upstream release.
|
- Update to latest upstream release.
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -Naur oiio-Release-1.2.1.orig/src/CMakeLists.txt oiio-Release-1.2.1/src/CMakeLists.txt
|
diff -Naur oiio-Release-1.2.2.orig/src/CMakeLists.txt oiio-Release-1.2.2/src/CMakeLists.txt
|
||||||
--- oiio-Release-1.2.1.orig/src/CMakeLists.txt 2013-08-06 00:10:31.000000000 -0500
|
--- oiio-Release-1.2.2.orig/src/CMakeLists.txt 2013-09-30 12:25:21.000000000 -0500
|
||||||
+++ oiio-Release-1.2.1/src/CMakeLists.txt 2013-10-01 14:56:40.148707021 -0500
|
+++ oiio-Release-1.2.2/src/CMakeLists.txt 2013-10-02 08:04:11.217616340 -0500
|
||||||
@@ -396,9 +396,9 @@
|
@@ -396,9 +396,9 @@
|
||||||
set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/doc/Description.txt")
|
set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/doc/Description.txt")
|
||||||
set (CPACK_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-${platform})
|
set (CPACK_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-${platform})
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
diff -Naur oiio-Release-1.2.1.orig/src/cmake/externalpackages.cmake oiio-Release-1.2.1/src/cmake/externalpackages.cmake
|
|
||||||
--- oiio-Release-1.2.1.orig/src/cmake/externalpackages.cmake 2013-08-06 00:10:31.000000000 -0500
|
|
||||||
+++ oiio-Release-1.2.1/src/cmake/externalpackages.cmake 2013-08-29 09:12:03.303106159 -0500
|
|
||||||
@@ -285,6 +285,7 @@
|
|
||||||
# variables HDF5_INCLUDE_DIRS and HDF5_LIBRARIES.
|
|
||||||
else ()
|
|
||||||
find_package (HDF5 COMPONENTS CXX)
|
|
||||||
+ set(HDF5_LIBRARIES ${HDF5_LIBRARIES_RELEASE})
|
|
||||||
endif ()
|
|
||||||
if (VERBOSE)
|
|
||||||
message (STATUS "HDF5_FOUND=${HDF5_FOUND}")
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
From 77fd2276e12791dc17cb20526cd371d66140e416 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Larry Gritz <lg@larrygritz.com>
|
||||||
|
Date: Tue, 5 Nov 2013 16:05:43 -0800
|
||||||
|
Subject: [PATCH] Make cleaner threads.h compile for the NOTHREADS case
|
||||||
|
|
||||||
|
---
|
||||||
|
src/include/thread.h | 27 ++++++++++++++++++++++-----
|
||||||
|
1 file changed, 22 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/include/thread.h b/src/include/thread.h
|
||||||
|
index e389ebb..ecf3e66 100644
|
||||||
|
--- a/src/include/thread.h
|
||||||
|
+++ b/src/include/thread.h
|
||||||
|
@@ -128,6 +128,7 @@ class null_mutex {
|
||||||
|
void unlock () { }
|
||||||
|
void lock_shared () { }
|
||||||
|
void unlock_shared () { }
|
||||||
|
+ bool try_lock () { return true; }
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Null lock that can be substituted for a real one to test how much
|
||||||
|
@@ -219,7 +220,9 @@ class thread_specific_ptr {
|
||||||
|
inline int
|
||||||
|
atomic_exchange_and_add (volatile int *at, int x)
|
||||||
|
{
|
||||||
|
-#ifdef USE_GCC_ATOMICS
|
||||||
|
+#ifdef NOTHREADS
|
||||||
|
+ int r = *at; *at += x; return r;
|
||||||
|
+#elif defined(USE_GCC_ATOMICS)
|
||||||
|
return __sync_fetch_and_add ((int *)at, x);
|
||||||
|
#elif USE_TBB
|
||||||
|
atomic<int> *a = (atomic<int> *)at;
|
||||||
|
@@ -237,7 +240,9 @@ class thread_specific_ptr {
|
||||||
|
inline long long
|
||||||
|
atomic_exchange_and_add (volatile long long *at, long long x)
|
||||||
|
{
|
||||||
|
-#ifdef USE_GCC_ATOMICS
|
||||||
|
+#ifdef NOTHREADS
|
||||||
|
+ long long r = *at; *at += x; return r;
|
||||||
|
+#elif defined(USE_GCC_ATOMICS)
|
||||||
|
return __sync_fetch_and_add (at, x);
|
||||||
|
#elif USE_TBB
|
||||||
|
atomic<long long> *a = (atomic<long long> *)at;
|
||||||
|
@@ -261,11 +266,17 @@ class thread_specific_ptr {
|
||||||
|
/// *at = newval; return true;
|
||||||
|
/// } else {
|
||||||
|
/// return false;
|
||||||
|
-///
|
||||||
|
+/// }
|
||||||
|
inline bool
|
||||||
|
atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
|
||||||
|
{
|
||||||
|
-#ifdef USE_GCC_ATOMICS
|
||||||
|
+#ifdef NOTHREADS
|
||||||
|
+ if (*at == compareval) {
|
||||||
|
+ *at = newval; return true;
|
||||||
|
+ } else {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+#elif defined(USE_GCC_ATOMICS)
|
||||||
|
return __sync_bool_compare_and_swap (at, compareval, newval);
|
||||||
|
#elif USE_TBB
|
||||||
|
atomic<int> *a = (atomic<int> *)at;
|
||||||
|
@@ -282,7 +293,13 @@ class thread_specific_ptr {
|
||||||
|
inline bool
|
||||||
|
atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
|
||||||
|
{
|
||||||
|
-#ifdef USE_GCC_ATOMICS
|
||||||
|
+#ifdef NOTHREADS
|
||||||
|
+ if (*at == compareval) {
|
||||||
|
+ *at = newval; return true;
|
||||||
|
+ } else {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+#elif defined(USE_GCC_ATOMICS)
|
||||||
|
return __sync_bool_compare_and_swap (at, compareval, newval);
|
||||||
|
#elif USE_TBB
|
||||||
|
atomic<long long> *a = (atomic<long long> *)at;
|
||||||
|
--
|
||||||
|
1.8.4
|
||||||
|
|
Loading…
Reference in New Issue