Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wlroots for openSUSE:Factory checked in at 2022-07-13 13:45:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wlroots (Old) and /work/SRC/openSUSE:Factory/.wlroots.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wlroots" Wed Jul 13 13:45:32 2022 rev:21 rq:988905 version:0.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wlroots/wlroots.changes 2022-02-22 21:18:35.178290586 +0100 +++ /work/SRC/openSUSE:Factory/.wlroots.new.1523/wlroots.changes 2022-07-13 13:45:58.150081285 +0200 @@ -1,0 +2,5 @@ +Tue Jul 12 20:21:23 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 3456.patch: Fix build with ffmpeg 5. Patch from upstream git. + +------------------------------------------------------------------- New: ---- 3456.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wlroots.spec ++++++ --- /var/tmp/diff_new_pack.2uzUDl/_old 2022-07-13 13:45:58.666082018 +0200 +++ /var/tmp/diff_new_pack.2uzUDl/_new 2022-07-13 13:45:58.670082023 +0200 @@ -31,6 +31,7 @@ Group: System/GUI/Other URL: https://gitlab.freedesktop.org/wlroots/wlroots Source0: https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/%{version}/downloads/%{name}-%{version}.tar.gz#/%{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 @@ -90,7 +91,7 @@ Pluggable, composable modules for building a Wayland compositor. %prep -%setup -q +%autosetup -p1 %build export CFLAGS="%{optflags} -I/usr/include/wayland -Wno-redundant-decls" ++++++ 3456.patch ++++++ >From 35b3d67e5f0c12ae8d3174a268b0af73724ecc3e Mon Sep 17 00:00:00 2001 From: Keith Bowes <[email protected]> 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
