Accepting request 330918 from X11:XOrg

1

OBS-URL: https://build.opensuse.org/request/show/330918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=250

Mesa.changes

@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Sep 14 15:40:22 UTC 2015 - jslaby@suse.com
+
+- add n_i965-Remove-early-release-of-DRI2-miptree.patch (bnc#945444)
+
+-------------------------------------------------------------------
+Mon Sep 14 07:49:02 UTC 2015 - sndirsch@suse.com
+
+- marked Mesa.keyring and mesa-11.0.0.tar.xz.sig as source in 
+  specfile in order to make factory checkin policy happy
+
+-------------------------------------------------------------------
+Sat Sep 12 15:36:35 UTC 2015 - mimi.vx@gmail.com
+
+- Update to version 11.0.0
+*  Mesa 11.0 brings core Mesa support for OpenGL 4.2, RadeonSI and Nouveau NVC0 
+  OpenGL 4.1 support (the other hardware drivers remain at OpenGL 3.3), AMDGPU 
+  kernel driver support along with initial R9 Fury/Fiji support, EGL 1.5 support, 
+  ongoing OpenGL ES 3.1 work, OpenCL compute image support, HEVC video decode 
+  support for RadeonSI via VDPAU, OpenGL ES 3.0 for Freedreno, and many fixes. 
++ drop U_mesa-llvm37-rename-r600-to-amdgpu.patch and U_mesa-llvm37.patch 
+
+-------------------------------------------------------------------
+Fri Sep 11 18:00:38 UTC 2015 - mimi.vx@gmail.com
+
+- Update to version 10.6.7
++ add gpg verification of source package
+* fdo#90751 Revert "i965: Momentarily pretend to support 
+  ARB_texture_stencil8 for blits."
+* mesa/teximage: use correct extension for accept stencil texture.
+
 -------------------------------------------------------------------
 Mon Sep  7 08:33:46 UTC 2015 - zaitor@opensuse.org
 

Mesa.keyring

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+Omj3BC4KcQ==
+=XQbm
+-----END PGP PUBLIC KEY BLOCK-----

Mesa.spec

@@ -18,7 +18,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 10.6.6
+%define _version 11.0.0
 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
 %define gallium_loader 1
 %else
@@ -37,29 +37,30 @@
 %define with_nine 1
 %endif
 Name:           Mesa
-Version:        10.6.6
+Version:        11.0.0
 Release:        0
 Summary:        System for rendering interactive 3-D graphics
 License:        MIT
 Group:          System/Libraries
 Url:            http://www.mesa3d.org
 Source:         ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}.tar.xz
+Source1:        ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}.tar.xz.sig
 Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
 Source6:        %{name}-rpmlintrc
+Source7:        Mesa.keyring
 # required for building against wayland of openSUSE 13.1
 Patch0:         n_Fixed-build-against-wayland-1.2.1.patch
+# should be replaced by real patch in X+Mesa+Intel ddx
+# this is only a workaround
+Patch1:         n_i965-Remove-early-release-of-DRI2-miptree.patch
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # Patch from Fedora, fix 16bpp in llvmpipe
 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
-# Upstream commit to fix build with llvm 3.7
-Patch16:        U_mesa-llvm37.patch   
-# Upstream commit to fix build with llvm 3.7
-Patch17:        U_mesa-llvm37-rename-r600-to-amdgpu.patch
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -76,8 +77,9 @@ BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(dri3proto)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(glproto)
-BuildRequires:  pkgconfig(libdrm) >= 2.4.38
+BuildRequires:  pkgconfig(libdrm) >= 2.4.60
-BuildRequires:  pkgconfig(libdrm_nouveau) >= 2.4.41
+BuildRequires:  pkgconfig(libdrm_amdgpu) >= 2.4.63
+BuildRequires:  pkgconfig(libdrm_nouveau) >= 2.4.62
 BuildRequires:  pkgconfig(libdrm_radeon) >= 2.4.56
 BuildRequires:  pkgconfig(libkms) >= 1.0.0
 BuildRequires:  pkgconfig(libudev) > 151
@@ -109,11 +111,11 @@ Obsoletes:      Mesa-nouveau3d < %{version}
 Obsoletes:      xorg-x11-Mesa < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %ifarch %arm
-BuildRequires:  pkgconfig(libdrm_freedreno) >= 2.4.57
+BuildRequires:  pkgconfig(libdrm_freedreno) >= 2.4.64
 %endif
 %ifarch x86_64 %ix86
 BuildRequires:  libelf-devel
-BuildRequires:  pkgconfig(libdrm_intel) >= 2.4.60
+BuildRequires:  pkgconfig(libdrm_intel) >= 2.4.61
 %endif
 %if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(wayland-client)
@@ -519,8 +521,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 # required for building against wayland of openSUSE 13.1
 %patch0 -p1
 %endif
-%patch16 -p1
+%patch1 -p1
-%patch17 -p1
 ### disabled, but not dropped yet; these still need investigation in
 ### order to figure out whether the issue is still reproducable and
 ### hence a fix is required

U_mesa-llvm37-rename-r600-to-amdgpu.patch

