rpms/ogre/devel ogre-1.6.0-system-glew.patch, NONE, 1.1 ogre-1.6.0rc1-openexr-fix.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 ogre.spec, 1.31, 1.32 sources, 1.13, 1.14 ogre-1.4.6-system-glew.patch, 1.1, NONE

Alexey Torkhov atorkhov at fedoraproject.org
Sun Sep 14 09:25:44 UTC 2008 

Author: atorkhov

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

Modified Files:
	.cvsignore ogre.spec sources 
Added Files:
	ogre-1.6.0-system-glew.patch ogre-1.6.0rc1-openexr-fix.patch 
Removed Files:
	ogre-1.4.6-system-glew.patch 
Log Message:
Update to 1.6.0rc1.

ogre-1.6.0-system-glew.patch:

--- NEW FILE ogre-1.6.0-system-glew.patch ---
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp ogre-1.6.0rc1.new/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp
--- ogre-1.6.0rc1/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp	2008-06-12 18:10:57.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/GLX/OgreGLXGLSupport.cpp	2008-09-13 22:40:32.000000000 +0400
@@ -39,7 +39,9 @@
 
 #include <X11/extensions/Xrandr.h>
 
-GLenum glxewContextInit(Ogre::GLSupport *glSupport);
+extern "C" {
+GLenum glxewContextInit();
+}
 
 static Display *_currentDisplay;
 static Display *_getCurrentDisplay(void) { return _currentDisplay; }
@@ -942,7 +944,7 @@
 		
 		glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)_getCurrentDisplay;
 		
