diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile index 3d7ba65e1b0c..db04cc505e9a 100644 --- a/comms/scrcpy/Makefile +++ b/comms/scrcpy/Makefile @@ -1,51 +1,50 @@ PORTNAME= scrcpy DISTVERSIONPREFIX= v -DISTVERSION= 2.3.1 -PORTREVISION= 1 +DISTVERSION= 2.4 CATEGORIES= comms net MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:server DISTFILES= ${SERVER_FILE}:server EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= tagattie@FreeBSD.org COMMENT= Display and control your Android device WWW= https://github.com/Genymobile/scrcpy LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg RUN_DEPENDS= adb:devel/android-tools USES= compiler:c++11-lang meson pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= Genymobile USE_SDL= sdl2 MESON_ARGS= -Dportable=false \ -Dprebuilt_server=${WRKSRC}/${SERVER_FILE} PLIST_FILES= bin/scrcpy \ etc/bash_completion.d/scrcpy \ share/man/man1/scrcpy.1.gz \ share/applications/scrcpy-console.desktop \ share/applications/scrcpy.desktop \ share/icons/hicolor/256x256/apps/scrcpy.png \ ${DATADIR}/scrcpy-server \ share/zsh/site-functions/_scrcpy PORTDOCS= FAQ.md README.md OPTIONS_DEFINE= DOCS SERVER_FILE= ${PORTNAME}-server-${DISTVERSIONFULL} post-extract: ${CP} ${DISTDIR}/${SERVER_FILE} ${WRKSRC} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/comms/scrcpy/distinfo b/comms/scrcpy/distinfo index cde56647280c..c7ff75f3e153 100644 --- a/comms/scrcpy/distinfo +++ b/comms/scrcpy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1702586630 -SHA256 (scrcpy-server-v2.3.1) = f6814822fc308a7a532f253485c9038183c6296a6c5df470a9e383b4f8e7605b -SIZE (scrcpy-server-v2.3.1) = 66007 -SHA256 (Genymobile-scrcpy-v2.3.1_GH0.tar.gz) = 76f38779f00d91d0b46a399ebca32c82ff1facdbd843871b7e46c2e7cad38a42 -SIZE (Genymobile-scrcpy-v2.3.1_GH0.tar.gz) = 401278 +TIMESTAMP = 1709722935 +SHA256 (scrcpy-server-v2.4) = 93c272b7438605c055e127f7444064ed78fa9ca49f81156777fd201e79ce7ba3 +SIZE (scrcpy-server-v2.4) = 69007 +SHA256 (Genymobile-scrcpy-v2.4_GH0.tar.gz) = 60596f6d4c11163083da3e6805666326873ed57f7defd8a20256b928a1d3503b +SIZE (Genymobile-scrcpy-v2.4_GH0.tar.gz) = 411206 diff --git a/comms/scrcpy/files/patch-app_meson.build b/comms/scrcpy/files/patch-app_meson.build index dd5e6f2abccd..8cdc0da19149 100644 --- a/comms/scrcpy/files/patch-app_meson.build +++ b/comms/scrcpy/files/patch-app_meson.build @@ -1,26 +1,26 @@ ---- app/meson.build.orig 2023-11-25 20:40:27 UTC +--- app/meson.build.orig 2024-03-02 22:22:09 UTC +++ app/meson.build -@@ -56,8 +56,8 @@ conf = configuration_data() +@@ -61,8 +61,8 @@ conf = configuration_data() conf = configuration_data() -conf.set('_POSIX_C_SOURCE', '200809L') -conf.set('_XOPEN_SOURCE', '700') +# conf.set('_POSIX_C_SOURCE', '200809L') +# conf.set('_XOPEN_SOURCE', '700') conf.set('_GNU_SOURCE', true) if host_machine.system() == 'windows' -@@ -185,10 +185,10 @@ install_data('data/bash-completion/scrcpy', +@@ -190,10 +190,10 @@ install_data('data/bash-completion/scrcpy', install_data('data/zsh-completion/_scrcpy', install_dir: join_paths(datadir, 'zsh/site-functions')) install_data('data/bash-completion/scrcpy', - install_dir: join_paths(datadir, 'bash-completion/completions')) + install_dir: 'etc/bash_completion.d') # Desktop entry file for application launchers -if host_machine.system() == 'linux' +if host_machine.system() == 'linux' or host_machine.system() == 'freebsd' # Install a launcher (ex: /usr/local/share/applications/scrcpy.desktop) install_data('data/scrcpy.desktop', install_dir: join_paths(datadir, 'applications')) diff --git a/comms/scrcpy/files/patch-app_src_usb_aoa__hid.h b/comms/scrcpy/files/patch-app_src_usb_aoa__hid.h index 703fb0574852..cce8803763f5 100644 --- a/comms/scrcpy/files/patch-app_src_usb_aoa__hid.h +++ b/comms/scrcpy/files/patch-app_src_usb_aoa__hid.h @@ -1,11 +1,11 @@ ---- app/src/usb/aoa_hid.h.orig 2022-06-30 04:28:03 UTC +--- app/src/usb/aoa_hid.h.orig 2024-03-02 22:22:09 UTC +++ app/src/usb/aoa_hid.h @@ -4,7 +4,7 @@ #include #include -#include +#include + #include "hid/hid_event.h" #include "usb.h" - #include "util/acksync.h"