Switch to upstream fix

This commit is contained in:
Leigh Scott 2019-03-30 10:56:37 +00:00
parent c57d7ad874
commit 064195765e
3 changed files with 27 additions and 15 deletions

22
WL_HIDE_DEPRECATED.patch Normal file
View File

@ -0,0 +1,22 @@
From 6b7c0f37d246ee0d4cde42abf848a9d4c281936c Mon Sep 17 00:00:00 2001
From: "Miguel A. Vico" <mvicomoya@nvidia.com>
Date: Fri, 29 Mar 2019 14:08:09 -0700
Subject: [PATCH] meson: Hide Wayland deprecated code
Build with WL_HIDE_DEPRECATED so that we don't build deprecated stuff.
---
src/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/meson.build b/src/meson.build
index 80ea977..2241785 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -7,6 +7,7 @@ endif
add_project_arguments('-Wall', language : 'c')
add_project_arguments('-Werror', language : 'c')
add_project_arguments('-fvisibility=hidden', language : 'c')
+add_project_arguments('-DWL_HIDE_DEPRECATED', language : 'c')
add_project_link_arguments('-Wl,-Bsymbolic', language : 'c')
if cc.has_argument('-Wpedantic')

View File

@ -1,15 +1,13 @@
Name: egl-wayland
Version: 1.1.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Wayland EGL External Platform library
License: MIT
URL: https://github.com/NVIDIA/%{name}
Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz
Source1: 10_nvidia_wayland.json
%if 0%{?rhel} || 0%{?fedora} <= 28
Patch0: fix_deprecated-declarations.patch
%endif
Patch0: %url/commit/6b7c0f37d246ee0d4cde42abf848a9d4c281936c.patch#/WL_HIDE_DEPRECATED.patch
BuildRequires: meson
BuildRequires: libtool
@ -61,6 +59,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/wayland-eglstream/
%changelog
* Sat Mar 30 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.2-2
- Switch to upstream fix
* Fri Feb 01 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.1.2-1
- Update to 1.1.2

View File

@ -1,11 +0,0 @@
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,6 +6,7 @@
add_project_arguments('-Wall', language : 'c')
add_project_arguments('-Werror', language : 'c')
+add_project_arguments('-Wno-deprecated-declarations', language : 'c')
add_project_arguments('-fvisibility=hidden', language : 'c')
add_project_link_arguments('-Wl,-Bsymbolic', language : 'c')