From 7668333b4aa81598c4d5f990e910fa720e847b1c1a8030dabdbb2587c36395d8 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 1 Jul 2021 18:50:47 +0000
Subject: [PATCH] Accepting request 903553 from home:jengelh:branches:X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/903553
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libnvidia-egl-wayland?expand=0&rev=3
---
 libnvidia-egl-wayland.changes |  8 ++++++++
 libnvidia-egl-wayland.spec    | 33 +++++++--------------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/libnvidia-egl-wayland.changes b/libnvidia-egl-wayland.changes
index 20deed6..d8526d3 100644
--- a/libnvidia-egl-wayland.changes
+++ b/libnvidia-egl-wayland.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul  1 16:03:04 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Throw out ancient specfile constructs like BuildRoot and
+  defattr that have had proper defaults for long. Use more of the
+  contemporary macros, and drop all the nonstandard CFLAGS/LDFLAGS,
+  drop the unconditional strip calls.
+
 -------------------------------------------------------------------
 Thu Jul  1 12:58:02 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/libnvidia-egl-wayland.spec b/libnvidia-egl-wayland.spec
index 963aaba..c4044de 100644
--- a/libnvidia-egl-wayland.spec
+++ b/libnvidia-egl-wayland.spec
@@ -26,7 +26,7 @@ Release:        0
 URL:            https://github.com/NVIDIA/egl-wayland
 Summary:        The EGLStream-based Wayland external platform
 License:        MIT
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/C and C++
 
 # Build-time parameters
 BuildRequires:  gcc-c++
@@ -40,7 +40,6 @@ BuildRequires:  pkgconfig(wayland-egl-backend) >= 3
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(x11)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         egl-wayland-%{version}.tar.gz
 
 %description
@@ -52,7 +51,7 @@ EGL drivers that support the external platform mechanism.
 
 %package -n %lname
 Summary:        The EGLStream-based Wayland external platform
-Group:          Development/Libraries/Other
+Group:          System/Libraries
 
 %description -n %lname
 This is an implementation of a EGL External Platform library to add client-side
@@ -78,45 +77,27 @@ This package provides headers and libraries required to build software
 using %{name}.
 
 %prep
-%setup -q -n egl-wayland-%{version}%{?extraver}
+%autosetup -n egl-wayland-%{version}%{?extraver}
 
 %build
-_CFLAGS='%{optflags}'
-_LDFLAGS='-Wl,--strip-all -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro'
-meson setup build \
- --buildtype=release \
- --optimization=2 \
- --strip \
- \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --default-library=shared \
- \
- -Db_lto=true \
- -Db_ndebug=if-release \
- -Dc_args="$_CFLAGS" \
- -Dc_link_args="$_LDFLAGS"
-ninja -v -C build %{?_smp_mflags}
+export LDFLAGS="-Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -flto=auto"
+%meson
+%meson_build
 
 %install
-DESTDIR=%{buildroot} ninja -C build install
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+%meson_install
 
 %post -n %lname -p /sbin/ldconfig
 
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%defattr(-,root,root)
 %license COPYING
 %doc README.md
 %{_libdir}/libnvidia-egl-wayland.so.%{so_ver}*
 %{_datadir}/wayland-eglstream/
 
 %files -n libnvidia-egl-wayland-devel
-%defattr(-,root,root)
 %license COPYING
 %doc README.md
 %{_libdir}/libnvidia-egl-wayland.so