Version: 18.3.5

dridriverdir.patch applied upstream

diff --git a/Mesa.spec b/Mesa.spec
index 1306b7e22453c521d928634fc3bbf9ecb382c94b..833591a5210c507d40eef5b0f5fb9f1450f3b0b8 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -53,16 +53,15 @@
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
-Version:       18.3.4
+Version:       18.3.5
 Release:       1
 License:       MIT (core) and others - see license.html file
 Group:         X11/Libraries
 #Source0:      ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
 ## Source0-md5:        7c61a801311fb8d2f7b3cceb7b5cf308
 Source0:       https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
-# Source0-md5: 64fefeab30a36fd64be935e66c450154
+# Source0-md5: c58f1c90430c03cb3631d3d0f228f7d0
 Patch0:                nouveau_no_rtti.patch
-Patch1:                dridriverdir.patch
 URL:           http://www.mesa3d.org/
 %{?with_opencl:BuildRequires:  clang-devel >= %{llvm_ver}}
 BuildRequires: elfutils-devel
@@ -1177,7 +1176,6 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %setup -q -n mesa-mesa-%{version}
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 

diff --git a/dridriverdir.patch b/dridriverdir.patch
deleted file mode 100644 (file)
index 7dea64c..0000000
--- a/dridriverdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mesa-mesa-18.3.4/src/mesa/drivers/dri/meson.build.orig     2019-03-05 19:44:11.161362920 +0100
-+++ mesa-mesa-18.3.4/src/mesa/drivers/dri/meson.build  2019-03-05 19:44:45.604494243 +0100
-@@ -78,7 +78,7 @@
-     filebase : 'dri',
-     description : 'Direct Rendering Infrastructure',
-     version : meson.project_version(),
--    variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
-+    variables : ['dridriverdir=' + dri_drivers_path],
-     requires_private : dri_req_private,
-   )
- endif