rpms/cegui/F-7 cegui-0.5.0-fixweaksymbol.patch, NONE, 1.1 cegui-0.5.0-lua51.patch, NONE, 1.1 cegui-0.5.0-userverso.patch, NONE, 1.1

Author: oddsocks

Update of /cvs/extras/rpms/cegui/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18704

Added Files:
    cegui-0.5.0-fixweaksymbol.patch cegui-0.5.0-lua51.patch 
    cegui-0.5.0-userverso.patch 
Log Message:

cegui-0.5.0-fixweaksymbol.patch:

--- NEW FILE cegui-0.5.0-fixweaksymbol.patch ---
diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/DevILImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/DevILImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/DevILImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/DevILImageCodec/Makefile.am	2007-06-10 18:08:28.000000000 +0100
@@ -4,6 +4,6 @@

lib_LTLIBRARIES=libCEGUIDevILImageCodec.la
 libCEGUIDevILImageCodec_la_SOURCES = CEGUIDevILImageCodec.cpp CEGUIDevILImageCodecModule.cpp
-libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) 
+libCEGUIDevILImageCodec_la_LIBADD = $(DevIL_LIBS) ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUIDevILImageCodec.h CEGUIDevILImageCodecModule.h

diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/SILLYImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/SILLYImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/SILLYImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/SILLYImageCodec/Makefile.am	2007-06-10 18:10:54.000000000 +0100
@@ -3,6 +3,6 @@

lib_LTLIBRARIES=libCEGUISILLYImageCodec.la
 libCEGUISILLYImageCodec_la_SOURCES = CEGUISILLYImageCodec.cpp CEGUISILLYImageCodecModule.cpp 
-libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS)
+libCEGUISILLYImageCodec_la_LIBADD = $(SILLY_LIBS) ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUISILLYImageCodec.h CEGUISILLYImageCodecModule.h

diff -uNr -x '*.log' CEGUI-0.5.0/ImageCodecModules/TGAImageCodec/Makefile.am CEGUI-0.5.0.work/ImageCodecModules/TGAImageCodec/Makefile.am
--- CEGUI-0.5.0/ImageCodecModules/TGAImageCodec/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/ImageCodecModules/TGAImageCodec/Makefile.am	2007-06-10 23:38:40.000000000 +0100
@@ -3,6 +3,7 @@

lib_LTLIBRARIES=libCEGUITGAImageCodec.la
 libCEGUITGAImageCodec_la_SOURCES = CEGUITGAImageCodec.cpp CEGUITGAImageCodecModule.cpp
+libCEGUITGAImageCodec_la_LIBADD = ../../src/libCEGUIBase.la
 pkginclude_HEADERS = CEGUITGAImageCodec.h CEGUITGAImageCodecModule.h

diff -uNr -x '*.log' CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am CEGUI-0.5.0.work/RendererModules/OpenGLGUIRenderer/Makefile.am
--- CEGUI-0.5.0/RendererModules/OpenGLGUIRenderer/Makefile.am	2006-07-28 02:24:36.000000000 +0100
+++ CEGUI-0.5.0.work/RendererModules/OpenGLGUIRenderer/Makefile.am	2007-06-10 22:11:29.000000000 +0100
@@ -2,6 +2,7 @@
 pkgincludedir=$(prefix)/include/CEGUI/RendererModules/OpenGLGUIRenderer
 pkginclude_HEADERS = openglrenderer.h opengltexture.h
 lib_LTLIBRARIES=libCEGUIOpenGLRenderer.la
+libCEGUIOpenGLRenderer_la_LIBADD = ../../src/libCEGUIBase.la -lGL -lGLU
 libCEGUIOpenGLRenderer_la_LDFLAGS = -version-info @CEGUI_OPENGL_VERSION_INFO@
 libCEGUIOpenGLRenderer_la_SOURCES = openglrenderer.cpp opengltexture.cpp

diff -uNr -x '*.log' CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am CEGUI-0.5.0.work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2006-07-25 09:34:51.000000000 +0100
+++ CEGUI-0.5.0.work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2007-06-10 18:50:20.000000000 +0100
@@ -9,5 +9,6 @@
                                      CEGUILua.cpp \
                                      CEGUILuaFunctor.cpp \
                                      required.cpp
+libCEGUILuaScriptModule_la_LIBADD = ../../../../src/libCEGUIBase.la ../../tolua++/libCEGUItoluapp.la

noinst_HEADERS = required.h
diff -uNr -x '*.log' CEGUI-0.5.0/WindowRendererSets/Falagard/src/Makefile.am CEGUI-0.5.0.work/WindowRendererSets/Falagard/src/Makefile.am
--- CEGUI-0.5.0/WindowRendererSets/Falagard/src/Makefile.am	2006-05-09 20:58:32.000000000 +0100
+++ CEGUI-0.5.0.work/WindowRendererSets/Falagard/src/Makefile.am	2007-06-10 18:16:42.000000000 +0100
@@ -41,3 +41,5 @@
                                   FalTabControlProperties.cpp \
                                   FalTitlebar.cpp \
                                   FalTooltip.cpp
+
+libCEGUIFalagardWRBase_la_LIBADD = ../../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/expatParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/expatParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/expatParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/expatParser/Makefile.am	2007-06-10 18:11:25.000000000 +0100
@@ -6,4 +6,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/ExpatParser
 pkginclude_HEADERS = CEGUIExpatParser.h CEGUIExpatParserModule.h

-libCEGUIExpatParser_la_LIBADD = $(expat_LIBS)
+libCEGUIExpatParser_la_LIBADD = $(expat_LIBS) ../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/libxmlParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/libxmlParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/libxmlParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/libxmlParser/Makefile.am	2007-06-10 18:13:01.000000000 +0100
@@ -7,4 +7,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/LibxmlParser
 pkginclude_HEADERS = CEGUILibxmlParser.h CEGUILibxmlParserModule.h

-libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS)
+libCEGUILibxmlParser_la_LIBADD = $(libxml_LIBS) ../../src/libCEGUIBase.la
diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/TinyXMLParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/TinyXMLParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/TinyXMLParser/Makefile.am	2006-03-07 14:44:24.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/TinyXMLParser/Makefile.am	2007-06-10 18:12:34.000000000 +0100
@@ -8,6 +8,8 @@
                                    ceguitinyxml/tinyxmlerror.cpp \
                                    ceguitinyxml/tinyxmlparser.cpp

+libCEGUITinyXMLParser_la_LIBADD = ../../src/libCEGUIBase.la
+
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/TinyXMLParser
 pkginclude_HEADERS = CEGUITinyXMLParser.h CEGUITinyXMLParserModule.h

diff -uNr -x '*.log' CEGUI-0.5.0/XMLParserModules/XercesParser/Makefile.am CEGUI-0.5.0.work/XMLParserModules/XercesParser/Makefile.am
--- CEGUI-0.5.0/XMLParserModules/XercesParser/Makefile.am	2006-03-07 12:57:10.000000000 +0000
+++ CEGUI-0.5.0.work/XMLParserModules/XercesParser/Makefile.am	2007-06-10 18:13:26.000000000 +0100
@@ -6,4 +6,4 @@
 pkgincludedir=$(prefix)/include/CEGUI/XMLParserModules/XercesParser
 pkginclude_HEADERS = CEGUIXercesParser.h CEGUIXercesParserModule.h

-libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS)
+libCEGUIXercesParser_la_LIBADD = $(xerces_LIBS) ../../src/libCEGUIBase.la

cegui-0.5.0-lua51.patch:

--- NEW FILE cegui-0.5.0-lua51.patch ---
diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/aclocal.m4 CEGUI_work/aclocal.m4
--- CEGUI-0.5.0/aclocal.m4	2006-11-28 11:17:05.000000000 +0100
+++ CEGUI_work/aclocal.m4	2007-05-08 16:53:03.000000000 +0200
@@ -551,6 +551,17 @@

