From 3ab7f04dc772c41ebc967af798e882dbb429fa03 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Mon, 31 May 2010 09:03:07 +0000
Subject: [PATCH] - fix #575885, #575885 - suppress the "Unknown X event type"
 warnings

---
 freeglut-2.6.0-fixld.patch   |  2 +-
 freeglut-2.6.0-noxwarn.patch | 14 ++++++++++++++
 freeglut.spec                | 10 +++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 freeglut-2.6.0-noxwarn.patch

diff --git a/freeglut-2.6.0-fixld.patch b/freeglut-2.6.0-fixld.patch
index 00e44f4..1a153c7 100644
--- a/freeglut-2.6.0-fixld.patch
+++ b/freeglut-2.6.0-fixld.patch
@@ -42,7 +42,7 @@ diff -up freeglut-2.6.0/progs/demos/Lorenz/Makefile.in.fixld freeglut-2.6.0/prog
  LIBOBJS = @LIBOBJS@
  LIBRARY = @LIBRARY@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lGL
++LIBS = @LIBS@ -lGL -lm
  LIBTOOL = @LIBTOOL@
  LIBTOOL_DEPS = @LIBTOOL_DEPS@
  LIBXI = @LIBXI@
diff --git a/freeglut-2.6.0-noxwarn.patch b/freeglut-2.6.0-noxwarn.patch
new file mode 100644
index 0000000..3c9f973
--- /dev/null
+++ b/freeglut-2.6.0-noxwarn.patch
@@ -0,0 +1,14 @@
+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;
+         }
+     }
diff --git a/freeglut.spec b/freeglut.spec
index cbc3623..fd01a6a 100644
--- a/freeglut.spec
+++ b/freeglut.spec
@@ -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@redhat.com> 2.6.0-5
+- fix #575885, #575885 - suppress the "Unknown X event type" warnings
+
+* Fri May  7 2010 Josh Boyer <jwboyer@gmail.com> 2.6.0-4
+- Add -lm to fix ppc build
+
 * Mon Feb 15 2010 Tomas Smetana <tsmetana@redhat.com> 2.6.0-3
 - the patch for #565178 was incomplete