rpms/freeglut/devel freeglut-2.6.0-noxwarn.patch, NONE, 1.1 freeglut-2.6.0-fixld.patch, 1.2, 1.3 freeglut.spec, 1.14, 1.15

[Tomas Smetana]

Author: tsmetana

Update of /cvs/pkgs/rpms/freeglut/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6338

Modified Files:
	freeglut-2.6.0-fixld.patch freeglut.spec 
Added Files:
	freeglut-2.6.0-noxwarn.patch 
Log Message:
* Mon May 31 2010 Tomas Smetana <tsmetana at redhat.com> 2.6.0-5
- fix #575885, #575885 - suppress the "Unknown X event type" warnings


freeglut-2.6.0-noxwarn.patch:
 freeglut_main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE freeglut-2.6.0-noxwarn.patch ---
diff -up freeglut-2.6.0/src/freeglut_main.c.noxwarn freeglut-2.6.0/src/freeglut_main.c
--- freeglut-2.6.0/src/freeglut_main.c.noxwarn	2010-05-31 10:49:29.002037712 +0200
+++ freeglut-2.6.0/src/freeglut_main.c	2010-05-31 10:50:58.986037800 +0200
@@ -1413,7 +1413,9 @@ void FGAPIENTRY glutMainLoopEvent( void 
             break;
 
         default:
-            fgWarning ("Unknown X event type: %d\n", event.type);
+            /* Fedora patch: the unknown events seem to be quite frequent with
+             * the new xorg. Let's not spam the user with the messages */
+            /* fgWarning ("Unknown X event type: %d\n", event.type); */
             break;
         }
     }

freeglut-2.6.0-fixld.patch:
 CallbackMaker/Makefile.in   |    2 +-
 Fractals/Makefile.in        |    2 +-
 Fractals_random/Makefile.in |    2 +-
 Lorenz/Makefile.in          |    2 +-
 One/Makefile.in             |    2 +-
 shapes/Makefile.in          |    2 +-
 smooth_opengl3/Makefile.in  |    2 +-
 spaceball/Makefile.in       |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

Index: freeglut-2.6.0-fixld.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freeglut/devel/freeglut-2.6.0-fixld.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- freeglut-2.6.0-fixld.patch	15 Feb 2010 16:24:05 -0000	1.2
+++ freeglut-2.6.0-fixld.patch	31 May 2010 09:03:06 -0000	1.3
@@ -42,7 +42,7 @@ diff -up freeglut-2.6.0/progs/demos/Lore
  LIBOBJS = @LIBOBJS@
  LIBRARY = @LIBRARY@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lGL
++LIBS = @LIBS@ -lGL -lm
  LIBTOOL = @LIBTOOL@
  LIBTOOL_DEPS = @LIBTOOL_DEPS@
  LIBXI = @LIBXI@


Index: freeglut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- freeglut.spec	15 Feb 2010 16:24:05 -0000	1.14
+++ freeglut.spec	31 May 2010 09:03:07 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:        A freely licensed alternative to the GLUT library
 Name:           freeglut
 Version:        2.6.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 URL:            http://freeglut.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # For the manpages
@@ -22,6 +22,7 @@ Obsoletes:      glut < 3.7
 # Fix linking of the examples -- we don't package them, they just need to
 # compile and link
 Patch0: freeglut-2.6.0-fixld.patch
+Patch1: freeglut-2.6.0-noxwarn.patch
 
 %description
 freeglut is a completely open source alternative to the OpenGL Utility Toolkit
@@ -53,6 +54,7 @@ license.
 %prep
 %setup -q -a 1
 %patch0 -p1 -b .fixld
+%patch1 -p1 -b .noxwarn
 
 %build
 # --disable-warnings -> don't add -Werror to CFLAGS
@@ -91,6 +93,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 31 2010 Tomas Smetana <tsmetana at redhat.com> 2.6.0-5
+- fix #575885, #575885 - suppress the "Unknown X event type" warnings
+
+* Fri May  7 2010 Josh Boyer <jwboyer at gmail.com> 2.6.0-4
+- Add -lm to fix ppc build
+
 * Mon Feb 15 2010 Tomas Smetana <tsmetana at redhat.com> 2.6.0-3
 - the patch for #565178 was incomplete