git: 4fae7617b739 - main - multimedia/ffmpeg: swap _IMPLIES for VULKAN and GLSLANG
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 Feb 2024 04:14:36 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4fae7617b7396542c4436eddbbf65c52f825c516
commit 4fae7617b7396542c4436eddbbf65c52f825c516
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-02-01 03:40:26 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-02-01 04:13:44 +0000
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
---
multimedia/ffmpeg/Makefile | 5 +++--
multimedia/ffmpeg4/Makefile | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 261134c94068..c58e1265658d 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -48,7 +48,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
@@ -267,6 +267,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
@@ -468,6 +469,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
@@ -585,7 +587,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 4493f79a3d7c..711be1c69a06 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