From 36311fa71685499d6dff76bef0fea6ef282305617ade8a9143ba416fb99dfa0a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 12 Aug 2007 09:38:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=23 --- Mesa.changes | 6 ++++++ Mesa.spec | 7 ++++++- disable-libGL-warning.diff | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 disable-libGL-warning.diff diff --git a/Mesa.changes b/Mesa.changes index 9f84c73..6c13b9b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 12 10:59:23 CEST 2007 - sndirsch@suse.de + +- disable-libGL-warning.diff: + * ignore unsupported visual 0x4b (Bug #247471, X.Org Bug #6689) + ------------------------------------------------------------------- Sat Aug 4 05:54:46 CEST 2007 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 0797d3c..0b9f5e2 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -19,7 +19,7 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 7.0.1 -Release: 1 +Release: 4 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: MesaLib-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Source6: via.sh Patch0: disable-sis_dri.diff Patch1: dri_driver_dir.diff Patch2: i915-crossbar.diff +Patch3: disable-libGL-warning.diff Patch4: libIndirectGL.diff Patch5: static.diff Patch6: link-shared.diff @@ -118,6 +119,7 @@ rm -rf src/glw/ %patch0 %patch1 %patch2 +%patch3 %patch5 %ifarch %ix86 x86_64 ppc %patch6 @@ -274,6 +276,9 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libMesaGL.a %changelog +* Sun Aug 12 2007 - sndirsch@suse.de +- disable-libGL-warning.diff: + * ignore unsupported visual 0x4b (Bug #247471, X.Org Bug #6689) * Sat Aug 04 2007 - sndirsch@suse.de - updated to bugfix relelase 7.0.1 * Wed Jul 04 2007 - sndirsch@suse.de diff --git a/disable-libGL-warning.diff b/disable-libGL-warning.diff new file mode 100644 index 0000000..de6eabf --- /dev/null +++ b/disable-libGL-warning.diff @@ -0,0 +1,16 @@ +--- src/glx/x11/glxext.c.orig 2007-08-12 10:45:15.688553249 +0200 ++++ src/glx/x11/glxext.c 2007-08-12 10:55:49.810243457 +0200 +@@ -672,8 +672,11 @@ filter_modes( __GLcontextModes ** server + if ( do_delete && (m->visualID != 0) ) { + do_delete = GL_FALSE; + +- fprintf(stderr, "libGL warning: 3D driver claims to not support " +- "visual 0x%02x\n", m->visualID); ++ /* don't warn for this visual (Novell #247471 / X.Org #6689) */ ++ if (m->visualID != 0x4b) { ++ fprintf(stderr, "libGL warning: 3D driver claims to not " ++ "support visual 0x%02x\n", m->visualID); ++ } + } + + if ( do_delete ) {