Fix patch fuzz

4 files changed, 19 insertions, 23 deletions

diff --git a/recipes-graphics/mesa/mesa/0001-gallium-add-missing-header-for-powf.patch b/recipes-graphics/mesa/mesa/0001-gallium-add-missing-header-for-powf.patch
index 851ec39..8e7c15c 100644
--- a/recipes-graphics/mesa/mesa/0001-gallium-add-missing-header-for-powf.patch
+++ b/recipes-graphics/mesa/mesa/0001-gallium-add-missing-header-for-powf.patch
@@ -1,7 +1,7 @@
-From ff8daa013621019f1606dc0c188b16f1ce34fea7 Mon Sep 17 00:00:00 2001
+From 5000318f053f0d7ccb003cfca7a0372f947159d5 Mon Sep 17 00:00:00 2001
 From: Vinson Lee <vlee@freedesktop.org>
 Date: Mon, 6 Apr 2020 18:21:54 -0700
-Subject: gallivm: Add missing header for powf.
+Subject: [PATCH] gallivm: Add missing header for powf.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -22,12 +22,13 @@ src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c:78:1: note: include ‘<math.
 Signed-off-by: Vinson Lee <vlee@freedesktop.org>
 Reviewed-by: Roland Scheidegger <sroland@vmware.com>
 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4473>
+
 ---
  src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c
-index d5cf698b060..5cd6ebe7149 100644
+index d5cf698..5cd6ebe 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_srgb.c
 @@ -68,6 +68,7 @@
@@ -38,4 +39,3 @@ index d5cf698b060..5cd6ebe7149 100644
  
  #include "lp_bld_type.h"
  #include "lp_bld_const.h"
--- 
diff --git a/recipes-graphics/mesa/mesa/0001-gallium-gallivm-remove-unused-header-include-for-newer-LLVM.patch b/recipes-graphics/mesa/mesa/0001-gallium-gallivm-remove-unused-header-include-for-newer-LLVM.patch
index 2347182..4ed45d2 100644
--- a/recipes-graphics/mesa/mesa/0001-gallium-gallivm-remove-unused-header-include-for-newer-LLVM.patch
+++ b/recipes-graphics/mesa/mesa/0001-gallium-gallivm-remove-unused-header-include-for-newer-LLVM.patch
@@ -1,4 +1,4 @@
-From 52aa730d07618513d6c055618069b2f4680974cc Mon Sep 17 00:00:00 2001
+From 29aa95dd535bfc361686107027901b5b72b32909 Mon Sep 17 00:00:00 2001
 From: Jan Zielinski <jan.zielinski@intel.com>
 Date: Mon, 27 Apr 2020 13:34:59 +0200
 Subject: [PATCH] gallium/gallivm: remove unused header include for newer LLVM
@@ -10,12 +10,13 @@ so I disable it only for the latest LLVM
 
 Reviewed-by: Roland Scheidegger <sroland@vmware.com>
 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4748>
+
 ---
  src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 40cc96824f3e..df7196190c5e 100644
+index 40cc968..df71961 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
 @@ -65,7 +65,9 @@
@@ -28,6 +29,3 @@ index 40cc96824f3e..df7196190c5e 100644
  #include <llvm/IR/IRBuilder.h>
  #include <llvm/IR/Module.h>
  #include <llvm/Support/CBindingWrapping.h>
--- 
-GitLab
-
diff --git a/recipes-graphics/mesa/mesa/0001-gallivm-add-InstSimplify-pass.patch b/recipes-graphics/mesa/mesa/0001-gallivm-add-InstSimplify-pass.patch
index 8846bf3..2ede41d 100644
--- a/recipes-graphics/mesa/mesa/0001-gallivm-add-InstSimplify-pass.patch
+++ b/recipes-graphics/mesa/mesa/0001-gallivm-add-InstSimplify-pass.patch
@@ -1,4 +1,4 @@
-From 1d018bc7fde744b5fc71108887a51e5bfaff8776 Mon Sep 17 00:00:00 2001
+From 17a438c9975a3c12e53b03bb6489f854affaf99c Mon Sep 17 00:00:00 2001
 From: Roland Scheidegger <sroland@vmware.com>
 Date: Wed, 2 Sep 2020 04:04:50 +0200
 Subject: [PATCH] gallivm: add InstSimplify pass
@@ -7,15 +7,16 @@ This is the recommended replacement for the removed ConstantPropagation
 pass, and llvm now added c binding for it.
 
 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6585>
+
 ---
  src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index 1eb4892a4a6c..fe3ef4a48df5 100644
+index 31ebd8c..6aa2314 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -171,6 +171,8 @@ create_pass_manager(struct gallivm_state *gallivm)
+@@ -170,6 +170,8 @@ create_pass_manager(struct gallivm_state *gallivm)
        LLVMAddPromoteMemoryToRegisterPass(gallivm->passmgr);
  #if LLVM_VERSION_MAJOR <= 11
        LLVMAddConstantPropagationPass(gallivm->passmgr);
@@ -24,6 +25,3 @@ index 1eb4892a4a6c..fe3ef4a48df5 100644
  #endif
        LLVMAddInstructionCombiningPass(gallivm->passmgr);
        LLVMAddGVNPass(gallivm->passmgr);
--- 
-GitLab
-
diff --git a/recipes-graphics/mesa/mesa/0001-gallivm-fix-build-on-llvm-12-due-to-LLVMAddConstantPropagationPass-removal.patch b/recipes-graphics/mesa/mesa/0001-gallivm-fix-build-on-llvm-12-due-to-LLVMAddConstantPropagationPass-removal.patch
index 0c7004c..518b4e4 100644
--- a/recipes-graphics/mesa/mesa/0001-gallivm-fix-build-on-llvm-12-due-to-LLVMAddConstantPropagationPass-removal.patch
+++ b/recipes-graphics/mesa/mesa/0001-gallivm-fix-build-on-llvm-12-due-to-LLVMAddConstantPropagationPass-removal.patch
@@ -1,22 +1,25 @@
-From 52cac068621a5998f486f8e44f9c2d9d045d1c31 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
+From db4a83e137128582fcc2ec3ae726bdde995a7ad3 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
 Date: Mon, 31 Aug 2020 21:59:39 -0400
 Subject: [PATCH] gallivm: fix build on LLVM 12 due to
+
+From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
  LLVMAddConstantPropagationPass removal
 
 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3465
 Cc: 20.1 20.2 <mesa-stable@lists.freedesktop.org>
 Reviewed-by: Dave Airlie <airlied@redhat.com>
 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6531>
+
 ---
  src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index 6ebc9ebf25a3..1eb4892a4a6c 100644
+index efc0096..31ebd8c 100644
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -169,7 +169,9 @@ create_pass_manager(struct gallivm_state *gallivm)
+@@ -168,7 +168,9 @@ create_pass_manager(struct gallivm_state *gallivm)
         */
        LLVMAddReassociatePass(gallivm->passmgr);
        LLVMAddPromoteMemoryToRegisterPass(gallivm->passmgr);
@@ -25,7 +28,4 @@ index 6ebc9ebf25a3..1eb4892a4a6c 100644
 +#endif
        LLVMAddInstructionCombiningPass(gallivm->passmgr);
        LLVMAddGVNPass(gallivm->passmgr);
-    }
--- 
-GitLab
-
+ #if GALLIVM_HAVE_CORO