From e21c6e109c645d27705b4302d466b264be03e698c678577c57e9af099a214b21 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 18 Jun 2020 12:20:29 +0000 Subject: [PATCH 1/2] - switch to /usr/etc/OpenCL/vendors for mesa.icd OpenCL file location (boo#1173005) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=968 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 7 ++++--- Mesa.changes | 6 ++++++ Mesa.spec | 7 ++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 9973358..5982559 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 18 11:02:23 UTC 2020 - Stefan Dirsch + +- switch to /usr/etc/OpenCL/vendors for mesa.icd OpenCL file + location (boo#1173005) + ------------------------------------------------------------------- Mon Jun 15 12:31:13 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index d3ab874..a0ae968 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -793,6 +793,7 @@ egl_platforms=x11,drm,surfaceless,wayland %endif %if 0%{with_opencl} -Dgallium-opencl=icd \ + --sysconfdir=%{_distconfdir} \ %endif -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} @@ -1171,9 +1172,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %if 0%{with_opencl} %files -n Mesa-libOpenCL -%dir %{_sysconfdir}/OpenCL -%dir %{_sysconfdir}/OpenCL/vendors -%{_sysconfdir}/OpenCL/vendors/mesa.icd +%dir %{_distconfdir}/OpenCL +%dir %{_distconfdir}/OpenCL/vendors +%{_distconfdir}/OpenCL/vendors/mesa.icd %{_libdir}/libMesaOpenCL.so* %endif diff --git a/Mesa.changes b/Mesa.changes index 9973358..5982559 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 18 11:02:23 UTC 2020 - Stefan Dirsch + +- switch to /usr/etc/OpenCL/vendors for mesa.icd OpenCL file + location (boo#1173005) + ------------------------------------------------------------------- Mon Jun 15 12:31:13 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 29007f4..89c801b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -792,6 +792,7 @@ egl_platforms=x11,drm,surfaceless,wayland %endif %if 0%{with_opencl} -Dgallium-opencl=icd \ + --sysconfdir=%{_distconfdir} \ %endif -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} @@ -1170,9 +1171,9 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %if 0%{with_opencl} %files -n Mesa-libOpenCL -%dir %{_sysconfdir}/OpenCL -%dir %{_sysconfdir}/OpenCL/vendors -%{_sysconfdir}/OpenCL/vendors/mesa.icd +%dir %{_distconfdir}/OpenCL +%dir %{_distconfdir}/OpenCL/vendors +%{_distconfdir}/OpenCL/vendors/mesa.icd %{_libdir}/libMesaOpenCL.so* %endif From b955f15ed20c9decfb4cda8c2ed719d48f75aa1afab8d63022460f1eccc35829 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 18 Jun 2020 14:16:43 +0000 Subject: [PATCH 2/2] define %_distconfdir to "/etc" on openSUSE/sle < TW OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=969 --- Mesa-drivers.spec | 3 +++ Mesa.spec | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a0ae968..b9707ba 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -84,6 +84,9 @@ %if 0%{with_opencl} %define have_gallium 1 +%if 0%{?suse_version} < 1550 + %define _distconfdir /etc +%endif %else %define have_gallium 0 %endif diff --git a/Mesa.spec b/Mesa.spec index 89c801b..8cdb713 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -83,6 +83,9 @@ %if 0%{with_opencl} %define have_gallium 1 +%if 0%{?suse_version} < 1550 + %define _distconfdir /etc +%endif %else %define have_gallium 0 %endif