[packages/CEGUI] - added glfw3 patch (adjust GLFW paths for glfw 3) - completed BRs - added RapidXML parser - created

qboosh qboosh at pld-linux.org
Sun Jul 21 15:21:24 CEST 2013


commit 9584aa94ef66bc5dcd0bcd11b1ed59950099e75d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 21 15:21:33 2013 +0200

    - added glfw3 patch (adjust GLFW paths for glfw 3)
    - completed BRs
    - added RapidXML parser
    - created *-Parser subpackages

 CEGUI-glfw3.patch |  11 +++++
 CEGUI.spec        | 117 +++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 105 insertions(+), 23 deletions(-)
---
diff --git a/CEGUI.spec b/CEGUI.spec
index 7440b50..ea9ff16 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - separate packages for plugins
 #
 # Conditional build:
 %bcond_without	xercesc		# build XercesParser
@@ -20,42 +18,47 @@ Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.
 # Source1-md5:	19029d82148fb6c4145c757ee59ccf8a
 Patch0:		pthread.patch
 Patch1:		python-sitedir.patch
+Patch2:		%{name}-glfw3.patch
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
 BuildRequires:	DirectFB-devel >= 1.2.0
 BuildRequires:	FreeImage-devel
 BuildRequires:	SILLY-devel >= 0.1.0
-BuildRequires:	cmake
+BuildRequires:	boost-devel >= 1.36.0
+BuildRequires:	cmake >= 2.8
 BuildRequires:	corona-devel
+BuildRequires:	doxygen
 BuildRequires:	expat-devel
+BuildRequires:	fribidi-devel
 BuildRequires:	freetype-devel >= 2.0
+BuildRequires:	glfw-devel
 BuildRequires:	gtk+2-devel >= 2:2.4
 BuildRequires:	irrlicht-devel >= 1.4
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 1:2.6
 BuildRequires:	lua51-devel >= 5.1
+BuildRequires:	minizip-devel
 %if %{with ogre}
 BuildRequires:	ogre-devel >= 1.6.0
 BuildRequires:	ois-devel >= 1.0.0
 %endif
 BuildRequires:	pcre-devel >= 5.0
 BuildRequires:	pkgconfig
+BuildRequires:	python-devel
+BuildRequires:	rapidxml
 BuildRequires:	sed >= 4.0
 BuildRequires:	tinyxml-devel
 BuildRequires:	tolua++-devel
+%{?with_xercesc:BuildRequires:	xerces-c-devel}
 # for irrlicht renderer
 BuildRequires:	xorg-lib-libXxf86vm-devel
 %if %{with opengl}
 BuildRequires:	GLM
 BuildRequires:	OpenGL-GLU-devel
-BuildRequires:	OpenGL-glut-devel
 BuildRequires:	glew-devel
+BuildRequires:	glfw-devel
 %endif
-%if %{with xercesc}
-BuildRequires:	xerces-c-devel
-%endif
-Requires:	irrlicht >= 1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -206,6 +209,67 @@ Header files for CEGUI SILLYImageCodec library.
 %description ImageCodec-SILLY-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki CEGUI SILLYImageCodec.
 
+%package Parser-Expat
+Summary:	Expat-based XML parser module
+Summary(pl.UTF-8):	Moduł analizatora XML oparty na bibliotece Expat
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Parser-Expat
+Expat-based XML parser module.
+
+%description Parser-Expat -l pl.UTF-8
+Moduł analizatora XML oparty na bibliotece Expat.
+
+%package Parser-LibXML
+Summary:	LibXML-based XML parser module
+Summary(pl.UTF-8):	Moduł analizatora XML oparty na bibliotece LibXML
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libxml2 >= 1:2.6
+
+%description Parser-LibXML
+LibXML-based XML parser module.
+
+%description Parser-LibXML -l pl.UTF-8
+Moduł analizatora XML oparty na bibliotece LibXML.
+
+%package Parser-RapidXML
+Summary:	RapidXML-based XML parser module
+Summary(pl.UTF-8):	Moduł analizatora XML oparty na bibliotece RapidXML
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Parser-RapidXML
+RapidXML-based XML parser module.
+
+%description Parser-RapidXML -l pl.UTF-8
+Moduł analizatora XML oparty na bibliotece RapidXML.
+
+%package Parser-TinyXML
+Summary:	TinyXML-based XML parser module
+Summary(pl.UTF-8):	Moduł analizatora XML oparty na bibliotece TinyXML
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Parser-TinyXML
+TinyXML-based XML parser module.
+
+%description Parser-TinyXML -l pl.UTF-8
+Moduł analizatora XML oparty na bibliotece TinyXML.
+
+%package Parser-Xerces
+Summary:	Xerces-based XML parser module
+Summary(pl.UTF-8):	Moduł analizatora XML oparty na bibliotece Xerces
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Parser-Xerces
+Xerces-based XML parser module.
+
+%description Parser-Xerces -l pl.UTF-8
+Moduł analizatora XML oparty na bibliotece Xerces.
+
 %package Renderer-DirectFB
 Summary:	DirectFBRenderer library for CEGUI
 Summary(pl.UTF-8):	Biblioteka DirectFBRenderer dla CEGUI
