From nobody Wed Oct 19 17:44:10 2022 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 4MsylZ3RQxz4gWBr; Wed, 19 Oct 2022 17:44:10 +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 4MsylZ31V9z3sy3; Wed, 19 Oct 2022 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666201450; 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=zEVrHeUz28eYLmGZiByHe5XqPFzRbeQOSfSRZZF1hSQ=; b=mGAw4LoEsb7T07Tn9xXSEKJnDFHgLfRnp8X5hju2kDy2tK/6ou4LOAYGEjodt2iNlIK5KX LItTq7oQXC0wlbyfKAos7YRrecWJ5kiuymRp1CgYHGn1KIvAQoRLDeFbfWXasY2HpnWS76 1BKzkrFF017fdKI/AEFwK8d0520LoINo+RtuImYsAS7tbZoeMutuxgH8B1jUQq+XD28/tT UHbeTAZwWNpzDkXGC+J5vJRjQw0R6fkpBc0LunXqkdQ0yQWpaZqEPdILPdP6aixaQAH0Gp FaBcjSRdkJV//LnyE50Tou4IyFpUQaqx/QmcW1EOF9OoVIKILo2qkO8Dgj0QpQ== 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 4MsylZ263dzcDm; Wed, 19 Oct 2022 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JHiAhP098450; Wed, 19 Oct 2022 17:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JHiAkD098449; Wed, 19 Oct 2022 17:44:10 GMT (envelope-from git) Date: Wed, 19 Oct 2022 17:44:10 GMT Message-Id: <202210191744.29JHiAkD098449@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: 2b8c1c0c0420 - main - multimedia/ffmpeg: add NVENC option 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: 2b8c1c0c04209a7630d53df0b6c5a07c6ebe4c10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666201450; 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=zEVrHeUz28eYLmGZiByHe5XqPFzRbeQOSfSRZZF1hSQ=; b=JSsuQzRt4x2RF15DTJflUOFukg2HUdFlbKf0t+JvAF1gFtHWqV1w9I7Df5QcSspeylUC5t EEGRxTK64kC28sl+jHZUgXda1emUoxBTbN3ThqbK3QwUQOMQX4L5UC5OvlbTiRPT2JOJUH ZondZ7pe+DrK0xx6GHwjIT6r1PaSpIgm+Gktx8LnXjPr0YUsSRVetVFm0RXu0QJlw78ZU3 SqcppIPlvCHknh3bk9/jRuCiLNHZ9PJeaFfhKKTvt08qPKLJ445nxhe+mo4Rl/HPDU4vdZ riEXdcF4RE3/ymA7s9w0HJW7ZYt0UBsMsi3uHx/iZlJJ5Zt8bwcnMwdJifrM3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666201450; a=rsa-sha256; cv=none; b=eeTTsuGK0kOjbdLW4ika0i91PS9endb0aKpfhRwHNNE++/c9EOQlO5ed9a/a57pmhWZmqU WwmaRiKooCBJmyfxSIP3o7pg0J02eiREEL3zg2tp/GS/GR8tYAsIFIHtZPPSzpXaQBrmvs EA8CJOFblaM4KcK07R2x+MW1x+KWVyl5bh5RYb0GUjEIslrBYH0T6/U+LOrzCiTcOXttIq 6RlSL/+3jqQvnCMflg5VgdGOAW1c5xLgs51GvCk8SJmQebRsadW62I1g8cOMATWJyI21HI /f6YBOUvdO0U7btBC9hUZw89UblxnEWrpBd3m6y2RYmwgrn2zK9qP2QByTWifQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b8c1c0c04209a7630d53df0b6c5a07c6ebe4c10 commit 2b8c1c0c04209a7630d53df0b6c5a07c6ebe4c10 Author: Alex S AuthorDate: 2022-05-16 21:08:57 +0000 Commit: Jan Beich CommitDate: 2022-10-19 17:43:35 +0000 multimedia/ffmpeg: add NVENC option On FreeBSD requires nvidia-driver >= 495 for CUDA initialization fix and linux-nvidia-libs + libc6-shim until nvidia-driver provides native libcuda.so, libnvidia-encode.so, libnvcuvid.so. PR: 264027 --- multimedia/ffmpeg/Makefile | 7 ++++++- multimedia/ffmpeg/files/patch-configure | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f2491e1c1dee..5675a639adb0 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \ CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \ FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \ JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \ - LIBXML2 LTO LV2 MODPLUG MYSOFA OPENAL OPENCL OPENGL \ + LIBXML2 LTO LV2 MODPLUG MYSOFA NVENC OPENAL OPENCL OPENGL \ OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \ PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \ SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \ @@ -112,6 +112,7 @@ LV2_DESC= LV2 audio filtering MFX_DESC= Intel MediaSDK (aka Quick Sync Video) MYSOFA_DESC= SOFAlizer binaural filter NONFREE_DESC= Allow use of nonfree code +NVENC_DESC= NVIDIA decoder/encoder with CUDA support OPENMPT_DESC= Decoding tracked files via libopenmpt OPENH264_DESC= H.264 video codec support via OpenH264 OPENVINO_DESC= OpenVINO as a DNN module backend for DNN based filters like dnn_processing @@ -347,6 +348,10 @@ MODPLUG_CONFIGURE_ENABLE= libmodplug MYSOFA_LIB_DEPENDS= libmysofa.so:audio/libmysofa MYSOFA_CONFIGURE_ENABLE= libmysofa +# nvenc +NVENC_BUILD_DEPENDS= ${LOCALBASE}/include/ffnvcodec/nvEncodeAPI.h:multimedia/ffnvcodec-headers +NVENC_CONFIGURE_ENABLE= nvenc + # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index 1b06074fc3fa..760c50b8e912 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -15,3 +15,12 @@ cpu="generic" intrinsics="none" +@@ -6758,7 +6752,7 @@ if enabled x86; then + + if enabled x86; then + case $target_os in +- mingw32*|mingw64*|win32|win64|linux|cygwin*) ++ freebsd|mingw32*|mingw64*|win32|win64|linux|cygwin*) + ;; + *) + disable ffnvcodec cuvid nvdec nvenc