Date: Sun, 13 May 2012 03:55:24 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: oliver@FreeBSD.org Subject: ports/167831: [PATCH] graphics/cegui: enable null renderer, fix library names Message-ID: <20120512235524.76A5095@hades.panopticon> Resent-Message-ID: <201205130000.q4D00RcM033449@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167831
>Category: ports
>Synopsis: [PATCH] graphics/cegui: enable null renderer, fix library names
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 13 00:00:27 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 10 01:33:18 MSK 2012
>Description:
- Enable null renderer, it's needed for games/secretmaryochronicles update and doesn't seem to bring any extra depends
- Fix library file naming
The hack of renaming libCEGUIfoobar-X.Y.Z.so to libCEGUIfoobar-X.Y.so.Z breaks CEGUI itself, as the latter dlopens some of its modules, and filename string for dlopen is constructed in the libCEGUIfoobar-X.Y.Z.so way, so with libraries renamed cegui is not able to dynamically load modules. Renaming scheme is also not correct wrt .so versioning: if (part of) package version is used as a .so version, major (rather than minor) part should be used, as it usually changes ABI and it will not reset to 0 with the next major release. In this case (where port version is included in the library name), however, .so versioning doesn't even apply, so it should just be 0.
Port maintainer (oliver@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- cegui-0.7.5_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/graphics/cegui/Makefile,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile
--- Makefile 14 Feb 2012 12:45:19 -0000 1.31
+++ Makefile 12 May 2012 23:33:10 -0000
@@ -7,7 +7,7 @@
PORTNAME= cegui
PORTVERSION= 0.7.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics devel
MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.7.5
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
@@ -24,7 +24,8 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/}
CONFIGURE_ARGS= --disable-toluacegui --disable-irrlicht-renderer \
--disable-corona --enable-devil --disable-freeimage --disable-silly \
- --disable-libxml --disable-xerces-c --disable-expat --disable-samples
+ --disable-libxml --disable-xerces-c --disable-expat --disable-samples \
+ --enable-null-renderer
CONFIGURE_ENV+= Lua_LIBS="-L${LUA_LIBDIR} -llua -lm" \
Lua_CFLAGS="-I${LUA_INCDIR}"
@@ -49,7 +50,7 @@
s|-lpthread|${PTHREAD_LIBS}|g; \
s|CEGUI_LUA_VER=..|CEGUI_LUA_VER=${USE_LUA:S/.//}|g; \
s|DevIL_CFLAGS=.*|DevIL_CFLAGS="-DUSE_DEVIL_LIBRARY -I${LOCALBASE}/include"|g; \
- s|-release $$cegui_lib_version_suffix|-release ${PORTVERSION:C/\.[0-9]$//g} -version-number ${PORTVERSION:C/^[0-9]\.[0-9]\.//g}|g' \
+ s|-release $$cegui_lib_version_suffix|& -version-number 0|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|^SUBDIRS = tolua\+\+|SUBDIRS =|g' \
${WRKSRC}/cegui/include/ScriptingModules/LuaScriptModule/support/Makefile.in
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/graphics/cegui/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist 10 Mar 2011 08:21:47 -0000 1.9
+++ pkg-plist 12 May 2012 23:30:38 -0000
@@ -124,6 +124,11 @@
include/CEGUI/ImageCodecModules/STBImageCodec/CEGUISTBImageCodecModule.h
include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodec.h
include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodecModule.h
+include/CEGUI/RendererModules/Null/CEGUINullGeometryBuffer.h
+include/CEGUI/RendererModules/Null/CEGUINullRenderTarget.h
+include/CEGUI/RendererModules/Null/CEGUINullRenderer.h
+include/CEGUI/RendererModules/Null/CEGUINullTexture.h
+include/CEGUI/RendererModules/Null/CEGUINullTextureTarget.h
%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreGeometryBuffer.h
%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreImageCodec.h
%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreRenderTarget.h
@@ -280,44 +285,48 @@
include/CEGUI/falagard/CEGUIFalWidgetLookFeel.h
include/CEGUI/falagard/CEGUIFalWidgetLookManager.h
include/CEGUI/falagard/CEGUIFalXMLEnumHelper.h
-lib/libCEGUIBase-0.7.so.5
-lib/libCEGUIBase-0.7.so
+lib/libCEGUIBase-0.7.5.so.0
+lib/libCEGUIBase-0.7.5.so
lib/libCEGUIBase.la
lib/libCEGUIBase.so
-lib/libCEGUIDevILImageCodec-0.7.so.5
-lib/libCEGUIDevILImageCodec-0.7.so
+lib/libCEGUIDevILImageCodec-0.7.5.so.0
+lib/libCEGUIDevILImageCodec-0.7.5.so
lib/libCEGUIDevILImageCodec.la
lib/libCEGUIDevILImageCodec.so
-lib/libCEGUIFalagardWRBase-0.7.so.5
-lib/libCEGUIFalagardWRBase-0.7.so
+lib/libCEGUIFalagardWRBase-0.7.5.so.0
+lib/libCEGUIFalagardWRBase-0.7.5.so
lib/libCEGUIFalagardWRBase.la
lib/libCEGUIFalagardWRBase.so
-lib/libCEGUILuaScriptModule-0.7.so.5
-lib/libCEGUILuaScriptModule-0.7.so
+lib/libCEGUILuaScriptModule-0.7.5.so.0
+lib/libCEGUILuaScriptModule-0.7.5.so
lib/libCEGUILuaScriptModule.la
lib/libCEGUILuaScriptModule.so
-%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.so.5
-%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.so
+lib/libCEGUINullRenderer-0.7.5.so.0
+lib/libCEGUINullRenderer-0.7.5.so
+lib/libCEGUINullRenderer.la
+lib/libCEGUINullRenderer.so
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.5.so.0
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.5.so
%%WITH_OGRE%%lib/libCEGUIOgreRenderer.la
%%WITH_OGRE%%lib/libCEGUIOgreRenderer.so
-lib/libCEGUIOpenGLRenderer-0.7.so.5
-lib/libCEGUIOpenGLRenderer-0.7.so
+lib/libCEGUIOpenGLRenderer-0.7.5.so.0
+lib/libCEGUIOpenGLRenderer-0.7.5.so
lib/libCEGUIOpenGLRenderer.la
lib/libCEGUIOpenGLRenderer.so
-lib/libCEGUISTBImageCodec-0.7.so.5
-lib/libCEGUISTBImageCodec-0.7.so
+lib/libCEGUISTBImageCodec-0.7.5.so.0
+lib/libCEGUISTBImageCodec-0.7.5.so
lib/libCEGUISTBImageCodec.la
lib/libCEGUISTBImageCodec.so
-lib/libCEGUITGAImageCodec-0.7.so.5
-lib/libCEGUITGAImageCodec-0.7.so
+lib/libCEGUITGAImageCodec-0.7.5.so.0
+lib/libCEGUITGAImageCodec-0.7.5.so
lib/libCEGUITGAImageCodec.la
lib/libCEGUITGAImageCodec.so
-lib/libCEGUITinyXMLParser-0.7.so.5
-lib/libCEGUITinyXMLParser-0.7.so
+lib/libCEGUITinyXMLParser-0.7.5.so.0
+lib/libCEGUITinyXMLParser-0.7.5.so
lib/libCEGUITinyXMLParser.la
lib/libCEGUITinyXMLParser.so
-@comment lib/libCEGUItoluapp-0.7.so.5
-@comment lib/libCEGUItoluapp-0.7.so
+@comment lib/libCEGUItoluapp-0.7.5.so.0
+@comment lib/libCEGUItoluapp-0.7.5.so
@comment lib/libCEGUItoluapp.la
@comment lib/libCEGUItoluapp.so
%%WITH_OGRE%%libdata/pkgconfig/CEGUI-OGRE.pc
@@ -389,6 +398,7 @@
@dirrm include/CEGUI/ImageCodecModules
%%WITH_OGRE%%@dirrm include/CEGUI/RendererModules/Ogre
@dirrm include/CEGUI/RendererModules/OpenGL
+@dirrm include/CEGUI/RendererModules/Null
@dirrm include/CEGUI/RendererModules
@comment @dirrm include/CEGUI/ScriptingModules/LuaScriptModule/support/tolua++
@dirrm include/CEGUI/ScriptingModules/LuaScriptModule/support
--- cegui-0.7.5_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120512235524.76A5095>