From nobody Mon Sep 30 14:08:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHNGW3D4hz5X90g; Mon, 30 Sep 2024 14:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHNGW0hMjz4Ps9; Mon, 30 Sep 2024 14:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727705331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jiuju8f1ma05hgcFcpaLNnDvZ/zRH6pSHRJ7AvXuO3Y=; b=xR5idXHJvmGLtqGozbAmRLsg9/+xeVO/Dn4c/4dtKcxJ+xzlKC178MsYIbUQFuYCn2Q6n2 plK8Ox8703J19tTOO8qY+I0zhCqf3haIu8WqiKP8s54nDo1FOleOobUm0D8kn0g6IJKPHb 6nzBKRQyVds7YVHAhklXF4vHQndBWn5isEpkPvqiJWld8wKeTNbmFLk8R/mpZI8zkALM2w v29+OF6BezjH1r7jjRSmTg/ynCf5qko1Vo5JI4YircILAO3TTSLvmaufR7kRZ9pAAPRZoc Yw+pHD/mnMpXwpd/yDdx5jujBlCoCbDzHcFoNUpglSIU0G3f5KdaO1MrCa1Pig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727705331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jiuju8f1ma05hgcFcpaLNnDvZ/zRH6pSHRJ7AvXuO3Y=; b=B1vQleN3RzAgPmnv+L6ihYoRQ7/3mrJj+DIzbZY0ISw9h/yauv13xZATLt/SrsLNkmT99+ Q0jGjAfKkbj0JbtMHMzjew5eTEszokzFD4PexGD9/TkHIJOc+kh0uDU50kZkaI9KrVGolW tseGtofnjPGZ7RcpoyoxbCUdw2VAVM2G9YKRAQ5rEp+VT0ytqxh+1iEs8AUzeJB3Q2RUa+ yD5NVBwwxDiH+7zRLrPWWbuNAtKcDjfo8YNNPiaDZAOadHa1sYYH88e7p2D1453KBcWIxW /M/GlwN7aV6DDxVCHmcC54OHxTsv+XEq3J0R3a/Z5otjXUHaBaZPtDpwZRLA9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727705331; a=rsa-sha256; cv=none; b=BKyrr+enX8OvF5M5bIa+inMl/9G5EenFXw6TuIkT/hrQzdBHNHyerWYoJbto9swjJG97GT h3VcylvJSXKVvOtJPnz1/SOgjVgwmG5XV+EoGabzfZ+78PYjvi9Xew1eAXQ6MvAYuZf6bS Z3BlqWGogD3CZIwDAcHupE3QYrTVDgQH6e5uGXePJB1tPbdjO2fxETtcMR9iaWo1QHOHRr ksIp12ziKvVsv/UIL+eDFFr/SF3v35ZfVnFry2JZsWFVCrivPy994pI7BkQsR5onM689+3 V/0t4UlJMi9+ZUf1KxkYrF3s1geRaSaaYytHzUD2+aJe2n7oc9p37M1ERMXGCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHNGW09tMzws2; Mon, 30 Sep 2024 14:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UE8oR7072493; Mon, 30 Sep 2024 14:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UE8oqU072490; Mon, 30 Sep 2024 14:08:50 GMT (envelope-from git) Date: Mon, 30 Sep 2024 14:08:50 GMT Message-Id: <202409301408.48UE8oqU072490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 3377cfa4c2e7 - main - multimedia/droidcam: Fix previous patch and minor changes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3377cfa4c2e7ab8a4b29fb977588de6e9b72b22c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=3377cfa4c2e7ab8a4b29fb977588de6e9b72b22c commit 3377cfa4c2e7ab8a4b29fb977588de6e9b72b22c Author: Yusuf Yaman AuthorDate: 2024-09-29 21:09:12 +0000 Commit: Robert Clausecker CommitDate: 2024-09-30 14:07:48 +0000 multimedia/droidcam: Fix previous patch and minor changes This patch fixes 281586 by adding forgotten directory pointing to the program's icon path. Also, now it uses ${PORTNAME} wherever it's possible and replaces program's installation path with ${PREFIX} in program's .desktop file. PR: 281720 Fixes: adc8361b87972451ffbfe619aa714bc2fd2fa024 --- multimedia/droidcam/Makefile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/multimedia/droidcam/Makefile b/multimedia/droidcam/Makefile index 5bcd3594181f..eadf870b2da6 100644 --- a/multimedia/droidcam/Makefile +++ b/multimedia/droidcam/Makefile @@ -1,7 +1,7 @@ PORTNAME= droidcam DISTVERSIONPREFIX= v DISTVERSION= 2.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= nxjoseph@protonmail.com @@ -28,11 +28,11 @@ LIB_DEPENDS= libappindicator3.so:devel/libappindicator \ libpango-1.0.so:x11-toolkits/pango \ libpangocairo-1.0.so:x11-toolkits/pango \ libspeex.so:audio/speex \ + libswscale.so:multimedia/ffmpeg \ libturbojpeg.so:graphics/libjpeg-turbo \ libusbmuxd-2.0.so:comms/libusbmuxd \ libwayland-client.so:graphics/wayland \ - libX11.so:x11/libX11 \ - libswscale.so:multimedia/ffmpeg + libX11.so:x11/libX11 RUN_DEPENDS= adb:devel/android-tools \ ffmpeg:multimedia/ffmpeg \ usbmuxd:comms/usbmuxd \ @@ -45,10 +45,10 @@ GH_PROJECT= droidcam-linux-client USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 pango USE_XORG= x11 -PLIST_FILES= bin/droidcam \ - bin/droidcam-cli \ - share/applications/droidcam.desktop \ - share/pixmaps/droidcam-icon.png +PLIST_FILES= bin/${PORTNAME} \ + bin/${PORTNAME}-cli \ + share/applications/${PORTNAME}.desktop \ + share/pixmaps/${PORTNAME}-icon.png OPTIONS_DEFINE= NLS OPTIONS_SUB= yes @@ -57,17 +57,21 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls pre-configure: - ${REINPLACE_CMD} -e 's,/opt/droidcam-icon.png,${PREFIX}/pixmaps/droidcam-icon.png,' \ - ${WRKSRC}/src/droidcam.c ${WRKSRC}/droidcam.desktop + ${REINPLACE_CMD} -e 's,/opt/${PORTNAME}-icon.png,${PREFIX}/share/pixmaps/${PORTNAME}-icon.png,' \ + ${WRKSRC}/src/${PORTNAME}.c \ + ${WRKSRC}/${PORTNAME}.desktop + ${REINPLACE_CMD} -e 's,Exec=/usr/local/bin/${PORTNAME},${PREFIX}/bin/${PORTNAME},' \ + -e 's,TryExec=/usr/local/bin/${PORTNAME},${PREFIX}/bin/${PORTNAME},' \ + ${WRKSRC}/${PORTNAME}.desktop do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/droidcam \ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/droidcam-cli \ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-cli \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/icon2.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/droidcam-icon.png - ${INSTALL_DATA} ${WRKSRC}/droidcam.desktop \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}-icon.png + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications .include