From 4ce98c5b3041dd9da79d4f2b74a97a09d166ab355ebc86f5c533399ce2a5353c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 31 Aug 2020 20:10:10 +0000 Subject: [PATCH] - version 2.4.102 needed for jira#SLE/SLE-12880, jira#SLE/SLE-12882 - use again /etc/OpenCL/vendors for openSUSE Leap, i.e. use /usr/etc/OpenCL/vendors only for Tumbleweed OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=989 --- Mesa-drivers.changes | 11 +++++++++++ Mesa-drivers.spec | 8 ++++++++ Mesa.changes | 11 +++++++++++ Mesa.spec | 8 ++++++++ 4 files changed, 38 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 8523c03..cb9b04a 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 31 19:36:31 UTC 2020 - Stefan Dirsch + +- version 2.4.102 needed for jira#SLE/SLE-12880, jira#SLE/SLE-12882 + +------------------------------------------------------------------- +Mon Aug 31 19:12:50 UTC 2020 - Stefan Dirsch + +- use again /etc/OpenCL/vendors for openSUSE Leap, i.e. use + /usr/etc/OpenCL/vendors only for Tumbleweed + ------------------------------------------------------------------- Wed Aug 26 10:37:17 UTC 2020 - Callum Farmer diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 2abfe82..c79839b 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -746,7 +746,9 @@ egl_platforms=x11,drm,surfaceless,wayland %endif %if 0%{with_opencl} -Dgallium-opencl=icd \ +%if 0%{?suse_version} >= 1550 --sysconfdir=%{_datadir} \ +%endif %endif -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} @@ -1083,9 +1085,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %if 0%{with_opencl} %files -n Mesa-libOpenCL +%if 0%{?suse_version} >= 1550 %dir %{_datadir}/OpenCL %dir %{_datadir}/OpenCL/vendors %{_datadir}/OpenCL/vendors/mesa.icd +%else +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/mesa.icd +%endif %{_libdir}/libMesaOpenCL.so* %endif diff --git a/Mesa.changes b/Mesa.changes index 8523c03..cb9b04a 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 31 19:36:31 UTC 2020 - Stefan Dirsch + +- version 2.4.102 needed for jira#SLE/SLE-12880, jira#SLE/SLE-12882 + +------------------------------------------------------------------- +Mon Aug 31 19:12:50 UTC 2020 - Stefan Dirsch + +- use again /etc/OpenCL/vendors for openSUSE Leap, i.e. use + /usr/etc/OpenCL/vendors only for Tumbleweed + ------------------------------------------------------------------- Wed Aug 26 10:37:17 UTC 2020 - Callum Farmer diff --git a/Mesa.spec b/Mesa.spec index e481dff..b4383a9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -745,7 +745,9 @@ egl_platforms=x11,drm,surfaceless,wayland %endif %if 0%{with_opencl} -Dgallium-opencl=icd \ +%if 0%{?suse_version} >= 1550 --sysconfdir=%{_datadir} \ +%endif %endif -Ddri-search-path=%{_libdir}/dri \ %if 0%{with_llvm} @@ -1082,9 +1084,15 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %if 0%{with_opencl} %files -n Mesa-libOpenCL +%if 0%{?suse_version} >= 1550 %dir %{_datadir}/OpenCL %dir %{_datadir}/OpenCL/vendors %{_datadir}/OpenCL/vendors/mesa.icd +%else +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/mesa.icd +%endif %{_libdir}/libMesaOpenCL.so* %endif