Accepting request 265159 from home:tobijk:X11:XOrg

- Update to version 10.4.0 (10.4 Final):
- New features:
  + GL_ARB_conditional_render_inverted on nv50
  + GL_ARB_sample_shading on r600
  + GL_ARB_texture_view on nv50, nvc0
  + GL_ARB_clip_control on nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe
  + GL_KHR_context_flush_control on all drivers
- Changes:
  + Removed patch17: u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
    This patch was upstreamed
  + Build without "--enable-gallium-egl"
    This buildoption was removed upstream
  + Add subpackage libvdpau_r300

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

Mesa.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Dec 14 15:41:33 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 10.4.0 (10.4 Final):
+- New features:
+  + GL_ARB_conditional_render_inverted on nv50
+  + GL_ARB_sample_shading on r600
+  + GL_ARB_texture_view on nv50, nvc0
+  + GL_ARB_clip_control on nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe
+  + GL_KHR_context_flush_control on all drivers
+- Changes:
+  + Removed patch17: u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
+    This patch was upstreamed
+  + Build without "--enable-gallium-egl"
+    This buildoption was removed upstream
+  + Add subpackage libvdpau_r300
+
 -------------------------------------------------------------------
 Sun Nov 16 11:24:04 UTC 2014 - afaerber@suse.de
 

Mesa.spec

@@ -17,22 +17,15 @@
 
 
 %define glamor 1
-# --enable-gallium-egl requires non-empty --with-gallium-drivers (default
-# is r300,r600,svga,swrast)
-%ifnarch s390 s390x aarch64 m68k
-%define egl_gallium 1
-%else
-%define egl_gallium 0
-%endif
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
 %define gallium_loader 1
 %else
 %define gallium_loader 0
 %endif
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le
-%define vdpau_r600 1
+%define vdpau_radeon 1
 %else
-%define vdpau_r600 0
+%define vdpau_radeon 0
 %endif
 %ifarch %ix86 x86_64
 %define llvm_r600 1
@@ -51,10 +44,10 @@
 %endif
 
 %define _name_archive MesaLib
-%define _version 10.3.3
+%define _version 10.4.0
 
 Name:           Mesa
-Version:        10.3.3
+Version:        10.4.0
 Release:        0
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -142,7 +135,6 @@ 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
-Patch17:        u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch
 Patch18:        u_be_assert_include.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -495,6 +487,14 @@ Supplements:    xf86-video-nouveau
 %description -n libvdpau_nouveau
 This package contains the VDPAU state tracker for Nouveau. 
 
+%package -n libvdpau_r300
+Summary:        XVMC state tracker for R300
+Group:          System/Libraries
+Supplements:    xf86-video-ati
+
+%description -n libvdpau_r300
+This package contains the VDPAU state tracker for R300. 
+
 %package -n libvdpau_r600
 Summary:        XVMC state tracker for R600
 Group:          System/Libraries
@@ -522,7 +522,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch15 -p1
 #%patch13 -p1
 ###
-%patch17 -p1
 %patch18 -p1
 
 %build
@@ -547,9 +546,6 @@ autoreconf -fi
            --enable-gbm \
            --enable-glx-tls \
 %endif
-%if %egl_gallium
-           --enable-gallium-egl \
-%endif
 %if 0%{?suse_version} < 1315
            --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
 %else
@@ -661,7 +657,10 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %postun -n libXvMC_r600
 %endif
 
-%if %vdpau_r600
+%if %vdpau_radeon
+%post   -n libvdpau_r300
+%postun -n libvdpau_r300
+
 %post   -n libvdpau_r600
 %postun -n libvdpau_r600
 %endif
@@ -684,10 +683,6 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %doc docs/README* docs/COPYING
 %config /etc/drirc
 %{_libdir}/dri/
-%if %egl_gallium
-%dir %_libdir/egl/
-%_libdir/egl/egl_gallium.so
-%endif
 #%if %gallium_loader
 #%dir %_libdir/gallium-pipe/
 #%_libdir/gallium-pipe/pipe_*.so
@@ -768,10 +763,6 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %files -n libgbm1
 %defattr(-,root,root)
 %_libdir/libgbm.so.1*
-%if %egl_gallium
-%dir %_libdir/gbm/
-%_libdir/gbm/gbm_gallium_drm.so
-%endif
 
 %files -n libgbm-devel
 %defattr(-,root,root)
@@ -816,7 +807,14 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0
 %endif
 
-%if %vdpau_r600
+%if %vdpau_radeon
+%files -n libvdpau_r300
+%defattr(-,root,root)
+%_libdir/vdpau/libvdpau_r300.so
+%_libdir/vdpau/libvdpau_r300.so.1
+%_libdir/vdpau/libvdpau_r300.so.1.0
+%_libdir/vdpau/libvdpau_r300.so.1.0.0
+
 %files -n libvdpau_r600
 %defattr(-,root,root)
 %_libdir/vdpau/libvdpau_r600.so

MesaLib-10.3.3.tar.bz2

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

MesaLib-10.4.0.tar.bz2

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

baselibs.conf

@@ -53,5 +53,6 @@ Mesa-libglapi-devel
 libXvMC_nouveau
 libXvMC_r600
 libvdpau_nouveau
+libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi

u_Suppress-any-libGL-.-warnings-when-LIBGL_DEBUG-is-se.patch

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