From nobody Sun Jan 8 23:38:31 2023 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 4Nqtn40hThz2p1wR; Sun, 8 Jan 2023 23:38:32 +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 4Nqtn36jK6z3pJv; Sun, 8 Jan 2023 23:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673221111; 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=75suW0IJB/8ciqagWMc5y2YBINcLf9MiCwEKw08D/UA=; b=aTOrtdbyoAPvoleKR7X9KBKguDs2z9d0OwshfAMns7kORDQNjEKElnwMeutZsTHaK/vfIC HDlgLAR7zckHwAfMw3oG2ilneWy/xKxisljKV2yXEw/WX+et5QmpzO0+Ba3Vy9/I587anT peIzSaqWXmPWN6Y4yvPnTlJApzf+KO6zlDczHhyA0jo3lRB9trKYZI/E9DrQQQ3yvS9xPH 2F+axhklXOpTyXTb5yD3pz9tIM5w0zBuSRmSna/laWG8QKZFQa6BV0cumruw56uHtdtnyC mf7oieq7/ELys3gQKJABqdA4Bz2NKLcpoZpy4ypoNPDvKTCwAdU7NYAzeB0Vcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673221111; 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=75suW0IJB/8ciqagWMc5y2YBINcLf9MiCwEKw08D/UA=; b=XDJTTH6sYXxBNBnI/TuzcYk5bdqsacPi67Jb8dl1/Ve3XYwd1NLO/rM3r3FQeDbqsjMHvj AgAchgqMEfW2VNovlduQw/pcZGxuID7O2W8jbqNCG8TALIkn3SBQh/DU3g2BCYOmNoDne+ kygoZQKLZl3NlXTUaCpgrga4oRYGiSzbAqR/9N+v8wSguZ3QzGE3IwPc1upsM5uGJIEA1r UAn9x+L14hffvmvtdkNyt15uC/uTz2M2+p55kVqtXy+3XM9CfhfT9xtcVZvjWVtvs9l9FA DqahrkLaufVfq7L80sdnXux7IS8YnAi0B6DKmMyYqufH7wd+CqfXf+Jc5t2fbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673221111; a=rsa-sha256; cv=none; b=Eu4Xj1G+Tg/8EAlgnhXkjoQrShegZo+Xq7LVySti3uegyVGAXa5t5MEynC1oJxRpcudMau uBQaM07y9/KvDcKolDQ0pVgBJnJKkGJwwVUIuCbt5zn/4I9Vm+inaD9ZB5pNLXyvf58PxS yePPGLynrEjv3fO/X/wZSkVjAPTWM9dVSw0bMNlt72GB0H6XLc+GYDzUdVhQSrOc1P94Pt axKZ4an45zdyi3N6r/Cws4ZAFmfZprQptvAOaNHxSxlvOs5gu1+j/HsfQYMaffWdbrYsuV a2O+TqN0y9jRBQDPgq5LSyw6EcSGgTb5Ew1A5nMVREfQ+hSeV6IjrnwWpfC9DA== 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 4Nqtn35kckz1739; Sun, 8 Jan 2023 23:38:31 +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 308NcVLd006724; Sun, 8 Jan 2023 23:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 308NcVqR006722; Sun, 8 Jan 2023 23:38:31 GMT (envelope-from git) Date: Sun, 8 Jan 2023 23:38:31 GMT Message-Id: <202301082338.308NcVqR006722@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thomas Zander Subject: git: bbc10a27f343 - 2023Q1 - multimedia/ffmpeg: Add NETWORK DEFAULT OPTION 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: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: bbc10a27f343b1a3cd34139498cfca70ac43580a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbc10a27f343b1a3cd34139498cfca70ac43580a commit bbc10a27f343b1a3cd34139498cfca70ac43580a Author: Thomas Zander AuthorDate: 2023-01-08 16:07:43 +0000 Commit: Thomas Zander CommitDate: 2023-01-08 23:38:29 +0000 multimedia/ffmpeg: Add NETWORK DEFAULT OPTION Details: Disabling the NETWORK OPTION (DEFAULT) allows users to compile ffmpeg without networking code in libavcodec. PR: 268786 Reported by: Alexander Ushakov MFH: 2023Q1 (cherry picked from commit 8855990a698ea489ad155282471df4ce864b8fad) --- multimedia/ffmpeg/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 45ae795c537d..22e18bacaa20 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ @@ -35,7 +35,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 NVENC OPENAL OPENCL OPENGL \ + LIBXML2 LTO LV2 MODPLUG MYSOFA NETWORK 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 \ @@ -47,8 +47,8 @@ OPTIONS_DEFINE_amd64= MFX OPTIONS_DEFINE_i386= MFX OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \ - GNUTLS ICONV LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \ - V4L VAAPI VDPAU VMAF VORBIS VPX WEBP X264 X265 XCB + GNUTLS ICONV LAME LIBXML2 NETWORK OPTIMIZED_CFLAGS OPUS \ + RTCPU V4L VAAPI VDPAU VMAF VORBIS VPX WEBP X264 X265 XCB OPTIONS_DEFAULT_amd64= NVENC SVTAV1 OPTIONS_DEFAULT_i386= NVENC @@ -113,6 +113,7 @@ LICENSE_DESC= Licensing options LV2_DESC= LV2 audio filtering MFX_DESC= Intel MediaSDK (aka Quick Sync Video) MYSOFA_DESC= SOFAlizer binaural filter +NETWORK_DESC= Networking support NONFREE_DESC= Allow use of nonfree code NVENC_DESC= NVIDIA decoder/encoder with CUDA support OPENMPT_DESC= Decoding tracked files via libopenmpt @@ -350,6 +351,9 @@ MODPLUG_CONFIGURE_ENABLE= libmodplug MYSOFA_LIB_DEPENDS= libmysofa.so:audio/libmysofa MYSOFA_CONFIGURE_ENABLE= libmysofa +# network +NETWORK_CONFIGURE_ENABLE= network + # nvenc NVENC_BUILD_DEPENDS= ${LOCALBASE}/include/ffnvcodec/nvEncodeAPI.h:multimedia/ffnvcodec-headers NVENC_CONFIGURE_ENABLE= nvenc