aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-02-01 03:40:26 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-02-01 04:15:19 +0000
commit6e5fbe03627457232a9e6de9f52eddae1f715ebf (patch)
tree45c7fa117938a33a90f852125a20822daafae8b9
parentf403d78e327f3c57255e25a7243ecc3493427812 (diff)
downloadports-6e5fbe03627457232a9e6de9f52eddae1f715ebf.tar.gz
ports-6e5fbe03627457232a9e6de9f52eddae1f715ebf.zip
multimedia/ffmpeg: swap _IMPLIES for VULKAN and GLSLANG
- Vulkan Video doesn't need either glslang or shaderc - For consistency with graphics/libplacebo PR: 276469 Suggested by: vvd (cherry picked from commit 4fae7617b7396542c4436eddbbf65c52f825c516)
-rw-r--r--multimedia/ffmpeg/Makefile5
-rw-r--r--multimedia/ffmpeg4/Makefile2
2 files changed, 4 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 102a7de8ef0d..c9e7b014717d 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -47,7 +47,7 @@ OPTIONS_DEFINE_i386= MFX
OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
GNUTLS HARFBUZZ ICONV JXL LAME LCMS2 LIBPLACEBO LIBXML2 NETWORK \
- OPTIMIZED_CFLAGS OPUS RTCPU SVTAV1 V4L VAAPI VDPAU VMAF \
+ OPTIMIZED_CFLAGS OPUS RTCPU SHADERC SVTAV1 V4L VAAPI VDPAU VMAF \
VORBIS VPX VULKAN WEBP X264 X265 XCB
OPTIONS_DEFAULT_amd64= NVENC
OPTIONS_DEFAULT_i386= NVENC
@@ -266,6 +266,7 @@ GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \
spirv-tools>0:graphics/spirv-tools
GLSLANG_CONFIGURE_ENABLE= libglslang
GLSLANG_LDFLAGS= -lm
+GLSLANG_IMPLIES= VULKAN
# gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
@@ -467,6 +468,7 @@ SDL_CONFIGURE_ENABLE= sdl2
# shaderc
SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc
SHADERC_CONFIGURE_ENABLE= libshaderc
+SHADERC_IMPLIES= VULKAN
SHADERC_PREVENTS= GLSLANG
# smbclient
@@ -584,7 +586,6 @@ VPX_CONFIGURE_ENABLE= libvpx
VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
VULKAN_CONFIGURE_ENABLE= vulkan
-VULKAN_IMPLIES= ${"${PORT_OPTIONS:MGLSLANG}":?GLSLANG:SHADERC}
# webp
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 8479737e3b15..e2bf9622d4ba 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -256,6 +256,7 @@ GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \
spirv-tools>0:graphics/spirv-tools
GLSLANG_CONFIGURE_ENABLE= libglslang
GLSLANG_LDFLAGS= -lm
+GLSLANG_IMPLIES= VULKAN
# gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
@@ -548,7 +549,6 @@ VPX_CONFIGURE_ENABLE= libvpx
VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
VULKAN_CONFIGURE_ENABLE= vulkan
-VULKAN_IMPLIES= GLSLANG
# webp
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp