From 665cf7fc962e4497cc3c71cf052fc6f29431491aafd9eaf3708b3bfc25c90e4f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 30 Jan 2020 00:00:43 +0000 Subject: [PATCH] - require and check for llvm-devel >= 9 instead of llvm9-devel on openSUSE OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=918 --- Mesa-drivers.changes | 3 ++- Mesa-drivers.spec | 10 ++++++++++ Mesa.changes | 3 ++- Mesa.spec | 10 ++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 39cf7a7..fcc97cf 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch -- require and check for llvm-devel >= 9 instead of llvm9-devel +- require and check for llvm-devel >= 9 instead of llvm9-devel on + openSUSE ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index d5cfd12..761f959 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -214,7 +214,11 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} +%if 0%{?is_opensuse} BuildRequires: llvm-devel >= 9.0.0 +%else +BuildRequires: llvm9-devel +%endif %endif %if 0%{with_opencl} @@ -732,9 +736,15 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} +%if 0%{?is_opensuse} %if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif +%else +%if %{pkg_vcmp llvm9-devel >= 9.0} +%patch1 -p1 +%endif +%endif %endif %patch2 -p1 %patch54 -p1 diff --git a/Mesa.changes b/Mesa.changes index 39cf7a7..fcc97cf 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jan 29 22:56:19 UTC 2020 - Stefan Dirsch -- require and check for llvm-devel >= 9 instead of llvm9-devel +- require and check for llvm-devel >= 9 instead of llvm9-devel on + openSUSE ------------------------------------------------------------------- Wed Jan 29 17:15:01 UTC 2020 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 9f1110f..63337e9 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -213,7 +213,11 @@ BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-server) >= 1.11 %endif %if 0%{with_llvm} +%if 0%{?is_opensuse} BuildRequires: llvm-devel >= 9.0.0 +%else +BuildRequires: llvm9-devel +%endif %endif %if 0%{with_opencl} @@ -731,9 +735,15 @@ programs against the XA state tracker. rm -rf docs/README.{VMS,WIN32,OS2} %if 0%{with_llvm} +%if 0%{?is_opensuse} %if %{pkg_vcmp llvm-devel >= 9.0} %patch1 -p1 %endif +%else +%if %{pkg_vcmp llvm9-devel >= 9.0} +%patch1 -p1 +%endif +%endif %endif %patch2 -p1 %patch54 -p1