diff --git a/.gitignore b/.gitignore index ec35f17..cede575 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /egl-wayland-818b6135ad6883afbaec83f5da0d3204238416a7.tar.gz /egl-wayland-1f4b1fde684595fe28e250b7429e028a7bb7d40d.tar.gz /egl-wayland-b283689e369116aaf41ffac70d4eeef19ce133a4.tar.gz +/egl-wayland-6f5f7d0d50287b810e9dec4718d3cf995fed809a.tar.gz diff --git a/egl-wayland.spec b/egl-wayland.spec index 8a67005..b36265d 100644 --- a/egl-wayland.spec +++ b/egl-wayland.spec @@ -1,10 +1,10 @@ -%global commit b283689e369116aaf41ffac70d4eeef19ce133a4 -%global date 20180111 +%global commit 6f5f7d0d50287b810e9dec4718d3cf995fed809a +%global date 20180201 %global shortcommit0 %(c=%{commit}; echo ${c:0:7}) Name: egl-wayland Version: 1.0.3 -Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: Wayland EGL External Platform library License: MIT @@ -12,6 +12,7 @@ URL: https://github.com/NVIDIA Source0: %url/%{name}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz Source1: 10_nvidia_wayland.json +BuildRequires: meson BuildRequires: libtool BuildRequires: eglexternalplatform-devel BuildRequires: mesa-libEGL-devel @@ -32,24 +33,20 @@ Wayland EGL External Platform library development package %prep %autosetup -n %{name}-%{commit} -NOCONFIGURE=1 ./autogen.sh %build -%configure --disable-static -%make_build V=1 +%meson +%meson_build %install -%make_install +%meson_install install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/egl/egl_external_platform.d/ -rm %{buildroot}%{_libdir}/libnvidia-egl-wayland.so find %{buildroot} -name '*.la' -exec rm -f {} ';' -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files @@ -59,13 +56,18 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/egl/egl_external_platform.d/10_nvidia_wayland.json %files devel +%{_libdir}/libnvidia-egl-wayland.so %{_datadir}/pkgconfig/wayland-eglstream.pc %{_datadir}/pkgconfig/wayland-eglstream-protocols.pc -%{_datadir}/wayland-eglstream/wayland-eglstream.xml -%{_datadir}/wayland-eglstream/wayland-eglstream-controller.xml - +%{_datadir}/wayland-eglstream/ %changelog +* Tue Feb 06 2018 Leigh Scott - 1.0.3-2.20180201git6f5f7d0 +- Update to latest git snapshot +- Switch to meson +- Install .so file to -devel as it's listed in wayland-eglstream.pc +- Fix directory ownership + * Wed Jan 31 2018 Jonas Ã…dahl - 1.0.3-1.20180111gitb283689 - Update to 1.0.3 - Add -devel package diff --git a/sources b/sources index 6afe10e..dc2b711 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (egl-wayland-b283689e369116aaf41ffac70d4eeef19ce133a4.tar.gz) = 4d22a85c90fa6917d87b5f4a51e983650c311162ce091ea1ef8fb2f84c275af4b9cfaf9f6db3c36d3be040a324c76071b3dd68c5f5d1bfab0f6ba09ae8266bdb +SHA512 (egl-wayland-6f5f7d0d50287b810e9dec4718d3cf995fed809a.tar.gz) = 96e84e8246609d7fc35b490db0ce7be469072502a3960e0baa0ef8568c9cf1ef1671e2010d64e547ea01b05f5c28ff190a919351f502f65f51a68c94bfdd7d30