<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16e6c8c32cf2c5e8c582d59e2fb31c70e4906382">https://github.com/macports/macports-ports/commit/16e6c8c32cf2c5e8c582d59e2fb31c70e4906382</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 16e6c8c32cf scrcpy: Update to version 2.1
</span>16e6c8c32cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16e6c8c32cf2c5e8c582d59e2fb31c70e4906382
</span>Author: Marcel Bochtler <git@bochtler.io>
AuthorDate: Fri Jun 23 15:43:47 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> scrcpy: Update to version 2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Backport for version 2.0 can be removed as the relevant change is
</span><span style='display:block; white-space:pre;color:#404040;'> available in 2.1.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67673
</span>---
multimedia/scrcpy/Portfile | 16 +++----
.../6b769675fa68e60c9765022e43c4d7b1e329353a.patch | 54 ----------------------
2 files changed, 7 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/scrcpy/Portfile b/multimedia/scrcpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33910a8d1af..58f90d548b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/scrcpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/scrcpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup meson 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Genymobile scrcpy 2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Genymobile scrcpy 2.1 v
</span> revision 0
categories multimedia
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +24,13 @@ extract.only ${distfiles}
</span> distfiles-append ${name}-server-v${version}:bootstrap
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5991a252ef7883bf907becf121cbdd84c8baeb90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed6e86f8df82454252f9d1da7f918e1e1ecab09e06c1a537c86a70b21af7489b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 375926 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8981f4fcc6f5ee731b6e4b4aac7462294779de06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3272c42f4f8ef6572af52c28912a1c7a088a6ad80d72897d1bdf40054ec81447 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 385865 \
</span> ${name}-server-v${version} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 32ee7d41e1e0e393d1c96b9d645d31cbd2626caa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 52867
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9ca3608d5555e5118e8c8163295875d89912f94a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5b8bf1940264b930c71a1c614c57da2247f52b2d4240bca865cc6d366dff6688 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56955
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch b/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35a9dc9592c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6b769675fa68e60c9765022e43c4d7b1e329353a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Ruoyu Zhong <zhongruoyu@outlook.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 12 Mar 2023 14:23:35 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix an "expected expression" error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In C, a label can only be followed by a statement, not a declaration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-An error in `app/src/screen.c` violated this, and led to a build error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with an error message similar to the one below:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../app/src/screen.c:821:13: error: expected expression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ok = sc_screen_init_size(screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/13.0.0/include/stdbool.h:15:14: note: expanded from macro 'bool'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define bool _Bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../app/src/screen.c:822:18: error: use of undeclared identifier 'ok'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ok) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 errors generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This could be fixed by introducing a new block (or compound statement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-as is already being done in the next `case`). That is a statement.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #3785 <https://github.com/Genymobile/scrcpy/issues/3785>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PR #3787 <https://github.com/Genymobile/scrcpy/pull/3787>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Romain Vimont <rom@rom1v.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- app/src/screen.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/app/src/screen.c b/app/src/screen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f74fd8a54..b00b0d051 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./app/src/screen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./app/src/screen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -816,7 +816,7 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool relative_mode = sc_screen_is_relative_mode(screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (event->type) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case SC_EVENT_SCREEN_INIT_SIZE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case SC_EVENT_SCREEN_INIT_SIZE: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The initial size is passed via screen->frame_size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ok = sc_screen_init_size(screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ok) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -824,6 +824,7 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case SC_EVENT_NEW_FRAME: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool ok = sc_screen_update_frame(screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ok) {
</span></pre><pre style='margin:0'>
</pre>