From nobody Thu Feb 01 04:14:36 2024 X-Original-To: dev-commits-ports-all@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 4TQQXX3Tddz58yv9; Thu, 1 Feb 2024 04:14:36 +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 4TQQXX2FCZz4l4K; Thu, 1 Feb 2024 04:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706760876; 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=LT3/vmix+5F7ZMo9Z9nD5C7qUrr0J0Rxnv8sm3mvHNI=; b=Q3kxXbQ0PPfWjD+XNiChYtVoaXjIPaE6TirTkzgmKchRDwJ60BId1rNq5vZfY78u++Zz2n zk+Tk+MRJEwQF3jEOJgMBCqSIg/cyfLfqv5kOO353+MSDOhHB9ITKmJxc/yOZ/v8Wzd+V/ k8Hskw8kUIMkX6e9nSV8B3vbXAF0qHkeoPewtmnO8Ngbqs3q40nJ+HD9TXi0pWSm7Z/EBN y5lbQdqe2J7XdZXSuzBwtofxe3tfslZ14bx7ds4BiP19PlV1TvDtMbNT2C/Xdyn85igjCW dC1/xy4HB3jh1kyuAbCCC3pcPECkNWcSM+hLV+LeU1W0rpwQUI/bzDsJpgTVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706760876; 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=LT3/vmix+5F7ZMo9Z9nD5C7qUrr0J0Rxnv8sm3mvHNI=; b=ybm1WfeBgxNb0ULtFBUHsdcRvSkIQD/zmPZUgmV2qvsXTYwMxfX6kqphmmirwTk9/nnRVp KXvDYHwIaF6bemvKarj9vEOTduH7AAHiKJEuIsvU4cG4Y+TTzVAFQ7+Ky6gcvdlu4WJVeE MYcjUTUpw0EqURq4pBbUf7TkhkXTehKSePlrjXUwVPKmoK7Xpyp7OJfTXIaV/wxTxc06bR skNaoj57dC70V12wox1OtVM1DaG29nRyeJVfwOy7Axlj8B+GMfYrFEaHLvCKOAP1shfxJs l4oVrL/4kkCU0zHqcUWMOcVdMF1qSZl29K6tLF37hh9rYciFbMkET42YfXAU2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706760876; a=rsa-sha256; cv=none; b=GW1/OarCd6nh3oT/dUIEu11t05ZNFKON31l+sugRl09aM+knZN14SPaP1glXEDHWxlzUL3 BqKrXUt6VtNf3jGPyjR5791KYPuCK0/LvIOI5qkcFQt+18DKQ0iiKfwHjLXnjd+JaQYNhj iVtFud/ENwNs8EMJfGdDU3l549S1VodlVV9dtMV15Fqmoxhqk2ZBz3d9tTJeiOIXmE8iAd ebB9DJ2jrniCozaSJqXVNhpfoHJazoeqhPO1v44UacMuap/0y40IKSqg9zGF61lNT2oozD FD6lJ+kQQ3d0t5EL4ZCpOg/IPo64YlzjU2ELhfDqYQJW4m0KY1fL/aL9T7l+SA== 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 4TQQXX1LKjznQx; Thu, 1 Feb 2024 04:14:36 +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 4114EaIk040682; Thu, 1 Feb 2024 04:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4114EaMR040679; Thu, 1 Feb 2024 04:14:36 GMT (envelope-from git) Date: Thu, 1 Feb 2024 04:14:36 GMT Message-Id: <202402010414.4114EaMR040679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4fae7617b739 - main - multimedia/ffmpeg: swap _IMPLIES for VULKAN and GLSLANG List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 4fae7617b7396542c4436eddbbf65c52f825c516 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fae7617b7396542c4436eddbbf65c52f825c516 commit 4fae7617b7396542c4436eddbbf65c52f825c516 Author: Jan Beich AuthorDate: 2024-02-01 03:40:26 +0000 Commit: Jan Beich 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