From 0c397c06224da5c0b6fdd2acc5a3f0d88974c5333f9ec5144055b28b39dbdef9 Mon Sep 17 00:00:00 2001 From: llyyr Date: Fri, 12 May 2023 12:45:45 +0000 Subject: [PATCH] Accepting request 1086751 from home:llyyr:branches:X11:Wayland - Remove 3456.patch: Don't build example applications anymore. Fixes build with ffmpeg-6. OBS-URL: https://build.opensuse.org/request/show/1086751 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wlroots10?expand=0&rev=5 --- wlroots10.changes | 6 ++++++ wlroots10.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wlroots10.changes b/wlroots10.changes index 9c7927d..d7f9a36 100644 --- a/wlroots10.changes +++ b/wlroots10.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 12 12:40:10 UTC 2023 - llyyr + +- Remove 3456.patch: Don't build example applications anymore. Fixes build with + ffmpeg-6. + ------------------------------------------------------------------- Tue Jul 12 20:21:23 UTC 2022 - Bjørn Lie diff --git a/wlroots10.spec b/wlroots10.spec index b6e290c..6316097 100644 --- a/wlroots10.spec +++ b/wlroots10.spec @@ -1,7 +1,7 @@ # # spec file for package wlroots10 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,6 @@ License: MIT Group: System/GUI/Other URL: https://gitlab.freedesktop.org/wlroots/wlroots Source0: %{name}-%{version}.tar.gz -Patch0: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3456.patch BuildRequires: glslang-devel BuildRequires: meson >= 0.58.1 BuildRequires: pkgconfig @@ -93,7 +92,6 @@ Pluggable, composable modules for building a Wayland compositor. %prep %setup -n wlroots-%{version} -%patch0 -p1 %build export CFLAGS="%{optflags} -I/usr/include/wayland -Wno-redundant-decls" @@ -103,6 +101,7 @@ export CFLAGS="%{optflags} -I/usr/include/wayland -Wno-redundant-decls" %{?with_libinput_backend:'libinput',} %{?with_x11_backend:'x11',} ]" \ + -Dexamples=false \ %{?with_xwayland:-Dxwayland=enabled} \ %{?with_xcb_errors:-Dxcb-errors=enabled} %meson_build