AC_DEFUN([CEGUI_CHECK_LUA],[
     PKG_CHECK_MODULES(Lua, lua >= 5.0 lua < 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
+    
+    LUA_VERSION_FLAGS="";
+    if test x$cegui_found_lua = xno; then
+       PKG_CHECK_MODULES(Lua, lua >= 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
+       
+       if test x$cegui_found_lua = xyes; then
+	  LUA_VERSION_FLAGS="$LUA_VERSION_FLAGS -DLUA51"
+  	  AC_MSG_NOTICE([Lua version >=5.1])
+       fi
+    fi
+    AC_SUBST(LUA_VERSION_FLAGS)

AC_ARG_ENABLE([lua-module], AC_HELP_STRING([--disable-lua-module], [Disables building of the Lua scripting module.]),
                 [cegui_with_lua=$enableval], [cegui_with_lua=yes])
diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp	2006-06-19 22:20:17.000000000 +0200
+++ CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp	2007-05-08 18:41:56.000000000 +0200
@@ -35,12 +35,10 @@

// include Lua libs and tolua++
 extern "C" {
-#include "lua.h"
+#include "tolua++.h"
 #include "lualib.h"
-#include "lauxlib.h"
 }

-#include "tolua++.h"

// prototype for bindings initialisation function
 int tolua_CEGUI_open(lua_State* tolua_S);
@@ -55,11 +53,36 @@
 *************************************************************************/
 LuaScriptModule::LuaScriptModule()
 {
+#ifdef LUA51
+       static const luaL_Reg lualibs[] = { 
+          {"", luaopen_base}, 
+          {LUA_LOADLIBNAME, luaopen_package}, 
+          {LUA_TABLIBNAME, luaopen_table}, 
+          {LUA_IOLIBNAME, luaopen_io}, 
+          {LUA_OSLIBNAME, luaopen_os}, 
+          {LUA_STRLIBNAME, luaopen_string}, 
+          {LUA_MATHLIBNAME, luaopen_math}, 
+#if defined(DEBUG) || defined (_DEBUG) 
+          {LUA_DBLIBNAME, luaopen_debug}, 
+#endif 
+          {NULL, NULL} 
+        };
+#endif /* LUA51 */
+
    // create a lua state
    d_ownsState = true;
    d_state = lua_open();

// init all standard libraries
+#ifdef LUA51
+        const luaL_Reg *lib = lualibs; 
+        for (; lib->func; lib++) 
+        { 
+           lua_pushcfunction(d_state, lib->func); 
+           lua_pushstring(d_state, lib->name); 
+           lua_call(d_state, 1, 0); 
+        }	
+#else /* LUA51 */
    luaopen_base(d_state);
    luaopen_io(d_state);
    luaopen_string(d_state);
@@ -68,7 +91,7 @@
 #if defined(DEBUG) || defined (_DEBUG)
    luaopen_debug(d_state);
 #endif
-
+#endif /* LUA51 */
    setModuleIdentifierString();
 }

diff -ru --exclude '*.in' --exclude '*.~' --exclude '*.cache' --exclude configure CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
--- CEGUI-0.5.0/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2006-07-25 10:34:51.000000000 +0200
+++ CEGUI_work/ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am	2007-05-08 16:56:04.000000000 +0200
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)/include \
            -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
-           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
+           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
+           ${LUA_VERSION_FLAGS}
 lib_LTLIBRARIES = libCEGUILuaScriptModule.la

libCEGUILuaScriptModule_la_LDFLAGS = -version-info @CEGUI_VERSION_INFO@

cegui-0.5.0-userverso.patch:

--- NEW FILE cegui-0.5.0-userverso.patch ---
--- CEGUI-0.5.0/src/CEGUIDynamicModule.cpp.orig	2006-08-09 20:39:16.000000000 +0100
+++ CEGUI-0.5.0/src/CEGUIDynamicModule.cpp	2007-06-02 22:07:49.000000000 +0100
@@ -65,6 +65,31 @@
     // see if we need to add the leading 'lib'
     if (d_moduleName.substr(0, 3) != "lib")
         d_moduleName.insert(0, "lib");
+
+    // Insist on opening the versioned .so so that the development package
+    // does not need to be installed
+    if (d_moduleName == "libCEGUIBase.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUIFalagardWRBase.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUILuaScriptModule.so")
+    {
+        d_moduleName += ".1";
+    }
+    else if (d_moduleName == "libCEGUItoluapp.so")
+    {
+        d_moduleName += ".1";
+    }
+    else
+    {
+        d_moduleName += ".0";
+    }
+
+
 #endif

// Optionally add a _d to the module name for the debug config on Win32