From 1063a9768a423e1ecfeba15c120e1a69ab2a0272 Mon Sep 17 00:00:00 2001 From: Vasily Kleschov Date: Wed, 27 Sep 2023 17:55:43 +0200 Subject: [PATCH] revert --- ...x-fix-xshm-check-to-init-xshm_opcode.patch | 27 - SOURCES/Makefile | 23 - .../Mesa-MLAA-License-Clarification-Email.txt | 117 -- SOURCES/gnome-shell-glthread-disable.patch | 11 - SOURCES/lavapipe-disable-env-var.patch | 13 - SOURCES/radeonsi-turn-off-glthread.patch | 11 - SOURCES/vl_decoder.c | 20 - SOURCES/vl_mpeg12_decoder.c | 7 - SPECS/mesa.spec | 1381 ----------------- 9 files changed, 1610 deletions(-) delete mode 100644 SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch delete mode 100644 SOURCES/Makefile delete mode 100644 SOURCES/Mesa-MLAA-License-Clarification-Email.txt delete mode 100644 SOURCES/gnome-shell-glthread-disable.patch delete mode 100644 SOURCES/lavapipe-disable-env-var.patch delete mode 100644 SOURCES/radeonsi-turn-off-glthread.patch delete mode 100644 SOURCES/vl_decoder.c delete mode 100644 SOURCES/vl_mpeg12_decoder.c delete mode 100644 SPECS/mesa.spec diff --git a/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch b/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch deleted file mode 100644 index 1b2ec86..0000000 --- a/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 808c054a42fd24a1aaefaeb1d95195fea9fb6e84 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 7 Dec 2022 05:11:47 +1000 -Subject: [PATCH] glx: fix xshm check to init xshm_opcode. - -Found and proposed by Ray Strode (halfline) - -Fixes: 68e89401140d ("glx/drisw: use xcb instead of X to query connection") ---- - src/glx/drisw_glx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c -index c0d1e85fdc4..d7658eaf7c1 100644 ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -874,6 +874,7 @@ check_xshm(Display *dpy) - - shm_cookie = xcb_query_extension(c, 7, "MIT-SHM"); - shm_reply = xcb_query_extension_reply(c, shm_cookie, NULL); -+ xshm_opcode = shm_reply->major_opcode; - - has_mit_shm = shm_reply->present; - free(shm_reply); --- -2.38.1 - diff --git a/SOURCES/Makefile b/SOURCES/Makefile deleted file mode 100644 index 872470c..0000000 --- a/SOURCES/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -VERSION ?= 22.3.0 -SANITIZE ?= 1 - -DIRNAME = mesa-${VERSION} - -all: archive - -clean: - rm -rf $(DIRNAME)/ - rm -f mesa-${VERSION}.tar.xz - -clone: clean - curl -O https://archive.mesa3d.org/mesa-${VERSION}.tar.xz - tar xf mesa-${VERSION}.tar.xz - -sanitize: clone vl_mpeg12_decoder.c vl_decoder.c -ifdef SANITIZE - cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c - cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c -endif - -archive: clone sanitize - tar caf ${DIRNAME}.tar.xz ${DIRNAME} diff --git a/SOURCES/Mesa-MLAA-License-Clarification-Email.txt b/SOURCES/Mesa-MLAA-License-Clarification-Email.txt deleted file mode 100644 index 30bdf2e..0000000 --- a/SOURCES/Mesa-MLAA-License-Clarification-Email.txt +++ /dev/null @@ -1,117 +0,0 @@ - -Subject: RE: Question about Mesa MLAA license -From: Jorge Jimenez -Date: 01/08/2013 12:50 PM -To: Tom Callaway -CC: "jorge@iryoku.com" - -Yes to both questions. - -Thanks, -Jorge - -From: Tom Callaway -Sent: January 8, 2013 6:49 PM -To: Jorge Jimenez -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 -Date: 01/08/2013 12:39 PM -To: "jorge@iryoku.com" , Tom Callaway - -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 -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 diff --git a/SOURCES/gnome-shell-glthread-disable.patch b/SOURCES/gnome-shell-glthread-disable.patch deleted file mode 100644 index b2caeb8..0000000 --- a/SOURCES/gnome-shell-glthread-disable.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf ---- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma 2022-11-25 10:32:32.175879868 +1000 -+++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf 2022-11-25 10:32:43.743067470 +1000 -@@ -653,6 +653,7 @@ TODO: document the other workarounds. - - - -