rpms/ogre/devel ogre-1.2.1-visibility.patch, NONE, 1.1 ogre.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11100

Modified Files:
	ogre.spec 
Added Files:
	ogre-1.2.1-visibility.patch 
Log Message:
* Tue Jul 18 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-3
- Add ogre-1.2.1-visibility.patch to fix issues with the interesting new
  gcc visibility inheritance.


ogre-1.2.1-visibility.patch:

--- NEW FILE ogre-1.2.1-visibility.patch ---
--- ogrenew/OgreMain/include/OgrePlatform.h~	2006-07-18 20:36:22.000000000 +0200
+++ ogrenew/OgreMain/include/OgrePlatform.h	2006-07-18 20:36:22.000000000 +0200
@@ -150,7 +150,7 @@
 #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 
 // Enable GCC 4.0 symbol visibility
-#   if OGRE_COMP_VER >= 400
+#   if 0
 #       define _OgreExport  __attribute__ ((visibility("default")))
 #       define _OgrePrivate __attribute__ ((visibility("hidden")))
 #   else


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre.spec	7 Jul 2006 18:24:11 -0000	1.1
+++ ogre.spec	18 Jul 2006 19:01:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ogre
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPL
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 Patch0:         ogre-1.2.1-rpath.patch
 Patch1:         ogre-1.2.1-gtkmm.patch
 Patch2:         ogre-1.2.1-char_height.patch
+Patch3:         ogre-1.2.1-visibility.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
 BuildRequires:  libglademm24-devel libsigc++20-devel
@@ -48,6 +49,7 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .gtkmm
 %patch2 -p1 -z .char_height
+%patch3 -p1 -z .visibility
 # we don't do this with a patch since we need %{_libdir}
 sed -i 's|libOgrePlatform.so|%{_libdir}/OGRE/libOgrePlatform.so|' \
   OgreMain/include/OgrePlatform.h
@@ -122,6 +124,10 @@
 
 
 %changelog
+* Tue Jul 18 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-3
+- Add ogre-1.2.1-visibility.patch to fix issues with the interesting new
+  gcc visibility inheritance.
+
 * Fri Jul  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
 - Make -devel package Requires on the main package fully versioned.
 - Move libOgrePlatform.so out of %%{_libdir} and into the OGRE plugins dirs as