pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

scrcpy: update to 4.0, switch to wip/android-tools



Module Name:	pkgsrc-wip
Committed By:	Mike Volokhov <mike.volokhov%gmail.com@localhost>
Pushed By:	mishka
Date:		Sun May 24 20:59:54 2026 +0300
Changeset:	c07531fb0f9ae04e1a8e376b4d96db032ceae837

Modified Files:
	scrcpy/Makefile
	scrcpy/PLIST
	scrcpy/distinfo
Removed Files:
	scrcpy/TODO

Log Message:
scrcpy: update to 4.0, switch to wip/android-tools

Upstream 4.0 switches from SDL2 to SDL3; ffmpeg buildlink moved
from ffmpeg7 to ffmpeg8 (the version active in pkgsrc). PLIST
gains data/disconnected.png, shown by the client when the device
goes away.

DEPENDS replaces devel/android-tools-adb (the Android 5.x C-era
adb from 2015) with wip/android-tools, the modern AOSP adb/fastboot
packaged from nmeum/android-tools. The legacy adb fails to push
the scrcpy server to current devices with "protocol fault (no
status)", which manifests as scrcpy starting and then doing
nothing - no client window.

SERVERFILE/SITES.* now derive the version from DISTNAME via a
local VERSION variable, so a future bump only has to touch
DISTNAME. PKGVERSION_NOREV cannot be used here: bsd.pkg.mk
defines it, and the SITES.${file} key is resolved at parse time
before that include runs.

Drops the TODO referencing CVE-2025-34449; 4.0 includes the
upstream server fix.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c07531fb0f9ae04e1a8e376b4d96db032ceae837

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scrcpy/Makefile | 17 +++++++++--------
 scrcpy/PLIST    |  1 +
 scrcpy/TODO     |  2 --
 scrcpy/distinfo | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs:
diff --git a/scrcpy/Makefile b/scrcpy/Makefile
index 3bc71e2339..ad718f797a 100644
--- a/scrcpy/Makefile
+++ b/scrcpy/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	scrcpy-3.2
+DISTNAME=	scrcpy-4.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Genymobile/}
 GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
@@ -12,23 +12,24 @@ LICENSE=	apache-2.0
 
 USE_TOOLS+=	pkg-config bash
 
-WRKSRC=	${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
-DEPENDS+=	android-tools-adb-[0-9]*:../../devel/android-tools-adb
+DEPENDS+=	android-tools>=34:../../wip/android-tools
 
-SERVERFILE=		scrcpy-server-v3.2
+VERSION=		${DISTNAME:S/scrcpy-//}
+SERVERFILE=		scrcpy-server-v${VERSION}
 DISTFILES=		${DEFAULT_DISTFILES} ${SERVERFILE}
 SERVERTGTFILE=		${WRKSRC}/server/scrcpy-server
-SITES.${SERVERFILE}=	${MASTER_SITE_GITHUB:=Genymobile/}/scrcpy/releases/download/v3.2/
+SITES.${SERVERFILE}=	${MASTER_SITE_GITHUB:=Genymobile/scrcpy/releases/download/v${VERSION}/}
 MESON_ARGS+=		-Dprebuilt_server=${SERVERTGTFILE}
 
 post-extract:
 	mv ${WRKDIR}/${SERVERFILE} ${SERVERTGTFILE}
 
-.include "../../devel/meson/build.mk"
 .include "../../devel/cmake/build.mk"
-.include "../../multimedia/ffmpeg7/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../devel/SDL3/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/ffmpeg8/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/scrcpy/PLIST b/scrcpy/PLIST
index d8d8507dcb..1790874187 100644
--- a/scrcpy/PLIST
+++ b/scrcpy/PLIST
@@ -2,6 +2,7 @@
 bin/scrcpy
 man/man1/scrcpy.1
 share/bash-completion/completions/scrcpy
+share/icons/hicolor/256x256/apps/disconnected.png
 share/icons/hicolor/256x256/apps/scrcpy.png
 share/scrcpy/scrcpy-server
 share/zsh/site-functions/_scrcpy
diff --git a/scrcpy/TODO b/scrcpy/TODO
deleted file mode 100644
index 078d660c8e..0000000000
--- a/scrcpy/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2025-34449
diff --git a/scrcpy/distinfo b/scrcpy/distinfo
index bfcc79bd03..4874b2472a 100644
--- a/scrcpy/distinfo
+++ b/scrcpy/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (scrcpy-3.2.tar.gz) = 951d82cc71dc8f068770f9d2e0b2ae1f82675d025b78f7e84e2d4c0ed4266c62
-SHA512 (scrcpy-3.2.tar.gz) = f2c962193c290772017c7f83fb0872c7cc729a3179269e0ba2f716c7829e68e01609951e4cdf9dffa4877fbfe374ab452507871a677924f8def98bedbebc2b94
-Size (scrcpy-3.2.tar.gz) = 464967 bytes
-BLAKE2s (scrcpy-server-v3.2) = f6662973b314d0bcbe457155a3e159eb26767fff3a20ccd457333e69a6abf218
-SHA512 (scrcpy-server-v3.2) = c2d172c9866924c472d07d51b91914f02e8391b5dbaae99725ed5e44d42f2bbf92deaae4bfe27765a90382991234e44a02c18bc035d69fe4aa6493d2142dfec3
-Size (scrcpy-server-v3.2) = 90888 bytes
+BLAKE2s (scrcpy-4.0.tar.gz) = 6d4b8bc167e08b6c90f7c6ad4f631ca383873687a669cb94cba4971586a1248c
+SHA512 (scrcpy-4.0.tar.gz) = ca905bc7f0991925b21980a5619752fcb7834846cbb9a665da70505ca94021992a11b5653073ed637a6839503c2dc977acf557c9ff8192571aa71480e6ec9b71
+Size (scrcpy-4.0.tar.gz) = 489017 bytes
+BLAKE2s (scrcpy-server-v4.0) = d2495678174193260bfb35f30ec55f2d9c8e0f70797b4d5cab25b6e7f0f9fa8f
+SHA512 (scrcpy-server-v4.0) = 7ebaf385aaafc0251ab506b4850a9b508c1a3da3b7b49f59c1bd54a72f1e7080a01f1270cc7fa8a6060f4b15621e5567ebb228128ad35ec44a7286622bbddb46
+Size (scrcpy-server-v4.0) = 732226 bytes


Home | Main Index | Thread Index | Old Index