SHA256
1
0
forked from pool/Mesa

Accepting request 246335 from X11:XOrg

- Update to version 10.3.0-RC1
  * Mesa 10.3 brings many performance improvements, more 
    OpenGL 4.x functionality, the VC4 Gallium3D driver, 
    and much more.
  * supersedes U_mesa-glx-Reduce-error-log-level.patch

- Package vdpau_r600 for ppc64le as well (bnc#893275) 

- u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
  Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
  (bnc#892896)

OBS-URL: https://build.opensuse.org/request/show/246335
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=221
This commit is contained in:
Stephan Kulow 2014-09-01 14:58:40 +00:00 committed by Git OBS Bridge
commit 6daae5dfa3
6 changed files with 64 additions and 44 deletions

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Aug 25 10:34:26 UTC 2014 - sndirsch@suse.com
- Update to version 10.3.0-RC1
* Mesa 10.3 brings many performance improvements, more
OpenGL 4.x functionality, the VC4 Gallium3D driver,
and much more.
* supersedes U_mesa-glx-Reduce-error-log-level.patch
-------------------------------------------------------------------
Sun Aug 24 12:59:50 UTC 2014 - dvlaeev@suse.com
- Package vdpau_r600 for ppc64le as well (bnc#893275)
-------------------------------------------------------------------
Fri Aug 22 13:46:54 UTC 2014 - sndirsch@suse.com
- u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
(bnc#892896)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 15 12:31:54 UTC 2014 - sndirsch@suse.com Fri Aug 15 12:31:54 UTC 2014 - sndirsch@suse.com

View File

@ -29,7 +29,7 @@
%else %else
%define gallium_loader 0 %define gallium_loader 0
%endif %endif
%ifarch %ix86 x86_64 %arm ppc64 %ifarch %ix86 x86_64 %arm ppc64 ppc64le
%define vdpau_r600 1 %define vdpau_r600 1
%else %else
%define vdpau_r600 0 %define vdpau_r600 0
@ -58,10 +58,10 @@
%endif %endif
%define _name_archive MesaLib %define _name_archive MesaLib
%define _version 10.2.5 %define _version 10.3.0-rc1
Name: Mesa Name: Mesa
Version: 10.2.5 Version: 10.3.0
Release: 0 Release: 0
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
@ -149,7 +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 Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe # Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch Patch15: u_mesa-8.0-llvmpipe-shmget.patch
Patch16: U_mesa-glx-Reduce-error-log-level.patch Patch17: u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -515,7 +515,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1 #%patch15 -p1
#%patch13 -p1 #%patch13 -p1
### ###
%patch16 -p1 %patch17 -p1
%build %build
rm -f src/mesa/depend rm -f src/mesa/depend
@ -793,12 +793,14 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libXvMCnouveau.so %_libdir/libXvMCnouveau.so
%_libdir/libXvMCnouveau.so.1 %_libdir/libXvMCnouveau.so.1
%_libdir/libXvMCnouveau.so.1.0
%_libdir/libXvMCnouveau.so.1.0.0 %_libdir/libXvMCnouveau.so.1.0.0
%files -n libXvMC_r600 %files -n libXvMC_r600
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libXvMCr600.so %_libdir/libXvMCr600.so
%_libdir/libXvMCr600.so.1 %_libdir/libXvMCr600.so.1
%_libdir/libXvMCr600.so.1.0
%_libdir/libXvMCr600.so.1.0.0 %_libdir/libXvMCr600.so.1.0.0
%endif %endif
@ -807,6 +809,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/vdpau/libvdpau_nouveau.so %_libdir/vdpau/libvdpau_nouveau.so
%_libdir/vdpau/libvdpau_nouveau.so.1 %_libdir/vdpau/libvdpau_nouveau.so.1
%_libdir/vdpau/libvdpau_nouveau.so.1.0
%_libdir/vdpau/libvdpau_nouveau.so.1.0.0 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0
%endif %endif
@ -815,6 +818,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/vdpau/libvdpau_r600.so %_libdir/vdpau/libvdpau_r600.so
%_libdir/vdpau/libvdpau_r600.so.1 %_libdir/vdpau/libvdpau_r600.so.1
%_libdir/vdpau/libvdpau_r600.so.1.0
%_libdir/vdpau/libvdpau_r600.so.1.0.0 %_libdir/vdpau/libvdpau_r600.so.1.0.0
%endif %endif
@ -823,6 +827,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/vdpau/libvdpau_radeonsi.so %_libdir/vdpau/libvdpau_radeonsi.so
%_libdir/vdpau/libvdpau_radeonsi.so.1 %_libdir/vdpau/libvdpau_radeonsi.so.1
%_libdir/vdpau/libvdpau_radeonsi.so.1.0
%_libdir/vdpau/libvdpau_radeonsi.so.1.0.0 %_libdir/vdpau/libvdpau_radeonsi.so.1.0.0
%endif %endif

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4459f0bf7f4a3c8fb78ece3c9d2eac3d0e5bf38cb470f2a72705e744bd0310d
size 7127880

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db7b12e65db2443335dceec9c6076b6643ea0ebe93edbb89b0cfa22b2812d5e0
size 7318097

View File

@ -1,36 +0,0 @@
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

View File

@ -0,0 +1,30 @@
From f69eca0843142d16c81cc3efd02fc50cf219cafd Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Fri, 22 Aug 2014 14:35:06 +0200
Subject: [PATCH] Suppress any "libGL:..." warnings when LIBGL_DEBUG == "quiet"
(bnc#892896)
Let's handle LIBGL_DEBUG env. variable in Mesa in a consistent way.
---
src/mesa/drivers/dri/common/xmlconfig.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index ce37647..8e48522 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -429,8 +429,10 @@ static void
__driUtilMessage(const char *f, ...)
{
va_list args;
+ const char *libgl_debug;
- if (getenv("LIBGL_DEBUG")) {
+ libgl_debug=getenv("LIBGL_DEBUG");
+ if (libgl_debug && !strstr(libgl_debug, "quiet")) {
fprintf(stderr, "libGL: ");
va_start(args, f);
vfprintf(stderr, f, args);
--
1.8.4.5