packages: xlockmore/xlockmore.spec, xlockmore/xlockmore-ftgl.patch (NEW) - ...

[draenog]

Author: draenog                      Date: Sat Oct 24 02:48:26 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix compiling with ftgl

---- Files affected:
packages/xlockmore:
   xlockmore.spec (1.62 -> 1.63) , xlockmore-ftgl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xlockmore/xlockmore.spec
diff -u packages/xlockmore/xlockmore.spec:1.62 packages/xlockmore/xlockmore.spec:1.63
--- packages/xlockmore/xlockmore.spec:1.62	Sat Oct 24 02:43:14 2009
+++ packages/xlockmore/xlockmore.spec	Sat Oct 24 04:48:21 2009
@@ -26,8 +26,10 @@
 Patch0:		%{name}-sounds_path.patch
 Patch1:		%{name}-vtlock.patch
 Patch2:		%{name}-makefile.patch
+Patch3:		%{name}-ftgl.patch
 URL:		http://www.tux.org/~bagleyd/xlockmore.html
 %{?with_opengl:BuildRequires:	OpenGL-devel}
+%{?with_opengl:BuildRequires:	ftgl-devel}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXmu-devel
@@ -106,6 +108,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3
 
 %build
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fno-implicit-templates"
@@ -163,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2009/10/24 02:48:21  draenog
+- fix compiling with ftgl
+
 Revision 1.62  2009/10/24 00:43:14  draenog
 - correct exit code when compilation fails
 

================================================================
Index: packages/xlockmore/xlockmore-ftgl.patch
diff -u /dev/null packages/xlockmore/xlockmore-ftgl.patch:1.1
--- /dev/null	Sat Oct 24 04:48:26 2009
+++ packages/xlockmore/xlockmore-ftgl.patch	Sat Oct 24 04:48:21 2009
@@ -0,0 +1,12 @@
+--- configure.in.orig	2009-10-24 03:09:27.388568403 +0100
++++ configure.in	2009-10-24 03:09:12.000000000 +0100
+@@ -1803,6 +1803,9 @@
+ fi
+ if test "x$ftgl_includes" != x && test "x$ftgl_includes" != xNONE ; then
+   XLOCKINC="${XLOCKINC} -I$ftgl_includes"
++  if test -r "$ftgl_includes/FTGL/ftgl.h"; then
++    AC_DEFINE(FTGL213)
++  fi
+ fi
+ 
+ freetype=no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xlockmore/xlockmore.spec?r1=1.62&r2=1.63&f=u