diff options
Diffstat (limited to '')
| -rw-r--r-- | Mk/Uses/nodejs.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/vala.mk | 12 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.options.desc.mk | 1 |
4 files changed, 14 insertions, 7 deletions
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index e8987827fe2e..c1666835554a 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -7,7 +7,7 @@ # - build use node as build-time dependency # - run use node as runtime dependency # - env set the environment (NODEJS_VERSION and NODEJS_SUFFIX) -# - version available version: lts, current, 18, 20, 22, 24 +# - version available version: lts, current, 20, 22, 24 # # Note: # - The supported versions follow upstream release schedule @@ -22,13 +22,13 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSIONS= 18 20 22 24 current lts +_VALID_NODEJS_VERSIONS= 20 22 24 current lts . if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}} IGNORE= Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS} . endif -. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N24) +. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24) IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS} . endif diff --git a/Mk/Uses/vala.mk b/Mk/Uses/vala.mk index a12834d81fb7..53aef616e9cb 100644 --- a/Mk/Uses/vala.mk +++ b/Mk/Uses/vala.mk @@ -1,9 +1,12 @@ # Handle dependency on lang/vala # # Valid args: -# - lib: add a lib depends -# - build: add a build depends -# - no_depend: only used for lang/vala itself +# - lib: add a lib depends +# - build: add a build depends +# - test: add a test depends +# - no_depend: only used for lang/vala itself +# +# MAINTAINER: desktop@FreeBSD.org .if ! defined(_INCLUDE_USES_VALA_MK) _INCLUDE_USES_VALA_MK= yes @@ -21,6 +24,9 @@ LIB_DEPENDS+= ${_VALA_LIBRARY}:${_VALA_PORT} . if ! empty(vala_ARGS:Mbuild) BUILD_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT} . endif +. if ! empty(vala_ARGS:Mtest) +TEST_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT} +. endif . endif .endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index d5abf9e90706..64e981bbd347 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -109,7 +109,7 @@ MONO_DEFAULT?= 5.20 MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja -# Possible value: 18, 20, 22, 24, current, lts (Note: current = 24 and lts = 22) +# Possible value: 20, 22, 24, current, lts (Note: current = 24 and lts = 22) NODEJS_DEFAULT?= lts # Possible value: 25, 26 OPENLDAP_DEFAULT?= 26 diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 0460f2782076..6e872b227a9f 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -522,6 +522,7 @@ VAAPI_DESC?= VAAPI (GPU video acceleration) support VAPI_DESC?= Build VALA API files VDPAU_DESC?= VDPAU (GPU video acceleration) support VIDEO_DESC?= Video support +VULKAN_DESC?= Vulkan GPU support VO_AACENC_DESC?= AAC audio encoding via vo-aacenc VO_AMRWBENC_DESC?= AMR Wide Band encoding via vo-amrwbenc VORBIS_DESC?= Ogg Vorbis audio codec support |