pkgsrc-WIP-changes archive

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

electron32: move PLIST_VARS to platform.mk, set electron version in *DEPENDS



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue Mar 4 14:12:03 2025 +0100
Changeset:	cbf1b754269a1b6c531dfabb9051d15fc5482eda

Modified Files:
	electron32/Makefile
	electron32/platform.mk

Log Message:
electron32: move PLIST_VARS to platform.mk, set electron version in *DEPENDS

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

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

diffstat:
 electron32/Makefile    |  2 --
 electron32/platform.mk | 10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs:
diff --git a/electron32/Makefile b/electron32/Makefile
index e6f24e46ac..c5c93c7f49 100644
--- a/electron32/Makefile
+++ b/electron32/Makefile
@@ -205,11 +205,9 @@ GN_ARGS+=	enable_rust=true \
 		rust_sysroot_absolute="${PREFIX}" \
 		rustc_version="${RUSTC_VERSION:sh}"
 
-PLIST_VARS+=		swiftshader
 .if ${MACHINE_ARCH} == "aarch64"
 FFMPEG_TARGET=		arm64
 .elif ${MACHINE_ARCH} == "x86_64"
-PLIST.swiftshader=	yes
 FFMPEG_TARGET=		x64
 .endif
 
diff --git a/electron32/platform.mk b/electron32/platform.mk
index a1a89dd0e1..96879098e4 100644
--- a/electron32/platform.mk
+++ b/electron32/platform.mk
@@ -17,9 +17,9 @@ USE_ELECTRON?=		electronpkg
 
 TOOL_DEPENDS+=		nodejs-${NODE_VERSION_DEFAULT}.*:../../lang/nodejs${NODE_VERSION_DEFAULT}
 .if ${USE_ELECTRON} == "dependency"
-DEPENDS+=		${ELECTRON}-[0-9]*:../../wip/${ELECTRON}
+DEPENDS+=		${ELECTRON}>=${ELECTRON_VER}:../../wip/${ELECTRON}
 .elif ${USE_ELECTRON} == "bundled"
-TOOL_DEPENDS+=		${ELECTRON}-[0-9]*:../../wip/${ELECTRON}
+TOOL_DEPENDS+=		${ELECTRON}>=${ELECTRON_VER}:../../wip/${ELECTRON}
 .endif
 
 .include "../../mk/bsd.prefs.mk"
@@ -38,6 +38,12 @@ FILES_SUBST+=		ELECTRON=${ELECTRON}
 FILES_SUBST+=		ELECTRONBIN=${ELECTRONBIN}
 
 .if ${USE_ELECTRON} == "bundled" || ${USE_ELECTRON} == "electronpkg"
+
+PLIST_VARS+=		swiftshader
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST.swiftshader=	yes
+.endif
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../audio/speech-dispatcher/buildlink3.mk"


Home | Main Index | Thread Index | Old Index