diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile index 8e97ea7f04de..718aecff95ff 100644 --- a/comms/scrcpy/Makefile +++ b/comms/scrcpy/Makefile @@ -1,50 +1,53 @@ PORTNAME= scrcpy DISTVERSIONPREFIX= v -DISTVERSION= 1.25 +DISTVERSION= 2.0 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} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 6b769675fa68e60c9765022e43c4d7b1e329353a.patch:-p1 + 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 desktop-file-utils 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 \ 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 b1472710862e..eecda976e961 100644 --- a/comms/scrcpy/distinfo +++ b/comms/scrcpy/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1674893057 -SHA256 (scrcpy-server-v1.25) = ce0306c7bbd06ae72f6d06f7ec0ee33774995a65de71e0a83813ecb67aec9bdb -SIZE (scrcpy-server-v1.25) = 42151 -SHA256 (Genymobile-scrcpy-v1.25_GH0.tar.gz) = dfecc9dcffd45540bef88a7e346d37bead3665a5c868a5a95c5ec7bfed43ad07 -SIZE (Genymobile-scrcpy-v1.25_GH0.tar.gz) = 345594 +TIMESTAMP = 1678617692 +SHA256 (scrcpy-server-v2.0) = 9e241615f578cd690bb43311000debdecf6a9c50a7082b001952f18f6f21ddc2 +SIZE (scrcpy-server-v2.0) = 52867 +SHA256 (Genymobile-scrcpy-v2.0_GH0.tar.gz) = a256241dd178ab103e4a119d0387f348c10ac513f25a7ca4859bd53ca5e7d43f +SIZE (Genymobile-scrcpy-v2.0_GH0.tar.gz) = 375902 +SHA256 (6b769675fa68e60c9765022e43c4d7b1e329353a.patch) = b9eebe81d56c7e91b6834db00725059cf41ef3ad4e1b3bfa6875fa0f1576f30c +SIZE (6b769675fa68e60c9765022e43c4d7b1e329353a.patch) = 2139 diff --git a/comms/scrcpy/files/patch-app_meson.build b/comms/scrcpy/files/patch-app_meson.build index fc2eaca88b2d..e4bd3fdd970f 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 2022-12-22 11:33:29 UTC +--- app/meson.build.orig 2023-03-12 01:05:37 UTC +++ app/meson.build -@@ -46,8 +46,8 @@ src = [ +@@ -54,8 +54,8 @@ src = [ 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' -@@ -233,10 +233,10 @@ install_data('data/icon.png', +@@ -236,10 +236,10 @@ install_data('data/icon.png', 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'))