rpms/ogre/devel ogre-1.4.6-system-glew.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 ogre.spec, 1.19, 1.20 sources, 1.9, 1.10

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sat Jan 12 21:32:50 UTC 2008 

Author: jwrdegoede

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

Modified Files:
	.cvsignore ogre.spec sources 
Added Files:
	ogre-1.4.6-system-glew.patch 
Log Message:
* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-2
- Oops I just found out that ogre contains private copies of GL and GLEW
  headers, which fall under the not 100% SGI Free Software B and GLX Public
  License licenses, remove these (even from the tarbal!) and use the system
  versions instead


ogre-1.4.6-system-glew.patch:

--- NEW FILE ogre-1.4.6-system-glew.patch ---
--- ogrenew/RenderSystems/GL/src/Makefile.am~	2008-01-12 21:45:45.000000000 +0100
+++ ogrenew/RenderSystems/GL/src/Makefile.am	2008-01-12 21:45:45.000000000 +0100
@@ -32,8 +32,7 @@ RenderSystem_GL_la_SOURCES = OgreGLEngin
                              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 = \
@@ -41,4 +40,4 @@ RenderSystem_GL_la_LIBADD = \
     $(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
--- ogrenew/RenderSystems/GL/src/OgreGLRenderSystem.cpp~	2008-01-12 19:59:20.000000000 +0100
+++ ogrenew/RenderSystems/GL/src/OgreGLRenderSystem.cpp	2008-01-12 19:59:20.000000000 +0100
@@ -54,7 +54,6 @@ Torus Knot Software Ltd.s
 
 // Convenience macro from ARB_vertex_buffer_object spec
 #define VBO_BUFFER_OFFSET(i) ((char *)NULL + (i))
-GLenum glewContextInit (Ogre::GLSupport *glSupport);
 
 namespace Ogre {
 
@@ -218,8 +217,8 @@ namespace Ogre {
 		LogManager::getSingleton().logMessage("*** GL Renderer Started ***");
 		LogManager::getSingleton().logMessage("***************************");
 
-		// Get extension function pointers
-        glewContextInit(mGLSupport);
+        // Get extension function pointers
+        glewInit();
 
         // Check for hardware mipmapping support.
         if(GLEW_VERSION_1_4 || GLEW_SGIS_generate_mipmap)
--- ogrenew/RenderSystems/GL/src/Makefile.in~	2008-01-12 21:46:10.000000000 +0100
+++ ogrenew/RenderSystems/GL/src/Makefile.in	2008-01-12 21:46:10.000000000 +0100
@@ -75,8 +75,7 @@ am_RenderSystem_GL_la_OBJECTS = OgreGLEn
 	OgreGLDefaultHardwareBufferManager.lo OgreGLContext.lo \
 	OgreGLPixelFormat.lo OgreGLRenderTexture.lo \
 	OgreGLFBORenderTexture.lo OgreGLPBRenderTexture.lo \
-	OgreGLFBOMultiRenderTarget.lo OgreGLFrameBufferObject.lo \
-	glew.lo
+	OgreGLFBOMultiRenderTarget.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
@@ -299,8 +298,7 @@ RenderSystem_GL_la_SOURCES = OgreGLEngin
                              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 = \
@@ -308,7 +306,7 @@ RenderSystem_GL_la_LIBADD = \
     $(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
 
@@ -401,7 +399,6 @@ distclean-compile:
 @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 $@ $<; \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Dec 2007 14:04:56 -0000	1.9
+++ .cvsignore	12 Jan 2008 21:32:12 -0000	1.10
@@ -1 +1 @@
-ogre-linux_osx-v1-4-6.tar.bz2
+ogre-1.4.6-clean.tar.bz2


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ogre.spec	29 Dec 2007 14:04:56 -0000	1.19
+++ ogre.spec	12 Jan 2008 21:32:12 -0000	1.20
@@ -1,13 +1,16 @@
 Name:           ogre
 Version:        1.4.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
+# This is http://downloads.sourceforge.net/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
+# With the non free licensed headers under RenderSystems/GL/include/GL removed
+Source0:        ogre-%{version}-clean.tar.bz2
 Source1:        ogre-samples.sh
 Patch0:         ogre-1.2.1-rpath.patch
+Patch1:         ogre-1.4.6-system-glew.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel freetype-devel gtk2-devel
 BuildRequires:  libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -59,6 +62,7 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
+%patch1 -p1 -z .glew
 # stop some CVS stuff from getting installed
 rm -r `find Docs Samples/Media -name CVS`
 # fix line-endings of Docs
@@ -163,6 +167,12 @@
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-2
+- Oops I just found out that ogre contains private copies of GL and GLEW
+  headers, which fall under the not 100% SGI Free Software B and GLX Public
+  License licenses, remove these (even from the tarbal!) and use the system
+  versions instead
+
 * Sat Dec 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.6-1
 - New upstream release 1.4.6
 - Warning as always with a new upstream ogre release this breaks the ABI


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Dec 2007 14:04:56 -0000	1.9
+++ sources	12 Jan 2008 21:32:12 -0000	1.10
@@ -1 +1 @@
-ef1cf73106e0387624bfdd539cdf9de6  ogre-linux_osx-v1-4-6.tar.bz2
+d51c457bf1903f2a0ac15bdfee696f8c  ogre-1.4.6-clean.tar.bz2

More information about the fedora-extras-commits mailing list