rpms/ogre/devel ogre-1.6.1-fix-pcc-build.patch, NONE, 1.1 ogre.spec, 1.46, 1.47

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/ogre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10411

Modified Files:
	ogre.spec 
Added Files:
	ogre-1.6.1-fix-pcc-build.patch 
Log Message:
* Fri Feb 27 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-3
- Fixing PPC build


ogre-1.6.1-fix-pcc-build.patch:

--- NEW FILE ogre-1.6.1-fix-pcc-build.patch ---
diff -ur ogre/OgreMain/src/nedmalloc/malloc.c.h ogre.new/OgreMain/src/nedmalloc/malloc.c.h
--- ogre/OgreMain/src/nedmalloc/malloc.c.h	2009-02-27 11:07:51.000000000 +0300
+++ ogre.new/OgreMain/src/nedmalloc/malloc.c.h	2009-02-27 11:08:02.000000000 +0300
@@ -1837,6 +1837,7 @@
 
 /* Cope with old-style linux recursive lock initialization by adding */
 /* skipped internal declaration from pthread.h */
+/*
 #ifdef linux
 #ifndef PTHREAD_MUTEX_RECURSIVE
 extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
@@ -1845,6 +1846,7 @@
 #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
 #endif
 #endif
+*/
 
 static int pthread_init_lock (MLOCK_T *sl) {
   pthread_mutexattr_t attr;


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ogre.spec	26 Feb 2009 07:58:45 -0000	1.46
+++ ogre.spec	27 Feb 2009 08:17:05 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 # CC-BY-SA is for devel docs
 License:        LGPLv2+ and CC-BY-SA
@@ -18,6 +18,7 @@
 # Upstream patch to GLEW applied to new version
 Patch1:         ogre-1.6.0rc1-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
+Patch3:         ogre-1.6.1-fix-ppc-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -206,6 +207,9 @@
 
 
 %changelog
+* Fri Feb 27 2009 Alexey Torkhov <atorkhov at gmail.com> - 1.6.1-3
+- Fixing PPC build
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild