Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 May 2015 21:42:13 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385838 - in head/graphics/cegui: . files
Message-ID:  <201505082142.t48LgDxq025173@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri May  8 21:42:12 2015
New Revision: 385838
URL: https://svnweb.freebsd.org/changeset/ports/385838

Log:
  Update to 0.8.4.
  
  Approved by:	oliver

Deleted:
  head/graphics/cegui/files/patch-CMakeLists.txt
  head/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake
  head/graphics/cegui/files/patch-cmake__FindFreetype.cmake
  head/graphics/cegui/files/patch-cmake__FindLua51.cmake
Modified:
  head/graphics/cegui/Makefile
  head/graphics/cegui/distinfo
  head/graphics/cegui/files/patch-cegui__src__CMakeLists.txt
  head/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake
  head/graphics/cegui/pkg-plist

Modified: head/graphics/cegui/Makefile
==============================================================================
--- head/graphics/cegui/Makefile	Fri May  8 21:37:10 2015	(r385837)
+++ head/graphics/cegui/Makefile	Fri May  8 21:42:12 2015	(r385838)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cegui
-PORTVERSION=	0.8.3
-PORTREVISION=	7
+PORTVERSION=	0.8.4
 CATEGORIES=	graphics devel
-MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.8
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	crayzedsgui/CEGUI%20Mk-2/0.8
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Library providing windowing and widgets for graphics APIs
@@ -19,14 +19,14 @@ CMAKE_ENV+=	TOLUA_INC="${LUA_INCDIR}"
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
-USES=		cmake pathfix pkgconfig compiler:c++11-lib
+USES=		compiler:c++11-lib cmake pathfix pkgconfig tar:bzip2
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	FREETYPE PCRE LUA FRIBIDI DOCS
 OPTIONS_GROUP=	XMLPARSER IMAGECODEC RENDERER
 OPTIONS_GROUP_XMLPARSER=	EXPAT XERCES LIBXML2 RAPIDXML TINYXML
-OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE CORONA
+OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE
 OPTIONS_GROUP_RENDERER=	OPENGL OPENGL3 OGRE IRRLICHT
 
 OPTIONS_DEFAULT=	FREETYPE PCRE LUA FRIBIDI PYTHON
@@ -80,10 +80,6 @@ FREEIMAGE_DESC=		FreeImage based ImageCo
 FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
 FREEIMAGE_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 FREEIMAGE_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
-CORONA_DESC=		Corona based ImageCodec module
-CORONA_LIB_DEPENDS=	libcorona.so:${PORTSDIR}/graphics/corona
-CORONA_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_CORONA=ON
-CORONA_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
 
 OGRE_DESC=		Ogre3D support
 OGRE_LIB_DEPENDS=	libOgreMain.so:${PORTSDIR}/graphics/ogre3d
@@ -105,6 +101,7 @@ OPENGL3_CMAKE_OFF=	-DCEGUI_BUILD_RENDERE
 
 # not present in ports/unsupported, but may appear later
 CMAKE_ARGS+=		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \
+			-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_PVR=OFF \
 			-DCEGUI_BUILD_RENDERER_OPENGLES=OFF \
@@ -129,8 +126,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\$${CEGUI_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|g' \
 		${WRKSRC}/CMakeLists.txt
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.post.mk>

Modified: head/graphics/cegui/distinfo
==============================================================================
--- head/graphics/cegui/distinfo	Fri May  8 21:37:10 2015	(r385837)
+++ head/graphics/cegui/distinfo	Fri May  8 21:42:12 2015	(r385838)
@@ -1,2 +1,2 @@
-SHA256 (cegui-0.8.3.tar.gz) = b0db67c18183bc00c14e63eaa22c93ed2225a24f27bff3386a4127cb3880f11b
-SIZE (cegui-0.8.3.tar.gz) = 19585257
+SHA256 (cegui-0.8.4.tar.bz2) = b5fcbd548b83045e92c4da413928113be77ebee0117368925e1904b3b957a388
+SIZE (cegui-0.8.4.tar.bz2) = 17894771

Modified: head/graphics/cegui/files/patch-cegui__src__CMakeLists.txt
==============================================================================
--- head/graphics/cegui/files/patch-cegui__src__CMakeLists.txt	Fri May  8 21:37:10 2015	(r385837)
+++ head/graphics/cegui/files/patch-cegui__src__CMakeLists.txt	Fri May  8 21:42:12 2015	(r385838)
@@ -1,7 +1,7 @@
---- cegui/src/CMakeLists.txt.orig	2013-12-07 13:37:08.000000000 +0400
-+++ cegui/src/CMakeLists.txt	2014-05-13 02:26:12.794972513 +0400
-@@ -91,6 +91,10 @@
-     target_link_libraries(${CEGUI_TARGET_NAME} ${CMAKE_DL_LIBS})
+--- cegui/src/CMakeLists.txt.orig	2014-07-07 07:06:18 UTC
++++ cegui/src/CMakeLists.txt
+@@ -93,6 +93,10 @@ elseif (MINGW)
+     cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CMAKE_DL_LIBS})
  endif()
  
 +if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

Modified: head/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake
==============================================================================
--- head/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake	Fri May  8 21:37:10 2015	(r385837)
+++ head/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake	Fri May  8 21:42:12 2015	(r385838)
@@ -1,5 +1,5 @@
---- cmake/FindTOLUAPP.cmake.orig	2014-03-11 21:25:30.000000000 +0100
-+++ cmake/FindTOLUAPP.cmake	2014-03-11 21:28:03.000000000 +0100
+--- cmake/FindTOLUAPP.cmake.orig	2013-04-29 08:26:36 UTC
++++ cmake/FindTOLUAPP.cmake
 @@ -3,9 +3,9 @@
  ################################################################################
  include(FindPackageHandleStandardArgs)

Modified: head/graphics/cegui/pkg-plist
==============================================================================
--- head/graphics/cegui/pkg-plist	Fri May  8 21:37:10 2015	(r385837)
+++ head/graphics/cegui/pkg-plist	Fri May  8 21:42:12 2015	(r385838)
@@ -56,16 +56,10 @@ include/cegui-0/CEGUI/GlobalEventSet.h
 include/cegui-0/CEGUI/IconvStringTranscoder.h
 include/cegui-0/CEGUI/Image.h
 include/cegui-0/CEGUI/ImageCodec.h
-%%CORONA%%include/cegui-0/CEGUI/ImageCodecModules/Corona/ImageCodec.h
-%%CORONA%%include/cegui-0/CEGUI/ImageCodecModules/Corona/ImageCodecModule.h
 %%DEVIL%%include/cegui-0/CEGUI/ImageCodecModules/DevIL/ImageCodec.h
 %%DEVIL%%include/cegui-0/CEGUI/ImageCodecModules/DevIL/ImageCodecModule.h
 %%FREEIMAGE%%include/cegui-0/CEGUI/ImageCodecModules/FreeImage/ImageCodec.h
 %%FREEIMAGE%%include/cegui-0/CEGUI/ImageCodecModules/FreeImage/ImageCodecModule.h
-include/cegui-0/CEGUI/ImageCodecModules/STB/ImageCodec.h
-include/cegui-0/CEGUI/ImageCodecModules/STB/ImageCodecModule.h
-include/cegui-0/CEGUI/ImageCodecModules/TGA/ImageCodec.h
-include/cegui-0/CEGUI/ImageCodecModules/TGA/ImageCodecModule.h
 include/cegui-0/CEGUI/ImageFactory.h
 include/cegui-0/CEGUI/ImageManager.h
 include/cegui-0/CEGUI/InjectedInputReceiver.h
@@ -116,20 +110,17 @@ include/cegui-0/CEGUI/Renderer.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/ImageCodec.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/MemoryFile.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RenderTarget.h
+%%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RenderTarget.inl
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/Renderer.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RendererDef.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/ResourceProvider.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/Texture.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/TextureTarget.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/WindowTarget.h
-include/cegui-0/CEGUI/RendererModules/Null/GeometryBuffer.h
-include/cegui-0/CEGUI/RendererModules/Null/RenderTarget.h
-include/cegui-0/CEGUI/RendererModules/Null/Renderer.h
-include/cegui-0/CEGUI/RendererModules/Null/Texture.h
-include/cegui-0/CEGUI/RendererModules/Null/TextureTarget.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/GeometryBuffer.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/ImageCodec.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/RenderTarget.h
+%%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/RenderTarget.inl
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/Renderer.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/ResourceProvider.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/Texture.h
@@ -147,6 +138,7 @@ include/cegui-0/CEGUI/RendererModules/Nu
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/GeometryBufferBase.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/GlmPimpl.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RenderTarget.h
+%%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RenderTarget.inl
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RendererBase.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/Shader.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/ShaderManager.h
@@ -316,40 +308,33 @@ include/cegui-0/CEGUI/widgets/Tree.h
 include/cegui-0/CEGUI/widgets/TreeItem.h
 include/cegui-0/CEGUI/widgets/VerticalLayoutContainer.h
 lib/cegui-0.8/libCEGUICoreWindowRendererSet.so
-%%CORONA%%lib/cegui-0.8/libCEGUICoronaImageCodec.so
 %%DEVIL%%lib/cegui-0.8/libCEGUIDevILImageCodec.so
 %%EXPAT%%lib/cegui-0.8/libCEGUIExpatParser.so
 %%FREEIMAGE%%lib/cegui-0.8/libCEGUIFreeImageImageCodec.so
 %%LIBXML2%%lib/cegui-0.8/libCEGUILibXMLParser.so
 %%RAPIDXML%%lib/cegui-0.8/libCEGUIRapidXMLParser.so
-lib/cegui-0.8/libCEGUISTBImageCodec.so
-lib/cegui-0.8/libCEGUITGAImageCodec.so
 %%TINYXML%%lib/cegui-0.8/libCEGUITinyXMLParser.so
 %%XERCES%%lib/cegui-0.8/libCEGUIXercesParser.so
 lib/libCEGUIBase-0.so
 lib/libCEGUIBase-0.so.2
-lib/libCEGUIBase-0.so.2.2.2
+lib/libCEGUIBase-0.so.2.3.0
 lib/libCEGUICommonDialogs-0.so
 lib/libCEGUICommonDialogs-0.so.2
-lib/libCEGUICommonDialogs-0.so.2.2.2
+lib/libCEGUICommonDialogs-0.so.2.3.0
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2
-%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.2.2
+%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.3.0
 %%LUA%%lib/libCEGUILuaScriptModule-0.so
 %%LUA%%lib/libCEGUILuaScriptModule-0.so.2
-%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.2.2
-lib/libCEGUINullRenderer-0.so
-lib/libCEGUINullRenderer-0.so.2
-lib/libCEGUINullRenderer-0.so.2.2.2
+%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.3.0
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so.2
-%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.2.2
+%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.3.0
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2
-%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.2.2
+%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.3.0
 %%IRRLICHT%%libdata/pkgconfig/CEGUI-0-IRRLICHT.pc
 %%LUA%%libdata/pkgconfig/CEGUI-0-LUA.pc
-libdata/pkgconfig/CEGUI-0-NULL.pc
 %%OGRE%%libdata/pkgconfig/CEGUI-0-OGRE.pc
 %%OPENGL%%libdata/pkgconfig/CEGUI-0-OPENGL.pc
 %%OPENGL3%%libdata/pkgconfig/CEGUI-0-OPENGL3.pc
@@ -441,6 +426,7 @@ share/cegui-0/looknfeel/AlfiskoSkin.look
 share/cegui-0/looknfeel/GameMenu.looknfeel
 share/cegui-0/looknfeel/Generic.looknfeel
 share/cegui-0/looknfeel/HUDDemo.looknfeel
+share/cegui-0/looknfeel/Inherited.looknfeel
 share/cegui-0/looknfeel/InventoryComponents.looknfeel
 share/cegui-0/looknfeel/OgreTray.looknfeel
 share/cegui-0/looknfeel/SampleBrowser.looknfeel



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505082142.t48LgDxq025173>