pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- cleanup in specfile: get rid of is_opensuse macro, which is no

Browse Source 
longer needed at all (jira#PM-1623)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=933
This commit is contained in:
Stefan Dirsch 2020-03-06 10:30:17 +00:00 committed by Git OBS Bridge
parent 8858127b8d
commit 0c423e75dd
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa-drivers.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 6 10:27:21 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- cleanup in specfile: get rid of is_opensuse macro, which is no
longer needed at all (jira#PM-1623)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa-drivers.spec
View File

@ -203,11 +203,9 @@ BuildRequires: libelf-devel
%endif %endif
%endif %endif
# Requirements for wayland bumped up from 17.0 # Requirements for wayland bumped up from 17.0
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
BuildRequires: pkgconfig(wayland-client) >= 1.11 BuildRequires: pkgconfig(wayland-client) >= 1.11
BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-protocols) >= 1.8
BuildRequires: pkgconfig(wayland-server) >= 1.11 BuildRequires: pkgconfig(wayland-server) >= 1.11
%endif
%if 0%{with_llvm} %if 0%{with_llvm}
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
BuildRequires: llvm-devel >= 9.0.0 BuildRequires: llvm-devel >= 9.0.0
@ -217,7 +215,7 @@ BuildRequires: llvm9-devel
%endif %endif
%if 0%{with_opencl} %if 0%{with_opencl}
%if 0%{?is_opensuse} %if 0%{?suse_version} >= 1550
BuildRequires: clang-devel >= 9.0.0 BuildRequires: clang-devel >= 9.0.0
%else %else
BuildRequires: clang9-devel BuildRequires: clang9-devel
@ -764,11 +762,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif %endif
%build %build
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,surfaceless,wayland egl_platforms=x11,drm,surfaceless,wayland
%else
egl_platforms=x11,drm,surfaceless
%endif
%meson \ %meson \
--auto-features=disabled \ --auto-features=disabled \

6
Mesa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 6 10:27:21 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- cleanup in specfile: get rid of is_opensuse macro, which is no
longer needed at all (jira#PM-1623)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Fri Feb 28 15:25:41 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa.spec
View File

@ -202,11 +202,9 @@ BuildRequires: libelf-devel
%endif %endif
%endif %endif
# Requirements for wayland bumped up from 17.0 # Requirements for wayland bumped up from 17.0
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
BuildRequires: pkgconfig(wayland-client) >= 1.11 BuildRequires: pkgconfig(wayland-client) >= 1.11
BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-protocols) >= 1.8
BuildRequires: pkgconfig(wayland-server) >= 1.11 BuildRequires: pkgconfig(wayland-server) >= 1.11
%endif
%if 0%{with_llvm} %if 0%{with_llvm}
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
BuildRequires: llvm-devel >= 9.0.0 BuildRequires: llvm-devel >= 9.0.0
@ -216,7 +214,7 @@ BuildRequires: llvm9-devel
%endif %endif
%if 0%{with_opencl} %if 0%{with_opencl}
%if 0%{?is_opensuse} %if 0%{?suse_version} >= 1550
BuildRequires: clang-devel >= 9.0.0 BuildRequires: clang-devel >= 9.0.0
%else %else
BuildRequires: clang9-devel BuildRequires: clang9-devel
@ -763,11 +761,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif %endif
%build %build
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,surfaceless,wayland egl_platforms=x11,drm,surfaceless,wayland
%else
egl_platforms=x11,drm,surfaceless
%endif
%meson \ %meson \
--auto-features=disabled \ --auto-features=disabled \