rpms
/
OpenImageIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update patches

This commit is contained in:
Richard M. Shaw 2013-08-28 15:03:38 -05:00
parent 8b5f5d64ee
commit c2eb3276a8
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oiio-arm.patch
View File

@ -1,6 +1,7 @@
--- oiio-Release-1.1.10/src/include/thread.h.orig 2013-04-01 00:27:21.337292586 +0100
+++ oiio-Release-1.1.10/src/include/thread.h 2013-04-01 00:30:08.910886481 +0100
@@ -446,7 +450,12 @@
diff -Naur oiio-Release-1.2.1.orig/src/include/thread.h oiio-Release-1.2.1/src/include/thread.h
--- oiio-Release-1.2.1.orig/src/include/thread.h 2013-08-06 00:10:31.000000000 -0500
+++ oiio-Release-1.2.1/src/include/thread.h 2013-08-28 14:29:19.730464642 -0500
@@ -447,7 +447,12 @@
// Disallow copy construction by making private and unimplemented.
atomic (atomic const &);

22
oiio-ppc.patch
View File

@ -1,16 +1,18 @@
diff -up oiio-Release-1.1.10/src/include/thread.h.ppc oiio-Release-1.1.10/src/include/thread.h
--- oiio-Release-1.1.10/src/include/thread.h.ppc 2013-05-27 16:16:38.902025786 +0200
+++ oiio-Release-1.1.10/src/include/thread.h 2013-05-27 17:00:19.856167856 +0200
@@ -112,7 +112,7 @@ InterlockedExchangeAdd64 (volatile long
diff -Naur oiio-Release-1.2.1.orig/src/include/thread.h oiio-Release-1.2.1/src/include/thread.h
--- oiio-Release-1.2.1.orig/src/include/thread.h 2013-08-06 00:10:31.000000000 -0500
+++ oiio-Release-1.2.1/src/include/thread.h 2013-08-28 14:35:21.873905568 -0500
@@ -112,8 +112,10 @@
#endif
#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401))
-#if !defined(__FreeBSD__) || defined(__x86_64__)
+#if !defined(__FreeBSD__) && !defined(__powerpc__) || defined(__x86_64__)
#define USE_GCC_ATOMICS
#endif
#endif
@@ -235,6 +235,11 @@ atomic_exchange_and_add (volatile int *a
+#endif
OIIO_NAMESPACE_ENTER
{
@@ -227,6 +229,11 @@
#elif defined(_MSC_VER)
// Windows
return _InterlockedExchangeAdd ((volatile LONG *)at, x);
@ -22,7 +24,7 @@ diff -up oiio-Release-1.1.10/src/include/thread.h.ppc oiio-Release-1.1.10/src/in
#else
# error No atomics on this platform.
#endif
@@ -257,6 +262,11 @@ atomic_exchange_and_add (volatile long l
@@ -249,6 +256,11 @@
# else
return InterlockedExchangeAdd64 ((volatile LONGLONG *)at, x);
# endif
@ -34,7 +36,7 @@ diff -up oiio-Release-1.1.10/src/include/thread.h.ppc oiio-Release-1.1.10/src/in
#else
# error No atomics on this platform.
#endif
@@ -280,6 +290,8 @@ atomic_compare_and_exchange (volatile in
@@ -272,6 +284,8 @@
return a->compare_and_swap (newval, compareval) == newval;
#elif defined(_MSC_VER)
return (_InterlockedCompareExchange ((volatile LONG *)at, newval, compareval) == compareval);
@ -43,7 +45,7 @@ diff -up oiio-Release-1.1.10/src/include/thread.h.ppc oiio-Release-1.1.10/src/in
#else
# error No atomics on this platform.
#endif
@@ -297,6 +309,8 @@ atomic_compare_and_exchange (volatile lo
@@ -289,6 +303,8 @@
return a->compare_and_swap (newval, compareval) == newval;
#elif defined(_MSC_VER)
return (_InterlockedCompareExchange64 ((volatile LONGLONG *)at, newval, compareval) == compareval);