[packages/Mesa] fix dridriverdir in dri.pc

atler atler at pld-linux.org
Tue Mar 5 19:53:26 CET 2019


commit 7e069b0d86014675588ac09914ee51b5ab69dece
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 5 19:51:58 2019 +0100

    fix dridriverdir in dri.pc
    
    we're passing absolute path so don't prepand "$prefix/"

 Mesa.spec          |  2 ++
 dridriverdir.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/Mesa.spec b/Mesa.spec
index cd7039c..1306b7e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -62,6 +62,7 @@ Group:		X11/Libraries
 Source0:	https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
 # Source0-md5:	64fefeab30a36fd64be935e66c450154
 Patch0:		nouveau_no_rtti.patch
+Patch1:		dridriverdir.patch
 URL:		http://www.mesa3d.org/
 %{?with_opencl:BuildRequires:	clang-devel >= %{llvm_ver}}
 BuildRequires:	elfutils-devel
@@ -1176,6 +1177,7 @@ 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
new file mode 100644
index 0000000..7dea64c
--- /dev/null
+++ b/dridriverdir.patch
@@ -0,0 +1,11 @@
+--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/7e069b0d86014675588ac09914ee51b5ab69dece



More information about the pld-cvs-commit mailing list