From nobody Sat May 11 16:04:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vc9Yv4ClHz5KMWP; Sat, 11 May 2024 16:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vc9Yv126Zz4776; Sat, 11 May 2024 16:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715443491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxAItmwO49Q3Kr9IhMGGI1u4e5n611QbCo2i5h7Brts=; b=Q7FXFBd1EMdo9MnRS8LA+Da5DgX0lwvW9iF7YzEnVx7CkxjpAuDk2Z2XxRgPTZskci4yck cOar/ysk4wgYzhmYX4t+x9kKRWjQRxzaUyKZLGiEpoRXFTGwStxCtBn9sdFFtPg9qtWMhS jnfpCY3Lft2xJkxc9Vm2n5TXTjQRgQ+JqaTcc10IxJRvM2OyjW5hHd0eySE/GMwIHOpKSC 1D8HOk930eS7lowZHg3f2jxNo8zpllWy90T1AvewFdEOFndtO8b/Ks4TXYphnPyNaAKSNx gb3esiz2amO1nHeqQnm8C1e0vU3xH276cObU6INDlobBtk2Wpe/IStboWTX4Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715443491; a=rsa-sha256; cv=none; b=rKJia6tOPnQvKUxPN/WEJ48F//ubKobfb26RFYDqgeecp/bluhYnnz8Xv9OYMMjN4TVz7q j65bZsTFKy9RoC747GBM+dpmHAMfHGtAuLvYg4PGk3cmCXTmUn/a3YBqtFDcc4hG+sK7gg tC+Ll24TMm9g3pKn4fl49rFRXj/SwmYOsvNzj0VYQRQZh4MDcUScwEoD5wdYdQ6fSnxYEg NbUfVUgfLHzZAlFznBJgHm7i7QQkIb0sWy3VSsGiDpssOrYjd9G/UoBGGQWf+0mXu5/U0K kOjmLLQBepDRFu53Jp43aBd7EyX6qAdxQ1JJajdjCOjZk63DS8gtIZqpmaKMwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715443491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxAItmwO49Q3Kr9IhMGGI1u4e5n611QbCo2i5h7Brts=; b=n8uXyVsWvWPjHbW6Q1E4MvfMjQ9rFbLZxXdlCzX8lVGCxq89QgeFacgmVofoxyEtfTbRQp YC1y8hgWyFdmer74hRX7qqbvqPMKc+Rgpiuabo3NhpbG/3sGQVNRBUAWx9jikZCebnaxZF Ygf1cGQ8I9YAvD5Orq8oS92J80pHTY1M5TmJ6WhuNnQF2RE5J2Nkh+R+/3mptZhLTZipsF sR4DKoI1RnB2vc4rWAfNeAb5HTSREm0N12CqGhlxff9S7jkuz3MIe7fOyaLsfFrpGuHWmB 1gxEETBXQUy/xDJ7AQJeFn+c6B27JQq9tUWYVTyGFcHWNCFyGVvMndXQqcCzpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vc9Yv0VFMzRsY; Sat, 11 May 2024 16:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44BG4oWa090634; Sat, 11 May 2024 16:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44BG4oo2090631; Sat, 11 May 2024 16:04:50 GMT (envelope-from git) Date: Sat, 11 May 2024 16:04:50 GMT Message-Id: <202405111604.44BG4oo2090631@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 28ed4a3f4d2b - main - multimedia/wf-recorder: unbreak build with ffmpeg 7.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28ed4a3f4d2b4baf0fad3aa92ceade1cf9779881 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=28ed4a3f4d2b4baf0fad3aa92ceade1cf9779881 commit 28ed4a3f4d2b4baf0fad3aa92ceade1cf9779881 Author: Jan Beich AuthorDate: 2024-05-11 13:58:44 +0000 Commit: Jan Beich CommitDate: 2024-05-11 16:03:31 +0000 multimedia/wf-recorder: unbreak build with ffmpeg 7.0 ../src/frame-writer.cpp:458:19: error: no member named 'channel_layouts' in 'AVCodec'; did you mean 'ch_layouts'? if (!codec->channel_layouts) ^~~~~~~~~~~~~~~ ch_layouts /usr/local/include/libavcodec/codec.h:230:28: note: 'ch_layouts' declared here const AVChannelLayout *ch_layouts; ^ ../src/frame-writer.cpp:461:23: error: no member named 'channel_layouts' in 'AVCodec'; did you mean 'ch_layouts'? if (!codec->channel_layouts[i]) ^~~~~~~~~~~~~~~ ch_layouts /usr/local/include/libavcodec/codec.h:230:28: note: 'ch_layouts' declared here const AVChannelLayout *ch_layouts; ^ ../src/frame-writer.cpp:461:15: error: invalid argument type 'const AVChannelLayout' to unary expression if (!codec->channel_layouts[i]) ^~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/frame-writer.cpp:463:22: error: no member named 'channel_layouts' in 'AVCodec'; did you mean 'ch_layouts'? if (codec->channel_layouts[i] == AV_CH_LAYOUT_STEREO) ^~~~~~~~~~~~~~~ ch_layouts /usr/local/include/libavcodec/codec.h:230:28: note: 'ch_layouts' declared here const AVChannelLayout *ch_layouts; ^ ../src/frame-writer.cpp:463:41: error: invalid operands to binary expression ('const AVChannelLayout' and 'unsigned long long') if (codec->channel_layouts[i] == AV_CH_LAYOUT_STEREO) ~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~ ../src/frame-writer.cpp:464:29: error: no member named 'channel_layouts' in 'AVCodec'; did you mean 'ch_layouts'? return codec->channel_layouts[i]; ^~~~~~~~~~~~~~~ ch_layouts /usr/local/include/libavcodec/codec.h:230:28: note: 'ch_layouts' declared here const AVChannelLayout *ch_layouts; ^ ../src/frame-writer.cpp:464:22: error: no viable conversion from returned value of type 'const AVChannelLayout' to function return type 'uint64_t' (aka 'unsigned long') return codec->channel_layouts[i]; ^~~~~~~~~~~~~~~~~~~~~~~~~ ../src/frame-writer.cpp:467:21: error: no member named 'channel_layouts' in 'AVCodec'; did you mean 'ch_layouts'? return codec->channel_layouts[0]; ^~~~~~~~~~~~~~~ ch_layouts /usr/local/include/libavcodec/codec.h:230:28: note: 'ch_layouts' declared here const AVChannelLayout *ch_layouts; ^ ../src/frame-writer.cpp:467:14: error: no viable conversion from returned value of type 'const AVChannelLayout' to function return type 'uint64_t' (aka 'unsigned long') return codec->channel_layouts[0]; ^~~~~~~~~~~~~~~~~~~~~~~~~ ../src/frame-writer.cpp:542:20: error: no member named 'channel_layout' in 'AVCodecContext' audioCodecCtx->channel_layout = get_codec_channel_layout(codec); ~~~~~~~~~~~~~ ^ ../src/frame-writer.cpp:545:20: error: no member named 'channels' in 'AVCodecContext' audioCodecCtx->channels = av_get_channel_layout_nb_channels(audioCodecCtx->channel_layout); ~~~~~~~~~~~~~ ^ ../src/frame-writer.cpp:545:80: error: no member named 'channel_layout' in 'AVCodecContext' audioCodecCtx->channels = av_get_channel_layout_nb_channels(audioCodecCtx->channel_layout); ~~~~~~~~~~~~~ ^ ../src/frame-writer.cpp:568:5: error: use of undeclared identifier 'av_opt_set_channel_layout'; did you mean 'av_opt_set_chlayout'? av_opt_set_channel_layout(swrCtx, "in_channel_layout", AV_CH_LAYOUT_STEREO, 0); ^~~~~~~~~~~~~~~~~~~~~~~~~ av_opt_set_chlayout /usr/local/include/libavutil/opt.h:789:5: note: 'av_opt_set_chlayout' declared here int av_opt_set_chlayout(void *obj, const char *name, const AVChannelLayout *layout, int search_flags); ^ ../src/frame-writer.cpp:568:60: error: cannot initialize a parameter of type 'const AVChannelLayout *' with an rvalue of type 'unsigned long long' av_opt_set_channel_layout(swrCtx, "in_channel_layout", AV_CH_LAYOUT_STEREO, 0); ^~~~~~~~~~~~~~~~~~~ /usr/local/include/libavutil/channel_layout.h:205:40: note: expanded from macro 'AV_CH_LAYOUT_STEREO' ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/libavutil/opt.h:789:77: note: passing argument to parameter 'layout' here int av_opt_set_chlayout(void *obj, const char *name, const AVChannelLayout *layout, int search_flags); ^ ../src/frame-writer.cpp:569:76: error: no member named 'channel_layout' in 'AVCodecContext' av_opt_set_channel_layout(swrCtx, "out_channel_layout", audioCodecCtx->channel_layout, 0); ~~~~~~~~~~~~~ ^ ../src/frame-writer.cpp:859:13: error: no member named 'channel_layout' in 'AVFrame' inputf->channel_layout = AV_CH_LAYOUT_STEREO; ~~~~~~ ^ ../src/frame-writer.cpp:868:14: error: no member named 'channel_layout' in 'AVFrame' outputf->channel_layout = audioCodecCtx->channel_layout; ~~~~~~~ ^ ../src/frame-writer.cpp:868:46: error: no member named 'channel_layout' in 'AVCodecContext' outputf->channel_layout = audioCodecCtx->channel_layout; ~~~~~~~~~~~~~ ^ Reported by: antoine (via bug 278705 exp-run) --- multimedia/wf-recorder/Makefile | 3 +++ multimedia/wf-recorder/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/multimedia/wf-recorder/Makefile b/multimedia/wf-recorder/Makefile index ad04fcbc2f32..d2117c6d2fc5 100644 --- a/multimedia/wf-recorder/Makefile +++ b/multimedia/wf-recorder/Makefile @@ -4,6 +4,9 @@ PORTREVISION= 1 CATEGORIES= multimedia wayland MASTER_SITES= https://github.com/ammen99/wf-recorder/releases/download/v${DISTVERSION}/ +PATCH_SITES= https://github.com/ammen99/${PORTNAME}/commit/ +PATCHFILES+= 239829231e6b.patch:-p1 # https://github.com/ammen99/wf-recorder/pull/262 + MAINTAINER= ports@FreeBSD.org COMMENT= Screen recorder for wlroots-based compositors WWW= https://github.com/ammen99/wf-recorder diff --git a/multimedia/wf-recorder/distinfo b/multimedia/wf-recorder/distinfo index cc305428b5e8..0e8d52678837 100644 --- a/multimedia/wf-recorder/distinfo +++ b/multimedia/wf-recorder/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1693891097 SHA256 (wf-recorder-0.4.1.tar.xz) = 502ba54db8aaf5ebd280738f065c73409694a1440b9a660ef5c4e398714c51f7 SIZE (wf-recorder-0.4.1.tar.xz) = 26184 +SHA256 (239829231e6b.patch) = a3542558964c088cd88da521aaa4708b9cb8246803dd8a6367dff25b9c4b3f40 +SIZE (239829231e6b.patch) = 4075