Accepting request 242936 from home:tiwai:branches:X11:XOrg

- Reduce error log level for annoying dlopen messages (bnc#889391)
  U_mesa-glx-Reduce-error-log-level.patch

OBS-URL: https://build.opensuse.org/request/show/242936
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=387

Mesa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 29 16:58:23 CEST 2014 - tiwai@suse.de
+
+- Reduce error log level for annoying dlopen messages (bnc#889391)
+  U_mesa-glx-Reduce-error-log-level.patch
+
 -------------------------------------------------------------------
 Mon Jul 21 14:10:26 UTC 2014 - sndirsch@suse.com
 

Mesa.spec

@@ -149,6 +149,7 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
+Patch16:        U_mesa-glx-Reduce-error-log-level.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -514,6 +515,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 ###
+%patch16 -p1
 
 %build
 rm -f src/mesa/depend

U_mesa-glx-Reduce-error-log-level.patch

@@ -0,0 +1,36 @@
+From 0406f59eebb77e537b50f5cac3a20355686d2a4d Mon Sep 17 00:00:00 2001
+From: Courtney Goeltzenleuchter <courtney@LunarG.com>
+Date: Wed, 26 Feb 2014 14:27:08 -0700
+Subject: [PATCH] mesa: glx: Reduce error log level
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The code that parses LIBGL_DRIVERS_PATH was printing an
+error for every attempted dlopen. It's not an error to
+have to check multiple items in the path, only an error if
+no suitable library is found. Reduced the load error to
+a warning to match behavior of dynamic linker.
+
+Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com>
+Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+---
+ src/glx/dri_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
+index 8bf47054a325..63c8de38c7c3 100644
+--- a/src/glx/dri_common.c
++++ b/src/glx/dri_common.c
+@@ -140,7 +140,7 @@ driOpenDriver(const char *driverName)
+       if (handle != NULL)
+          break;
+       else
+-         ErrorMessageF("dlopen %s failed (%s)\n", realDriverName, dlerror());
++         InfoMessageF("dlopen %s failed (%s)\n", realDriverName, dlerror());
+    }
+ 
+    if (!handle)
+-- 
+2.0.1
+