git: 5a6c7da77586 - main - comms/scrcpy: update to 1.25

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sun, 29 Jan 2023 07:41:33 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5a6c7da77586a2a37e1902aae94ca2aafc5263fc

commit 5a6c7da77586a2a37e1902aae94ca2aafc5263fc
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-01-29 07:40:31 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-01-29 07:41:23 +0000

    comms/scrcpy: update to 1.25
    
    Changelog: https://github.com/Genymobile/scrcpy/releases/tag/v1.25
---
 comms/scrcpy/Makefile                    |  6 ++++--
 comms/scrcpy/distinfo                    | 10 +++++-----
 comms/scrcpy/files/patch-app_meson.build | 16 ++++++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/comms/scrcpy/Makefile b/comms/scrcpy/Makefile
index f65ff780d1a3..8e97ea7f04de 100644
--- a/comms/scrcpy/Makefile
+++ b/comms/scrcpy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scrcpy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.24
+DISTVERSION=	1.25
 CATEGORIES=	comms net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:server
 DISTFILES=	${SERVER_FILE}:server
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 RUN_DEPENDS=	adb:devel/android-tools
 
-USES=		compiler:c++11-lang meson pkgconfig sdl
+USES=		compiler:c++11-lang desktop-file-utils meson pkgconfig sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Genymobile
@@ -29,6 +29,8 @@ MESON_ARGS=	-Dportable=false \
 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
diff --git a/comms/scrcpy/distinfo b/comms/scrcpy/distinfo
index 198ac7b83914..b1472710862e 100644
--- a/comms/scrcpy/distinfo
+++ b/comms/scrcpy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1656485534
-SHA256 (scrcpy-server-v1.24) = ae74a81ea79c0dc7250e586627c278c0a9a8c5de46c9fb5c38c167fb1a36f056
-SIZE (scrcpy-server-v1.24) = 41159
-SHA256 (Genymobile-scrcpy-v1.24_GH0.tar.gz) = e3054ad453ac577b941f8df0eabc94e842affc6e1d10ba8d21cededfa2eacc73
-SIZE (Genymobile-scrcpy-v1.24_GH0.tar.gz) = 424970
+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
diff --git a/comms/scrcpy/files/patch-app_meson.build b/comms/scrcpy/files/patch-app_meson.build
index 2f80b25a7491..fc2eaca88b2d 100644
--- a/comms/scrcpy/files/patch-app_meson.build
+++ b/comms/scrcpy/files/patch-app_meson.build
@@ -1,4 +1,4 @@
---- app/meson.build.orig	2022-04-28 18:46:28 UTC
+--- app/meson.build.orig	2022-12-22 11:33:29 UTC
 +++ app/meson.build
 @@ -46,8 +46,8 @@ src = [
  
@@ -11,12 +11,16 @@
  conf.set('_GNU_SOURCE', true)
  
  if host_machine.system() == 'windows'
-@@ -230,7 +230,7 @@ install_data('data/icon.png',
+@@ -233,10 +233,10 @@ install_data('data/icon.png',
  install_data('data/zsh-completion/_scrcpy',
-              install_dir: 'share/zsh/site-functions')
+              install_dir: join_paths(datadir, 'zsh/site-functions'))
  install_data('data/bash-completion/scrcpy',
--             install_dir: 'share/bash-completion/completions')
+-             install_dir: join_paths(datadir, 'bash-completion/completions'))
 +             install_dir: 'etc/bash_completion.d')
  
- 
- ### TESTS
+ # 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'))