Accepting request 1086752 from X11:Wayland

OBS-URL: https://build.opensuse.org/request/show/1086752
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wlroots10?expand=0&rev=2

3456.patch

@@ -1,37 +0,0 @@
-From 35b3d67e5f0c12ae8d3174a268b0af73724ecc3e Mon Sep 17 00:00:00 2001
-From: Keith Bowes <keithbowes@users.noreply.github.com>
-Date: Thu, 17 Feb 2022 16:46:17 -0500
-Subject: [PATCH] Fixed compiling with FFmpeg 5.0
-
----
- examples/dmabuf-capture.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/examples/dmabuf-capture.c b/examples/dmabuf-capture.c
-index 4d05b78ba..58bf64195 100644
---- a/examples/dmabuf-capture.c
-+++ b/examples/dmabuf-capture.c
-@@ -1,4 +1,5 @@
- #define _POSIX_C_SOURCE 199309L
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavutil/display.h>
- #include <libavutil/hwcontext_drm.h>
-@@ -619,12 +620,12 @@ static int init_encoding(struct capture_context *ctx) {
- 	}
- 
- 	/* Find encoder */
--	AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
-+	const AVCodec *out_codec = avcodec_find_encoder_by_name(ctx->encoder_name);
- 	if (!out_codec) {
- 		av_log(ctx, AV_LOG_ERROR, "Codec not found (not compiled in lavc?)!\n");
- 		return AVERROR(EINVAL);
- 	}
--	ctx->avf->oformat->video_codec = out_codec->id;
-+	ctx->avf->oformat = av_guess_format(ctx->encoder_name, NULL, NULL);
- 	ctx->is_software_encoder = !(out_codec->capabilities & AV_CODEC_CAP_HARDWARE);
- 
- 	ctx->avctx = avcodec_alloc_context3(out_codec);
--- 
-GitLab
-

wlroots10.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 12 12:40:10 UTC 2023 - llyyr <llyyr.public@gmail.com>
+
+- 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 <bjorn.lie@gmail.com>
 

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