Use meson feature DONOTMERGEYET

Use: https://mesonbuild.com/Reference-manual_returned_feature.html#featurerequire
once we require meson 0.59

FAQ.md

@@ -168,7 +168,8 @@ The default text injection method is [limited to ASCII characters][text-input].
 A trick allows to also inject some [accented characters][accented-characters],
 but that's all. See [#37].
 
-Since scrcpy v1.20, it is possible to simulate a [physical keyboard][hid] (HID).
+Since scrcpy v1.20 on Linux, it is possible to simulate a [physical
+keyboard][hid] (HID).
 
 [text-input]: https://github.com/Genymobile/scrcpy/issues?q=is%3Aopen+is%3Aissue+label%3Aunicode
 [accented-characters]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-accented-characters

README.md

@@ -80,22 +80,16 @@ On Arch Linux:
 pacman -S scrcpy
 ```
 
-On Fedora, a [COPR] package is available: [`scrcpy`][copr-link]:
-
-```
-dnf copr enable zeno/scrcpy
-dnf install scrcpy
-```
-
-[COPR]: https://fedoraproject.org/wiki/Category:Copr
-[copr-link]: https://copr.fedorainfracloud.org/coprs/zeno/scrcpy/
-
 A [Snap] package is available: [`scrcpy`][snap-link].
 
 [snap-link]: https://snapstats.org/snaps/scrcpy
 
 [snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager)
 
+For Fedora, a [COPR] package is available: [`scrcpy`][copr-link].
+
+[COPR]: https://fedoraproject.org/wiki/Category:Copr
+[copr-link]: https://copr.fedorainfracloud.org/coprs/zeno/scrcpy/
 
 
 For Gentoo, an [Ebuild] is available: [`scrcpy/`][ebuild-link].

app/meson.build

@@ -69,12 +69,12 @@ else
     endif
 endif
 
-v4l2_support = get_option('v4l2') and host_machine.system() == 'linux'
+v4l2_support = get_option('v4l2').enabled() and host_machine.system() == 'linux'
 if v4l2_support
     src += [ 'src/v4l2_sink.c' ]
 endif
 
-usb_support = get_option('usb')
+usb_support = get_option('usb').enabled()
 if usb_support
     src += [
         'src/usb/aoa_hid.c',

app/src/demuxer.c

@@ -95,29 +95,27 @@ sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
     // A config packet must not be decoded immediately (it contains no
     // frame); instead, it must be concatenated with the future data packet.
     if (demuxer->pending || is_config) {
-        size_t offset;
         if (demuxer->pending) {
-            offset = demuxer->pending->size;
+            size_t offset = demuxer->pending->size;
             if (av_grow_packet(demuxer->pending, packet->size)) {
                 LOG_OOM();
                 return false;
             }
+
+            memcpy(demuxer->pending->data + offset, packet->data, packet->size);
         } else {
-            offset = 0;
             demuxer->pending = av_packet_alloc();
             if (!demuxer->pending) {
                 LOG_OOM();
                 return false;
             }
-            if (av_new_packet(demuxer->pending, packet->size)) {
+            if (av_packet_ref(demuxer->pending, packet)) {
                 LOG_OOM();
                 av_packet_free(&demuxer->pending);
                 return false;
             }
         }
 
-        memcpy(demuxer->pending->data + offset, packet->data, packet->size);
-
         if (!is_config) {
             // prepare the concat packet to send to the decoder
             demuxer->pending->pts = packet->pts;

app/src/screen.c

@@ -306,14 +306,13 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
 }
 
 
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
 
 #ifdef CONTINUOUS_RESIZING_WORKAROUND
 // On Windows and MacOS, resizing blocks the event loop, so resizing events are
-// not triggered. On MacOS, as a workaround, handle them in an event handler
+// not triggered. As a workaround, handle them in an event handler.
-// (it does not work for Windows unfortunately).
 //
 // <https://bugzilla.libsdl.org/show_bug.cgi?id=2077>
 // <https://stackoverflow.com/a/40693139/1987178>

install_release.sh

@@ -12,7 +12,7 @@ echo "$PREBUILT_SERVER_SHA256  scrcpy-server" | sha256sum --check
 
 echo "[scrcpy] Building client..."
 rm -rf "$BUILDDIR"
-meson "$BUILDDIR" --buildtype=release --strip -Db_lto=true \
+meson setup "$BUILDDIR" --buildtype=release --strip -Db_lto=true \
     -Dprebuilt_server=scrcpy-server
 cd "$BUILDDIR"
 ninja

meson_options.txt

@@ -4,5 +4,5 @@ option('prebuilt_server', type: 'string', description: 'Path of the prebuilt ser
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
 option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")')
-option('v4l2', type: 'boolean', value: true, description: 'Enable V4L2 feature when supported')
+option('v4l2', type: 'feature', value: 'enabled', description: 'Enable V4L2 feature when supported')
-option('usb', type: 'boolean', value: true, description: 'Enable HID/OTG features when supported')
+option('usb', type: 'feature', value: 'enabled', description: 'Enable HID/OTG features when supported')