-		if (glxewContextInit(this) != GLEW_OK)
+		if (glxewContextInit() != GLEW_OK)
 		{
 			XCloseDisplay (mGLDisplay);
 			XCloseDisplay (mXDisplay);
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.am ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.am
--- ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.am	2008-08-22 14:35:06.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.am	2008-09-13 22:01:14.000000000 +0400
@@ -33,8 +33,7 @@
                              OgreGLFBORenderTexture.cpp \
                              OgreGLPBRenderTexture.cpp \
                              OgreGLFBOMultiRenderTarget.cpp \
-                             OgreGLFrameBufferObject.cpp \
-                             glew.cpp
+                             OgreGLFrameBufferObject.cpp
 
 RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 RenderSystem_GL_la_LIBADD = \
@@ -42,4 +41,4 @@
     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
+    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.in ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.in
--- ogre-1.6.0rc1/RenderSystems/GL/src/Makefile.in	2008-08-28 14:41:30.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/Makefile.in	2008-09-13 22:01:14.000000000 +0400
@@ -76,7 +76,7 @@
 	OgreGLPixelFormat.lo OgreGLRenderTexture.lo \
 	OgreGLRenderToVertexBuffer.lo OgreGLFBORenderTexture.lo \
 	OgreGLPBRenderTexture.lo OgreGLFBOMultiRenderTarget.lo \
-	OgreGLFrameBufferObject.lo glew.lo
+	OgreGLFrameBufferObject.lo
 RenderSystem_GL_la_OBJECTS = $(am_RenderSystem_GL_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -303,8 +303,7 @@
                              OgreGLFBORenderTexture.cpp \
                              OgreGLPBRenderTexture.cpp \
                              OgreGLFBOMultiRenderTarget.cpp \
-                             OgreGLFrameBufferObject.cpp \
-                             glew.cpp
+                             OgreGLFrameBufferObject.cpp
 
 RenderSystem_GL_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 RenderSystem_GL_la_LIBADD = \
@@ -312,7 +311,7 @@
     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
+    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS) -lGLEW
 
 all: all-recursive
 
@@ -406,7 +405,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLSupport.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLTexture.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreGLTextureManager.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Plo at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff -Naur ogre-1.6.0rc1/RenderSystems/GL/src/OgreGLRenderSystem.cpp ogre-1.6.0rc1.new/RenderSystems/GL/src/OgreGLRenderSystem.cpp
--- ogre-1.6.0rc1/RenderSystems/GL/src/OgreGLRenderSystem.cpp	2008-08-25 14:42:20.000000000 +0400
+++ ogre-1.6.0rc1.new/RenderSystems/GL/src/OgreGLRenderSystem.cpp	2008-09-13 22:01:14.000000000 +0400
@@ -54,7 +54,6 @@
 
 // Convenience macro from ARB_vertex_buffer_object spec
 #define VBO_BUFFER_OFFSET(i) ((char *)NULL + (i))
-GLenum glewContextInit (Ogre::GLSupport *glSupport);
 
 namespace Ogre {
 
@@ -989,7 +988,7 @@
 		LogManager::getSingleton().logMessage("***************************");
 
 		// Get extension function pointers
-		glewContextInit(mGLSupport);
+		glewInit();
 	}
 
 

ogre-1.6.0rc1-openexr-fix.patch:

--- NEW FILE ogre-1.6.0rc1-openexr-fix.patch ---
diff -Naur ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.am ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.am
--- ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.am	2008-06-12 18:10:57.000000000 +0400
+++ ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.am	2008-09-13 19:56:20.000000000 +0400
@@ -3,8 +3,7 @@
 pkglib_LTLIBRARIES = Plugin_EXRCodec.la
 
 Plugin_EXRCodec_la_SOURCES = OgreEXRCodec.cpp \
-			     O_IStream.cpp \
-                             OgreEXRCodecDll.cpp 
+			     O_IStream.cpp
 
 Plugin_EXRCodec_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 Plugin_EXRCodec_la_LIBADD = -lOgreMain $(OPENEXR_LIBS) $(OGRE_THREAD_LIBS)
diff -Naur ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.in ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.in
--- ogre-1.6.0rc1-clean/PlugIns/EXRCodec/src/Makefile.in	2008-08-28 14:41:24.000000000 +0400
+++ ogre-1.6.0rc1-clean.new/PlugIns/EXRCodec/src/Makefile.in	2008-09-13 19:56:34.000000000 +0400
@@ -61,8 +61,7 @@
 am__DEPENDENCIES_1 =
 Plugin_EXRCodec_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_Plugin_EXRCodec_la_OBJECTS = OgreEXRCodec.lo O_IStream.lo \
-	OgreEXRCodecDll.lo
+am_Plugin_EXRCodec_la_OBJECTS = OgreEXRCodec.lo O_IStream.lo
 Plugin_EXRCodec_la_OBJECTS = $(am_Plugin_EXRCodec_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/OgreMain/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -253,8 +252,7 @@
 INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/EXRCodec/include -I$(top_srcdir)/OgreMain/include $(OPENEXR_CFLAGS)
 pkglib_LTLIBRARIES = Plugin_EXRCodec.la
 Plugin_EXRCodec_la_SOURCES = OgreEXRCodec.cpp \
-			     O_IStream.cpp \
-                             OgreEXRCodecDll.cpp 
+			     O_IStream.cpp
 
 Plugin_EXRCodec_la_LDFLAGS = -module $(PLUGIN_FLAGS) -L$(top_builddir)/OgreMain/src -Wl,-z,defs
 Plugin_EXRCodec_la_LIBADD = -lOgreMain $(OPENEXR_LIBS) $(OGRE_THREAD_LIBS)
@@ -329,7 +327,6 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/O_IStream.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreEXRCodec.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/OgreEXRCodecDll.Plo at am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	2 Jul 2008 12:21:23 -0000	1.13
+++ .cvsignore	14 Sep 2008 09:25:14 -0000	1.14
@@ -1 +1 @@
-ogre-1.4.9-clean.tar.bz2
+ogre-1.6.0rc1-clean.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ogre.spec	11 Jul 2008 07:25:59 -0000	1.31
+++ ogre.spec	14 Sep 2008 09:25:14 -0000	1.32
@@ -1,17 +1,18 @@
 Name:           ogre
-Version:        1.4.9
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        0.1.rc1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
 # This is http://downloads.sourceforge.net/ogre/ogre-v%(echo %{version} | tr . -).tar.bz2
 # With the non free licensed headers under RenderSystems/GL/include/GL removed
-Source0:        ogre-%{version}-clean.tar.bz2
+Source0:        ogre-1.6.0rc1-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.4.6-system-glew.patch
+Patch1:         ogre-1.6.0-system-glew.patch
 Patch2:         ogre-1.4.7-system-tinyxml.patch
+Patch3:         ogre-1.6.0rc1-openexr-fix.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
@@ -66,6 +67,7 @@
 %patch0 -p1 -z .rpath
 %patch1 -p1 -z .glew
 %patch2 -p1 -z .sys-tinyxml
+%patch3 -p1
 # remove execute bits from src-files for -debuginfo package
 chmod -x `find RenderSystems/GL -type f` \
   `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
@@ -147,6 +149,7 @@
 %doc AUTHORS BUGS COPYING 
 %doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
 %{_bindir}/Ogre*
+%{_bindir}/rcapsdump
 %{_libdir}/lib*Ogre*-%{version}.so
 %{_libdir}/OGRE
 %{_datadir}/OGRE
@@ -173,6 +176,9 @@
 
 
 %changelog
+* Sat Sep 13 2008 Alexey Torkhov <atorkhov at gmail.com> 1.6.0-0.1rc1
+- New upstream release 1.6.0rc1
+
 * Fri Jul 11 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.9-2
 - Rebuild for new cegui
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ogre/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 Jul 2008 12:21:24 -0000	1.13
+++ sources	14 Sep 2008 09:25:14 -0000	1.14
@@ -1 +1 @@
-a01915f5afc5ffba6009d39b1f454d3a  ogre-1.4.9-clean.tar.bz2
+6befec25a9ac9c84aa1ccd1256522fc9  ogre-1.6.0rc1-clean.tar.bz2


--- ogre-1.4.6-system-glew.patch DELETED ---

More information about the fedora-extras-commits mailing list