From nobody Thu Feb 1 04:15:24 2024 X-Original-To: dev-commits-ports-branches@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 4TQQYS2w8Pz58yhM; Thu, 1 Feb 2024 04:15:24 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQQYS2KLHz4lXj; Thu, 1 Feb 2024 04:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706760924; 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=iNplvYPInmVdj3swFP/DS5pyBvy4OqM7msgSTD5BkQI=; b=AUjjlicqhVj97gyQRJl2bwu6L/c90pZSUL0HAh7wX/SbR6mtiIsrS01qcL2jhOhaNlAHyZ FFN8mLqqkWvIkVkUsqJaT1bgXK+MzzkCumS63Oy+bE9Lb5zuSx9XCcXyNb75pREeMdbICD VMFo2ljIofPFytvV6I8Iq3R92WoM1tUvJjtSJXIVR95wASxR1Qcpb4i/Rj6vm2yZDKXGss 9WGuhEhVhdCreKtUkOef+gyDLsg4CEng3s1eX1vTarSAs08Fk+o9seFiqM+KVx9IvyUT/p XkLtVel861uOPpYF+WSuukfCcRo4rqeMuuxBAWJ2uO9gwMIbWs0cMUq/gRl7hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706760924; 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=iNplvYPInmVdj3swFP/DS5pyBvy4OqM7msgSTD5BkQI=; b=kBjwibgMNwL5IJjFtD60Uwg7w30DRHB9Rj44TtGrPQVEsp/wz5NU2VAuQ/PNX26bUILfFh 3bDn9sCjU9bTnalQsTvlJg5p+MlHHQzE0R2kHjQWdKj4FgPXqcrhTRJocLe19on43FTHHk XS96GyprcWo94u68pM/5mrjFTbGaWZhsUT8i0ZXfzK3nWoFJvLVHXabkyfCz/XOuUSDKoV UsGAPdt3WIM6zqx9HVFwxXlKjn0MgTTwTKXnQ7gd+2yyQnFtkNvKvNZzUQG82F3jWB0Lri ZoFuyzoEJfUhWA9AMq+dMOfyWOkdl+ZJR1191LEthTuYlapeIilMaMsJ5UWARA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706760924; a=rsa-sha256; cv=none; b=eobodkHiO3JfGCGc4v5B+2csWy+Z2PwsDRQQa2fTk4V9nzlk3Tx3KdpmSGFDHj4w8mTMWv zFuAzH+NK/nbS/oOE8p2w+pY1M93m4bZCtFQaHcur/I+3tBivK8478r58x/qu9nehUoFgL uCH5sCuwCIIcUpsQK7kzDMuJ2T/9QeTsOjpROH0GqFz3F/x6zkU2zMyZp/gm7AB2/qGxFE IqrekOJwlm4KI+l5BuswsR07EOsoJe0t9QmEgbjG3n7YoAwv2N7Kihr5MQP1fk/3otzVRk +8Ne+PwqZwDRfsKKlCkrgDOTLEAY7YLRkQzGgt5kQcWEEql+NEFnQP/XvtRsJA== 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 4TQQYS1PDBznNh; Thu, 1 Feb 2024 04:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4114FOoU040989; Thu, 1 Feb 2024 04:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4114FOPM040986; Thu, 1 Feb 2024 04:15:24 GMT (envelope-from git) Date: Thu, 1 Feb 2024 04:15:24 GMT Message-Id: <202402010415.4114FOPM040986@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 6e5fbe036274 - 2024Q1 - multimedia/ffmpeg: swap _IMPLIES for VULKAN and GLSLANG List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 6e5fbe03627457232a9e6de9f52eddae1f715ebf Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e5fbe03627457232a9e6de9f52eddae1f715ebf commit 6e5fbe03627457232a9e6de9f52eddae1f715ebf Author: Jan Beich AuthorDate: 2024-02-01 03:40:26 +0000 Commit: Jan Beich CommitDate: 2024-02-01 04:15:19 +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 (cherry picked from commit 4fae7617b7396542c4436eddbbf65c52f825c516) --- 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 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