@@ -1,71 +0,0 @@
-From patchwork Fri Jun 12 00:36:45 2015
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [Mesa-dev] radeon/llvm: Handle LLVM backend rename from R600 to AMDGPU
-From: Tom Stellard <thomas.stellard@amd.com>
-X-Patchwork-Id: 51706
-Message-Id: <1434069405-11033-1-git-send-email-thomas.stellard@amd.com>
-To: <mesa-dev@lists.freedesktop.org>
-Cc: Tom Stellard <thomas.stellard@amd.com>
-Date: Fri, 12 Jun 2015 00:36:45 +0000
-
----
- configure.ac                                  | 13 ++++++++-----
- src/gallium/drivers/radeon/radeon_llvm_emit.c |  8 ++++++++
- 2 files changed, 16 insertions(+), 5 deletions(-)
-Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-
-
-diff --git a/configure.ac b/configure.ac
-index d32aa24..eda8d23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2048,16 +2048,19 @@ require_egl_drm() {
- }
- 
- radeon_llvm_check() {
-+    if test ${LLVM_VERSION_INT} -lt 307; then
-+        amdgpu_llvm_target_name='r600'
-+    else
-+        amdgpu_llvm_target_name='amdgpu'
-+    fi
-     if test "x$enable_gallium_llvm" != "xyes"; then
-         AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
-     fi
-     llvm_check_version_for "3" "4" "2" $1 
--    if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then
--        AC_MSG_ERROR([LLVM R600 Target not enabled.  You can enable it when building the LLVM
--                      sources with the --enable-experimental-targets=R600
--                      configure flag])
-+    if test true && $LLVM_CONFIG --targets-built | grep -iqvw $amdgpu_llvm_target_name ; then
-+        AC_MSG_ERROR([LLVM $amdgpu_llvm_target_name not enabled in your LLVM build.])
-     fi
--    LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo"
-+    LLVM_COMPONENTS="${LLVM_COMPONENTS} $amdgpu_llvm_target_name bitreader ipo"
-     NEED_RADEON_LLVM=yes
-     if test "x$have_libelf" != xyes; then
-        AC_MSG_ERROR([$1 requires libelf when using llvm])
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.c b/src/gallium/drivers/radeon/radeon_llvm_emit.c
-index 624077c..25580b6 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.c
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.c
-@@ -86,10 +86,18 @@ static void init_r600_target()
- {
- 	static unsigned initialized = 0;
- 	if (!initialized) {
-+#if HAVE_LLVM < 0x0307
- 		LLVMInitializeR600TargetInfo();
- 		LLVMInitializeR600Target();
- 		LLVMInitializeR600TargetMC();
- 		LLVMInitializeR600AsmPrinter();
-+#else
-+		LLVMInitializeAMDGPUTargetInfo();
-+		LLVMInitializeAMDGPUTarget();
-+		LLVMInitializeAMDGPUTargetMC();
-+		LLVMInitializeAMDGPUAsmPrinter();
-+
-+#endif
- 		initialized = 1;
- 	}
- }

U_mesa-llvm37.patch

@@ -1,45 +0,0 @@
-From 147ffd48166d851341cadd12de98895f32ec25a2 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee@freedesktop.org>
-Date: Tue, 26 May 2015 22:18:28 -0700
-Subject: gallivm: Do not use NoFramePointerElim with LLVM 3.7.
-
-TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244
-"Remove NoFramePointerElim and NoFramePointerElimOverride from
-TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC."
-
-Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index be3e834..76c302f 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -277,8 +277,10 @@ disassemble(const void* func, llvm::raw_ostream & Out)
-    options.StackAlignmentOverride = 4;
- #endif
- #if defined(DEBUG) || defined(PROFILE)
-+#if HAVE_LLVM < 0x0307
-    options.NoFramePointerElim = true;
- #endif
-+#endif
-    OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options));
- 
-    /*
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 5e8a634..ffed9e6 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -439,8 +439,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
- #if HAVE_LLVM < 0x0304
-    options.NoFramePointerElimNonLeaf = true;
- #endif
-+#if HAVE_LLVM < 0x0307
-    options.NoFramePointerElim = true;
- #endif
-+#endif
- 
-    builder.setEngineKind(EngineKind::JIT)
-           .setErrorStr(&Error)
--- 
-cgit v0.10.2
-

mesa-10.6.6.tar.xz

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

mesa-11.0.0.tar.xz

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

n_i965-Remove-early-release-of-DRI2-miptree.patch

@@ -0,0 +1,30 @@
+From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 10 Jul 2015 10:41:35 +0100
+Subject: i965: Remove early release of DRI2 miptree
+References: bfo#86281 bko#349519
+
+intel_update_winsys_renderbuffer_miptree() will release the existing
+miptree when wrapping a new DRI2 buffer, so we can remove the early
+release and so prevent a NULL mt dereference should importing the new
+DRI2 name fail for any reason. (Reusing the old DRI2 name will result
+in the rendering going astray, to a stale buffer, and not shown on the
+screen, but it allows us to issue a warning and not crash much later in
+innocent code.)
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+---
+ src/mesa/drivers/dri/i965/brw_context.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -1417,7 +1417,6 @@ intel_process_dri2_buffer(struct brw_con
+               buffer->cpp, buffer->pitch);
+    }
+ 
+-   intel_miptree_release(&rb->mt);
+    bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
+                                           buffer->name);
+    if (!bo) {