<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26e490c374ee458730b96947b710e6a6878e9445">https://github.com/macports/macports-ports/commit/26e490c374ee458730b96947b710e6a6878e9445</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 26e490c374e scrcpy: Update to 2.0
</span>26e490c374e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26e490c374ee458730b96947b710e6a6878e9445
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Fri Jun 2 16:08:01 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> scrcpy: Update to 2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Needed a backport from master to fix a build failure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream now has an install target, so drop the manual destroot phase.
</span><span style='display:block; white-space:pre;color:#404040;'> This also gives us a manpage, and completions for the bash and zsh
</span><span style='display:block; white-space:pre;color:#404040;'> shells.
</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/67564
</span>---
multimedia/scrcpy/Portfile | 23 ++++-----
.../6b769675fa68e60c9765022e43c4d7b1e329353a.patch | 54 ++++++++++++++++++++++
2 files changed, 63 insertions(+), 14 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 b501769629c..33910a8d1af 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 1.25 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Genymobile scrcpy 2.0 v
</span> revision 0
categories multimedia
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,13 +24,15 @@ 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 f44a661318638456ea2477adde079d873c35d35f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78d7b2dcecc527dec3e391a6ca022a411a1f7b9b582875aaf329f22e489cb521 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 345630 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5991a252ef7883bf907becf121cbdd84c8baeb90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ed6e86f8df82454252f9d1da7f918e1e1ecab09e06c1a537c86a70b21af7489b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 375926 \
</span> ${name}-server-v${version} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ece066a6d2a86cc1daac5d4eba6367af8c4ad539 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce0306c7bbd06ae72f6d06f7ec0ee33774995a65de71e0a83813ecb67aec9bdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 42151
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 32ee7d41e1e0e393d1c96b9d645d31cbd2626caa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 52867
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +53,3 @@ compiler.c_standard 2011
</span> # Work around cfm: fatal error: 'stdatomic.h' file not found
# https://trac.macports.org/ticket/60429
compiler.blacklist-append {clang < 700}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${workpath}/build/server/${name}-server ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${workpath}/build/app/${name} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch b/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..35a9dc9592c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/scrcpy/files/6b769675fa68e60c9765022e43c4d7b1e329353a.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6b769675fa68e60c9765022e43c4d7b1e329353a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ruoyu Zhong <zhongruoyu@outlook.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 12 Mar 2023 14:23:35 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix an "expected expression" error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In C, a label can only be followed by a statement, not a declaration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+An error in `app/src/screen.c` violated this, and led to a build error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with an error message similar to the one below:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../app/src/screen.c:821:13: error: expected expression
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool ok = sc_screen_init_size(screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /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:#e0ffe0;'>+ #define bool _Bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../app/src/screen.c:822:18: error: use of undeclared identifier 'ok'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ok) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 errors generated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This could be fixed by introducing a new block (or compound statement;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as is already being done in the next `case`). That is a statement.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes #3785 <https://github.com/Genymobile/scrcpy/issues/3785>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PR #3787 <https://github.com/Genymobile/scrcpy/pull/3787>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Romain Vimont <rom@rom1v.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Backport [https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app/src/screen.c | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/app/src/screen.c b/app/src/screen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f74fd8a54..b00b0d051 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./app/src/screen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./app/src/screen.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -816,7 +816,7 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool relative_mode = sc_screen_is_relative_mode(screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (event->type) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case SC_EVENT_SCREEN_INIT_SIZE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case SC_EVENT_SCREEN_INIT_SIZE: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The initial size is passed via screen->frame_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool ok = sc_screen_init_size(screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ok) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -824,6 +824,7 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case SC_EVENT_NEW_FRAME: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool ok = sc_screen_update_frame(screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ok) {
</span></pre><pre style='margin:0'>
</pre>