@@ -360,12 +424,12 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %setup -q -a 1 -n cegui-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
 cd build
-%cmake \
-	../ \
+%cmake .. \
 	-DCEGUI_SAMPLES_ENABLED:BOOL=%{?with_samples:ON}%{!?with_samples:OFF} \
 	-DCEGUI_BUILD_RENDERER_OPENGL:BOOL=%{?with_opengl:ON}%{!?with_opengl:OFF} \
 	-DCEGUI_BUILD_RENDERER_OGRE:BOOL=%{?with_ogre:ON}%{!?with_ogre:OFF} \
@@ -392,15 +456,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	ImageCodec-Corona -p /sbin/ldconfig
-%postun	ImageCodec-Corona -p /sbin/ldconfig
-%post	ImageCodec-DevIL -p /sbin/ldconfig
-%postun	ImageCodec-DevIL -p /sbin/ldconfig
-%post	ImageCodec-FreeImage -p /sbin/ldconfig
-%postun	ImageCodec-FreeImage -p /sbin/ldconfig
-%post	ImageCodec-SILLY -p /sbin/ldconfig
-%postun	ImageCodec-SILLY -p /sbin/ldconfig
-
 %post	Renderer-Irrlicht -p /sbin/ldconfig
 %postun	Renderer-Irrlicht -p /sbin/ldconfig
 %post	Renderer-Ogre -p /sbin/ldconfig
@@ -422,12 +477,8 @@ rm -rf $RPM_BUILD_ROOT
 # plugins
 %dir %{_libdir}/cegui-0.8
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUICoreWindowRendererSet.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIExpatParser.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUILibXMLParser.so
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUISTBImageCodec.so
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUITGAImageCodec.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUITinyXMLParser.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIXercesParser.so
 
 %files docs
 %defattr(644,root,root,755)
@@ -490,6 +541,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/cegui-0/%{name}/ImageCodecModules/SILLY
 
+%files Parser-Expat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIExpatParser.so
+
+%files Parser-LibXML
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUILibXMLParser.so
+
+%files Parser-RapidXML
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIRapidXMLParser.so
+
+%files Parser-TinyXML
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUITinyXMLParser.so
+
+%files Parser-Xerces
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIXercesParser.so
+
 %files Renderer-DirectFB
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCEGUIDirectFBRenderer-0.so.*.*.*
diff --git a/CEGUI-glfw3.patch b/CEGUI-glfw3.patch
new file mode 100644
index 0000000..cf6d4a7
--- /dev/null
+++ b/CEGUI-glfw3.patch
@@ -0,0 +1,11 @@
+--- cegui-0.8.2/cmake/FindGLFW.cmake.orig	2013-06-12 10:06:54.000000000 +0200
++++ cegui-0.8.2/cmake/FindGLFW.cmake	2013-07-21 08:02:52.345531795 +0200
+@@ -3,7 +3,7 @@
+ ################################################################################
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(GLFW_H_PATH NAMES GL/glfw.h glfw.h)
++find_path(GLFW_H_PATH NAMES GLFW/glfw3.h GL/glfw.h glfw.h)
+ find_library(GLFW_LIB NAMES glfw PATH_SUFFIXES dynamic)
+ find_library(GLFW_LIB_DBG NAMES glfw_d PATH_SUFFIXES dynamic)
+ mark_as_advanced(GLFW_H_PATH GLFW_LIB GLFW_LIB_DBG)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/CEGUI.git/commitdiff/9584aa94ef66bc5dcd0bcd11b1ed59950099e75d



More information about the pld-cvs-commit mailing list