rpms/Pixie/devel Pixie-src-2.2.3-arches.patch, NONE, 1.1 sources, 1.4, 1.5 Pixie.spec, 1.6, 1.7

[Chauvet (kwizart)]

Author: kwizart

Update of /cvs/pkgs/rpms/Pixie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27985

Modified Files:
	sources Pixie.spec 
Added Files:
	Pixie-src-2.2.3-arches.patch 
Log Message:
- Update to 2.2.3 (final)
- Backport condionnal arches from r1144.


Pixie-src-2.2.3-arches.patch:

--- NEW FILE Pixie-src-2.2.3-arches.patch ---
diff -up Pixie/src/ri/atomic.h.arches Pixie/src/ri/atomic.h
--- Pixie/src/ri/atomic.h.arches	2007-11-22 04:45:08.000000000 +0100
+++ Pixie/src/ri/atomic.h	2008-03-05 17:14:32.000000000 +0100
@@ -79,8 +79,8 @@ inline int atomicDecrement(int32_t *ptr)
 }
 
 ///////////////////////////////////////////////////////////////
-// GCC (i386)
-#elif defined(__i386__) && defined(__GNUC__)
+// GCC (i386 or x86_64)
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
 
 inline int atomicIncrement(volatile int *ptr) {
     unsigned char ret;
@@ -106,7 +106,8 @@ inline int atomicDecrement(volatile int 
 
 ///////////////////////////////////////////////////////////////
 // GCC (MIPS)
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && defined( __PPC__)
+
 
 inline int atomicIncrement(volatile int *ptr) {
     register int ret;
@@ -140,6 +141,7 @@ inline int atomicDecrement(volatile int 
 
 
 #define	ATOMIC_UNSUPPORTED
+#warning Atomic Instructions are not supported on this platform, defaulting to generic implementation
 
 // Have a cross platform solution here
 inline int atomicIncrement(volatile int *ptr) {


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Pixie/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2008 14:56:21 -0000	1.4
+++ sources	5 Mar 2008 17:09:00 -0000	1.5
@@ -1 +1 @@
-c4360ceca89319bcf60a15be96cbd245  Pixie-src-2.2.2.tgz
+08fb16c406d191254afbf55689ff8352  Pixie-src-2.2.3.tgz


Index: Pixie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Pixie/devel/Pixie.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Pixie.spec	9 Feb 2008 14:56:21 -0000	1.6
+++ Pixie.spec	5 Mar 2008 17:09:00 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           Pixie
-Version:        2.2.2
-Release:        5%{?dist}
+Version:        2.2.3
+Release:        1%{?dist}
 Summary:        3D renderer Renderman compliant
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
-URL:            http://www.cs.utexas.edu/~okan/Pixie/pixie.htm
+URL:            http://www.renderpixie.com/
 Source0:        http://downloads.sourceforge.net/pixie/%{name}-src-%{version}.tgz
+Patch0:         Pixie-src-2.2.3-arches.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #BuildRequires:  autoconf, automake, libtool, tcsh
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .arches
 
 # Use autotool to prevent to do special tweaks
 #csh makeunix
@@ -63,7 +65,6 @@
   --enable-shared \
   --disable-static-fltk \
   --disable-selfcontained \
-  --enable-openexr-threads \
   --with-x
 
 
@@ -120,8 +121,9 @@
 
 
 %changelog
-* Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 2.2.2-5
-- Rebuild for gcc43
+* Wed Mar  5 2008 kwizart < kwizart at gmail.com > - 2.2.3-1
+- Update to 2.2.3 (final)
+- Backport condionnal arches from r1144.
 
 * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 2.2.2-4
 - Fix namespace with show (renamed to Pixie_show).