SHA256
1
0
forked from pool/Mesa

- build wayland on Leap

- separate package 'Mesa-dri-nouveau' on Leap

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=595
This commit is contained in:
Stefan Dirsch 2017-04-12 12:32:31 +00:00 committed by Git OBS Bridge
parent 9bd958f291
commit 5d9a2e217f
2 changed files with 16 additions and 6 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 12 12:31:34 UTC 2017 - sndirsch@suse.com
- build wayland on Leap
- separate package 'Mesa-dri-nouveau' on Leap
-------------------------------------------------------------------
Wed Apr 12 12:15:27 UTC 2017 - sndirsch@suse.com

View File

@ -154,9 +154,9 @@ BuildRequires: libelf-devel
%endif
%endif
# Requirements for wayland bumped up from 17.0
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-server)
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
BuildRequires: pkgconfig(wayland-client) >= 1.11
BuildRequires: pkgconfig(wayland-server) >= 1.11
%endif
%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64
BuildRequires: llvm-devel
@ -206,7 +206,7 @@ Obsoletes: Mesa-devel-static < %{version}
Obsoletes: xorg-x11-Mesa-devel < %{version}
Provides: Mesa-libIndirectGL-devel = %{version}
Obsoletes: Mesa-libIndirectGL-devel < %{version}
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
Requires: libwayland-egl-devel
%endif
@ -670,7 +670,7 @@ grep -v libglvnd $RPM_SOURCE_DIR/baselibs.conf > $RPM_SOURCE_DIR/temp && \
%endif
%build
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
egl_platforms=x11,drm,wayland
%else
egl_platforms=x11,drm
@ -841,10 +841,12 @@ done
%config %{_sysconfdir}/drirc
%dir %{_libdir}/dri
%{_libdir}/dri/*_dri.so
%if 0%{?is_opensuse}
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%exclude %{_libdir}/dri/nouveau_dri.so
%exclude %{_libdir}/dri/nouveau_vieux_dri.so
%endif
%endif
%if 0%{with_opencl}
# only built with opencl
%dir %{_libdir}/gallium-pipe/
@ -940,7 +942,7 @@ done
%{_libdir}/libOSMesa.so
%{_libdir}/pkgconfig/osmesa.pc
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse}
%files -n libwayland-egl1
%defattr(-,root,root)
%{_libdir}/libwayland-egl.so.1*
@ -1036,11 +1038,13 @@ done
%{_includedir}/GL/internal
%{_libdir}/pkgconfig/dri.pc
%if 0%{?is_opensuse}
%ifarch %ix86 x86_64 aarch64 %arm ppc64 ppc64le
%files -n Mesa-dri-nouveau
%{_libdir}/dri/nouveau_dri.so
%{_libdir}/dri/nouveau_vieux_dri.so
%endif
%endif
%files devel
%defattr(-,root,root)