Update to 20.0.2

Update to 20.0.1
Fix the build with llvm 10
2020-03-19 13:29:41 +00:00 · 2020-03-06 09:34:14 +00:00 · 2020-02-26 17:12:18 +01:00 · 2020-02-20 10:37:35 +00:00 · 2020-02-14 20:43:28 +00:00 · 2020-02-08 20:15:27 +00:00
16 changed files with 1610 additions and 829 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,28 +1,8 @@
 *.jx
-mesa-20100208.tar.bz2
-gl-manpages-1.0.1.tar.bz2
-xdriinfo-1.0.3.tar.bz2
-mesa-demos-20100529.tar.bz2
-mesa-20100529.tar.bz2
-mesa-20100612.tar.bz2
-mesa-20100709.tar.bz2
-mesa-20100720.tar.bz2
-/mesa-20100824.tar.bz2
-/mesa-20101020.tar.bz2
-/mesa-20101108.tar.bz2
-/mesa-20101118.tar.bz2
-/mesa-20101129.tar.bz2
-/mesa-20101214.tar.xz
-/mesa-20101216.tar.xz
-/mesa-20110107.tar.xz
-/mesa-20110315.tar.xz
-/mesa-20110327.tar.xz
-/MesaLib-7.10.1.tar.bz2
-/mesa-20110327.tar.xz
-/mesa-20110330.tar.xz
-/mesa-20110401.tar.xz
-/mesa-20110412.tar.xz
-/mesa-20110620.tar.xz
-/mesa-20110730.tar.xz
-/MesaLib-7.11.tar.bz2
-/mesa-20111103.tar.xz
+*.src.rpm
+.build*
+/mesa-*.tar.bz2
+/mesa-*.tar.xz
+x86_64/
+results_mesa/
+mesa-*/
--- a/0001-Link-with-libclang-cpp.patch
+++ b/0001-Link-with-libclang-cpp.patch
@ -0,0 +1,37 @@
+From c9987fca1fa611e48f85644493edd8d5a30cf403 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 13 Dec 2019 17:42:17 +0000
+Subject: [PATCH] Link with libclang-cpp
+
+---
+ src/gallium/targets/opencl/meson.build | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
+index 907cc74337d..031d35b9716 100644
+--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
+@@ -43,19 +43,7 @@ libopencl = shared_library(
+   dependencies : [
+     idep_mesautil,
+     dep_clock, dep_dl, dep_unwind, dep_elf,
+-    cpp.find_library('clangCodeGen', dirs : llvm_libdir),
+-    cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
+-    cpp.find_library('clangFrontend', dirs : llvm_libdir),
+-    cpp.find_library('clangDriver', dirs : llvm_libdir),
+-    cpp.find_library('clangSerialization', dirs : llvm_libdir),
+-    cpp.find_library('clangParse', dirs : llvm_libdir),
+-    cpp.find_library('clangSema', dirs : llvm_libdir),
+-    cpp.find_library('clangAnalysis', dirs : llvm_libdir),
+-    cpp.find_library('clangAST', dirs : llvm_libdir),
+-    cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
+-    cpp.find_library('clangEdit', dirs : llvm_libdir),
+-    cpp.find_library('clangLex', dirs : llvm_libdir),
+-    cpp.find_library('clangBasic', dirs : llvm_libdir),
+    cpp.find_library('clang-cpp', dirs : llvm_libdir),
+   ],
+   version : '@0@.0.0'.format(opencl_version),
+   install : true,
+-- 
+2.20.1
+
--- a/0001-nv50-fix-max-texture-levels.patch
+++ b/0001-nv50-fix-max-texture-levels.patch
@ -1,18 +0,0 @@
-diff -up Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c.jx Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c
--- Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c.jx	2011-07-08 21:37:09.000000000 -0400
-+++ Mesa-7.11/src/gallium/drivers/nv50/nv50_screen.c	2011-10-25 13:20:36.605408094 -0400
-@@ -76,11 +76,11 @@ nv50_screen_get_param(struct pipe_screen
-    case PIPE_CAP_MAX_COMBINED_SAMPLERS:
-       return 64;
-    case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
-      return 13;
-+      return 14;
-    case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
-      return 10;
-+      return 12;
-    case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
-      return 13;
-+      return 14;
-    case PIPE_CAP_ARRAY_TEXTURES: /* shader support missing */
-       return 0;
-    case PIPE_CAP_TEXTURE_MIRROR_CLAMP:
--- a/0003-evergreen-big-endian.patch
+++ b/0003-evergreen-big-endian.patch
@ -0,0 +1,26 @@
+From 0ec3bdb2264b491fd3f5dc4e638b4c12611ef219 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sun, 20 Mar 2016 13:27:45 +0100
+Subject: [PATCH 3/4] evergreen big endian
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ src/gallium/drivers/r600/r600_state_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
+index cac240e..4b620a1 100644
+--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
+@@ -2716,7 +2716,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
+ 
+ uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap)
+ {
+-	if (R600_BIG_ENDIAN) {
+	if (0 && R600_BIG_ENDIAN) {
+ 		switch(colorformat) {
+ 		/* 8-bit buffers. */
+ 		case V_0280A0_COLOR_4_4:
+-- 
+2.7.4
+
--- a/Mesa-MLAA-License-Clarification-Email.txt
+++ b/Mesa-MLAA-License-Clarification-Email.txt
@ -0,0 +1,117 @@
+
+Subject: RE: Question about Mesa MLAA license
+From: Jorge Jimenez <iryoku@gmail.com>
+Date: 01/08/2013 12:50 PM
+To: Tom Callaway <tcallawa@redhat.com>
+CC: "jorge@iryoku.com" <jorge@iryoku.com>
+
+Yes to both questions.
+ 
+Thanks,
+Jorge
+ 
+From: Tom Callaway <tcallawa@redhat.com>
+Sent: January 8, 2013 6:49 PM
+To: Jorge Jimenez <iryoku@gmail.com>
+CC: jorge@iryoku.com
+Subject: Re: Question about Mesa MLAA license
+ 
+On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
+> Hi Tom,
+>
+> What we meant with that is that we made an exception for clause 2.
+> Instead of clause 2, in the case of the Mesa project, you have to name
+> the technique Jimenez's MLAA in the config options of Mesa. We did that
+> just to allow them to solve license issues. This exception should be for
+> the Mesa project, and any project using Mesa, like Fedora.
+>
+> We want to widespread usage of our MLAA, so we want to avoid any kind of
+> license complications. Hope current one is good for Fedora, if not
+> please tell, and we'll see what we can do!
+
+Okay, a few more questions:
+
+* If Fedora decides to simply reproduce the quoted statement:
+"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
+Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
+
+Specifically, if this is done as part of documentation included with
+Mesa, is that sufficient to meet clause 2 even if the Mesa config option
+is not set as described in your exception?
+
+* Currently, the Mesa config option for MLAA says: "Morphological
+anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
+quality". Is this in compliance with your exception?
+
+Thanks again,
+
+~tom
+
+==
+Fedora Project
+
+Subject: RE: Question about Mesa MLAA license
+From: Jorge Jimenez <iryoku@gmail.com>
+Date: 01/08/2013 12:39 PM
+To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
+
+Hi Tom,
+ 
+What we meant with that is that we made an exception for clause 2. 
+Instead of clause 2, in the case of the Mesa project, you have to name 
+the technique Jimenez's MLAA in the config options of Mesa. We did that 
+just to allow them to solve license issues. This exception should be for 
+the Mesa project, and any project using Mesa, like Fedora.
+ 
+We want to widespread usage of our MLAA, so we want to avoid any kind of 
+license complications. Hope current one is good for Fedora, if not 
+please tell, and we'll see what we can do!
+ 
+Cheers,
+Jorge
+ 
+From: Tom Callaway <tcallawa@redhat.com>
+Sent: January 8, 2013 6:30 PM
+To: jorge@iryoku.com
+Subject: Question about Mesa MLAA license
+ 
+Jorge,
+
+Thanks for all of your fantastic graphics work! I have been auditing
+Fedora (a popular distribution of Linux) for license compliance and I
+came across your MLAA code in Mesa.
+
+The license says:
+
+ *    2. Redistributions in binary form must reproduce the following
+statement:
+ *
+ *       "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
+ *        Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
+ *
+ *       Only for use in the Mesa project, this point 2 is filled by naming the
+ *       technique Jimenez's MLAA in the Mesa config options.
+
+That wording is unclear. When you say "Only for use in the Mesa
+project...", it seems like you could either be saying:
+
+- This code may only be used as part of Mesa.
+
+OR
+
+- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
+MLAA" in the Mesa config options.
+
+*****
+
+If the first item is true, then we may have to remove the MLAA code from
+Fedora's copy of Mesa. However, looking at the license on your SMAA
+code, I do not believe it to be the case. Please let me know either way!
+
+Thanks in advance,
+
+Tom Callaway
+Fedora Legal
+
+==
+Fedora Project
--- a/legacy-drivers.patch
+++ b/legacy-drivers.patch
@ -1,36 +0,0 @@
-diff -up mesa-20110620/configure.ac.classic mesa-20110620/configure.ac
--- mesa-20110620/configure.ac.classic	2011-06-20 13:52:52.000000000 +1000
-+++ mesa-20110620/configure.ac	2011-06-20 13:55:09.000000000 +1000
-@@ -1023,20 +1023,20 @@ if test "$mesa_driver" = dri -o "$mesa_d
-             # x86-64 system where they could *ever* be used.
-             if test "x$DRI_DIRS" = "xyes"; then
-                 DRI_DIRS="i915 i965 mga nouveau r128 r200 r300 r600 \
-                    radeon savage tdfx unichrome swrast"
-+                    radeon savage tdfx unichrome"
-             fi
-             ;;
-         powerpc*)
-             # Build only the drivers for cards that exist on PowerPC.
-             # At some point MGA will be added, but not yet.
-             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
-+                DRI_DIRS="r128 r200 r300 r600 radeon tdfx nouveau"
-             fi
-             ;;
-         sparc*)
-             # Build only the drivers for cards that exist on sparc`
-             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="r128 r200 r300 r600 radeon swrast"
-+                DRI_DIRS="r128 r200 r300 r600 radeon nouveau"
-             fi
-             ;;
-         esac
-@@ -1080,7 +1080,7 @@ if test "$mesa_driver" = dri -o "$mesa_d
-     # default drivers
-     if test "x$DRI_DIRS" = "xyes"; then
-         DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 radeon \
-            savage sis tdfx unichrome swrast"
-+            savage sis tdfx unichrome"
-     fi
- 
-     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Usage: ./make-git-snapshot.sh [COMMIT]
-#
-# to make a snapshot of the given tag/branch.  Defaults to HEAD.
-# Point env var REF to a local mesa repo to reduce clone time.
-
-DIRNAME=mesa-$( date +%Y%m%d )
-
-echo REF ${REF:+--reference $REF}
-echo DIRNAME $DIRNAME
-echo HEAD ${1:-HEAD}
-
-rm -rf $DIRNAME
-
-git clone ${REF:+--reference $REF} \
-	git://git.freedesktop.org/git/mesa/mesa $DIRNAME
-
-GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
-	| xz > $DIRNAME.tar.xz
-
-# rm -rf $DIRNAME
--- a/mesa-7.1-nukeglthread-debug.patch
+++ b/mesa-7.1-nukeglthread-debug.patch
@ -1,15 +0,0 @@
-diff -up mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c.da mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c
--- mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c.da	2011-06-20 13:51:25.000000000 +1000
-+++ mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c	2011-06-20 13:51:32.000000000 +1000
-@@ -612,11 +612,6 @@ intel_render_texture(struct gl_context *
-        return;
-    }
- 
-   DBG("Begin render texture tid %lx tex=%u w=%d h=%d refcount=%d\n",
-       _glthread_GetID(),
-       att->Texture->Name, image->Width, image->Height,
-       irb->Base.RefCount);
-
-    intel_renderbuffer_set_draw_offset(irb, intel_image, att->Zoffset);
-    intel_image->used_as_render_target = GL_TRUE;
- 
--- a/mesa-7.10-llvmcore.patch
+++ b/mesa-7.10-llvmcore.patch
@ -1,12 +0,0 @@
-diff -up mesa-20110412/configure.ac.jx mesa-20110412/configure.ac
--- mesa-20110412/configure.ac.jx	2011-05-09 15:04:19.000000000 -0400
-+++ mesa-20110412/configure.ac	2011-05-09 15:05:11.000000000 -0400
-@@ -1679,7 +1679,7 @@ if test "x$enable_gallium_llvm" = xyes; 
-     if test "x$LLVM_CONFIG" != xno; then
- 	LLVM_VERSION=`$LLVM_CONFIG --version`
- 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
-	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
-+	LLVM_LIBS="-lLLVM-`llvm-config --version` -lstdc++"
- 
- 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
- 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
--- a/mesa-7.10-swrastg.patch
+++ b/mesa-7.10-swrastg.patch
@ -1,23 +0,0 @@
-diff -up mesa-20101020/src/gallium/drivers/llvmpipe/Makefile.jx mesa-20101020/src/gallium/drivers/llvmpipe/Makefile
-diff -up mesa-20101020/src/gallium/targets/dri-swrast/Makefile.jx mesa-20101020/src/gallium/targets/dri-swrast/Makefile
--- mesa-20101020/src/gallium/targets/dri-swrast/Makefile.jx	2010-10-20 15:54:57.000000000 -0400
-+++ mesa-20101020/src/gallium/targets/dri-swrast/Makefile	2010-11-08 14:39:47.000000000 -0500
-@@ -26,6 +26,8 @@ C_SOURCES = \
- 
- ASM_SOURCES =
- 
-+LDFLAGS += -Wl,--version-script,../version-script
-+
- include ../Makefile.dri
- 
- INCLUDES += \
-diff -up mesa-20101020/src/gallium/targets/version-script.jx mesa-20101020/src/gallium/targets/version-script
--- mesa-20101020/src/gallium/targets/version-script.jx	2010-11-08 14:39:56.000000000 -0500
-+++ mesa-20101020/src/gallium/targets/version-script	2010-11-08 14:40:36.000000000 -0500
-@@ -0,0 +1,6 @@
-+GALLIUM {
-+    global:
-+	__dri*;
-+    local:
-+	*;
-+};
--- a/mesa-7.11-fix-sw-24bpp.patch
+++ b/mesa-7.11-fix-sw-24bpp.patch
@ -1,32 +0,0 @@
-From 4258e9b3a5eeaa90f2a0485576d7d17d6d8e4d6f Mon Sep 17 00:00:00 2001
-From: Marc Pignat <marc@pignat.org>
-Date: Tue, 28 Jun 2011 13:21:58 +0000
-Subject: drisw: Fix 24bpp software rendering, take 2
-
-This patch add the support for 24bpp in the dri/swrast implementation.
-See http://bugs.freedesktop.org/show_bug.cgi?id=23525
-
-Signed-off-by: Marc Pignat <marc at pignat.org>
-Signed-off-by: Brian Paul <brianp@vmware.com>
-(cherry picked from commit cfec000e7514342fd51859906e173ba2d474a55c)
---
-diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
-index 07d4955..a57b327 100644
--- a/src/glx/drisw_glx.c
-+++ b/src/glx/drisw_glx.c
-@@ -100,6 +100,13 @@ XCreateDrawable(struct drisw_drawable * pdp,
-                               32,                     /* bitmap_pad */
-                               0);                     /* bytes_per_line */
- 
-+  /**
-+   * swrast does not handle 24-bit depth with 24 bpp, so let X do the
-+   * the conversion for us.
-+   */
-+  if (pdp->ximage->bits_per_pixel == 24)
-+     pdp->ximage->bits_per_pixel = 32;
-+
-    return True;
- }
- 
--
-cgit v0.9.0.2-2-gbebe
--- a/mesa-7.11-generic-wmb.patch
+++ b/mesa-7.11-generic-wmb.patch
@ -1,12 +0,0 @@
-diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
--- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx	2010-12-14 16:43:15.000000000 -0500
-+++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h	2011-09-09 11:47:56.454465358 -0400
-@@ -405,7 +405,7 @@ struct sis_context
- #elif defined(__ia64__)
- #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
- #else
-#error platform needs WMB
-+#define MMIO_WMB()	__sync_synchronize()
- #endif
- 
- #define mEndPrimitive()  \
--- a/mesa-7.6-hush-vblank-warning.patch
+++ b/mesa-7.6-hush-vblank-warning.patch
@ -1,12 +0,0 @@
-diff -up mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx mesa-20090813/src/mesa/drivers/dri/common/vblank.c
--- mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx	2009-08-13 09:28:01.000000000 -0400
-+++ mesa-20090813/src/mesa/drivers/dri/common/vblank.c	2009-09-08 14:07:51.000000000 -0400
-@@ -256,7 +256,7 @@ static int do_wait( drmVBlank * vbl, GLu
-    if ( ret != 0 ) {
-       static GLboolean first_time = GL_TRUE;
- 
-      if ( first_time ) {
-+      if (0) {
- 	 fprintf(stderr, 
- 		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
- 		 " working correctly.\nTry adjusting the vblank_mode"
--- a/mesa-no-mach64.patch
+++ b/mesa-no-mach64.patch
@ -1,46 +0,0 @@
-diff -up mesa-20110620/configure.ac.no-mach64 mesa-20110620/configure.ac
--- mesa-20110620/configure.ac.no-mach64	2011-06-20 12:19:16.000000000 +1000
-+++ mesa-20110620/configure.ac	2011-06-20 13:52:27.000000000 +1000
-@@ -1022,7 +1022,7 @@ if test "$mesa_driver" = dri -o "$mesa_d
-             # the new interface.  i810 are missing because there is no
-             # x86-64 system where they could *ever* be used.
-             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
-+                DRI_DIRS="i915 i965 mga nouveau r128 r200 r300 r600 \
-                     radeon savage tdfx unichrome swrast"
-             fi
-             ;;
-@@ -1030,13 +1030,13 @@ if test "$mesa_driver" = dri -o "$mesa_d
-             # Build only the drivers for cards that exist on PowerPC.
-             # At some point MGA will be added, but not yet.
-             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
-+                DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
-             fi
-             ;;
-         sparc*)
-             # Build only the drivers for cards that exist on sparc`
-             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
-+                DRI_DIRS="r128 r200 r300 r600 radeon swrast"
-             fi
-             ;;
-         esac
-@@ -1050,7 +1050,7 @@ if test "$mesa_driver" = dri -o "$mesa_d
-         fi
- 
-         if test "x$DRI_DIRS" = "xyes"; then
-            DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \
-+            DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 \
-                 radeon tdfx unichrome savage sis swrast"
-         fi
-         ;;
-@@ -1079,7 +1079,7 @@ if test "$mesa_driver" = dri -o "$mesa_d
- 
-     # default drivers
-     if test "x$DRI_DIRS" = "xyes"; then
-        DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \
-+        DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 radeon \
-             savage sis tdfx unichrome swrast"
-     fi
- 
--- a/mesa.spec
+++ b/mesa.spec
--- a/3
+++ b/3
@ -1,2 +1 @@
-6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-333f61aac5367c8b7b9ea22943c448b1  mesa-20111103.tar.xz
+SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab