Attachment 252736 Details for Bug 278705 – v1.1 (apply via "git am")

[patch] v1.1 (apply via "git am")

bug278705.diff (text/plain), 12.66 KB, created by Jan Beich on 2024-08-13 15:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2024-08-13 15:29:36 UTC

Size: 12.66 KB

patch

obsolete

>From 7d6b04fda36a1401453b0ef2a1d1a0264bf20ad2 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 5 Apr 2024 01:23:03 +0200
>Subject: [PATCH] multimedia/ffmpeg: update to 7.0.2
>
>Changes:	https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n7.0.2:/Changelog
>PR:		278705
>Reported by:	Repology
>Exp-run by:	antoine
>---
> multimedia/ffmpeg/Makefile              | 61 ++++++++++++++++++++++---
> multimedia/ffmpeg/distinfo              | 14 +++---
> multimedia/ffmpeg/files/patch-configure | 13 ------
> multimedia/ffmpeg/pkg-plist             | 35 +++++++-------
> 4 files changed, 79 insertions(+), 44 deletions(-)
>
>diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
>index 84a365ca9454..c3b9342bc8e5 100644
>--- a/multimedia/ffmpeg/Makefile
>+++ b/multimedia/ffmpeg/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	ffmpeg
>-PORTVERSION=	6.1.2
>+PORTVERSION=	7.0.2
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio net
> MASTER_SITES=	https://ffmpeg.org/releases/
>@@ -31,16 +31,16 @@ PORTSCOUT=	limit:^6\.
> 
> # Option CHROMAPRINT disabled, it cannot work and people are baffled.
> OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ARIBCAPTION ASM ASS BS2B CACA CDIO \
>-		CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \
>+		CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM DVDNAV FDK_AAC FLITE \
> 		FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM HARFBUZZ ICONV ILBC \
> 		JACK JXL KLVANC KVAZAAR LADSPA LAME LCMS2 LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \
> 		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 SHADERC SMB SNAPPY \
>+		PULSEAUDIO QRCODES QUIRC RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \
> 		SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \
>-		TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
>+		TESSERACT THEORA TORCH TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
> 		VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
>-		XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
>+		XAVS2 XCB XEVD XEVE XVID XVIDEO ZIMG ZMQ ZVBI
> # intel-media-sdk only for i386/amd64
> OPTIONS_DEFINE_amd64=	MFX VPL
> OPTIONS_DEFINE_i386=	MFX
>@@ -75,6 +75,16 @@ OPTIONS_EXCLUDE+=	UAVS3D
> OPTIONS_EXCLUDE+=	XAVS2
> .endif
> 
>+.if !exists(${.CURDIR:H:H}/multimedia/xevd)
>+# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/cfe29478873e
>+OPTIONS_EXCLUDE+=	XEVD
>+.endif
>+
>+.if !exists(${.CURDIR:H:H}/multimedia/xeve)
>+# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c59a96fd0862
>+OPTIONS_EXCLUDE+=	XEVE
>+.endif
>+
> .if !exists(${.CURDIR:H:H}/multimedia/klvanc)
> # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8732dfa9954
> OPTIONS_EXCLUDE+=	KLVANC
>@@ -85,6 +95,11 @@ OPTIONS_EXCLUDE+=	KLVANC
> OPTIONS_EXCLUDE+=	OPENVINO
> .endif
> 
>+.if !exists(${.CURDIR:H:H}/graphics/quirc)
>+# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/030e14014512
>+OPTIONS_EXCLUDE+=	QUIRC
>+.endif
>+
> OPTIONS_RADIO=	RTMP SSL
> OPTIONS_RADIO_RTMP=	GCRYPT GMP
> OPTIONS_RADIO_SSL=	GNUTLS MBEDTLS OPENSSL
>@@ -102,6 +117,7 @@ DAV1D_DESC=	AV1 video decoding via libdav1d
> DAVS2_DESC=	AVS2 decoding via libdavs2
> DC1394_DESC=	IIDC-1394 grabbing using libdc1394
> DRM_DESC=	KMS grabbing using libdrm
>+DVDNAV_DESC=	DVD demuxing
> FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
> FLITE_DESC=	Voice synthesis support via libflite
> GLSLANG_DESC=	GLSL->SPIRV compilation via libglslang
>@@ -122,6 +138,8 @@ 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
> POCKETSPHINX_DESC=	Automatic Speech Recognition via PocketSphinx
>+QRCODES_DESC=	QR encode generation via libqrencode
>+QUIRC_DESC=	QR decoding via libquirc
> RAV1E_DESC=	AV1 encoding via librav1e
> RABBITMQ_DESC=	AMQP 0-9-1 protocol via RabbitMQ
> RIST_DESC=	Reliable Internet Stream Transport protocol via librist
>@@ -137,6 +155,7 @@ LIBPLACEBO_DESC=GPU filters from libplacebo
> TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr
> TESSERACT_DESC=	Optical Character Recognition via Tesseract
> THEORA_DESC=	Encoding support for theora via libtheora
>+TORCH_DESC=	Torch as a DNN module backend for DNN based filters like dnn_processing
> UAVS3D_DESC=	AVS3 decoding via libuavs3d
> VAPOURSYNTH_DESC=	VapourSynth demuxer
> VIDSTAB_DESC=	Video stabilization filter
>@@ -146,6 +165,8 @@ VULKAN_DESC=	Vulkan filters
> XAVS2_DESC=	AVS2 encoding via libxavs2
> XCB_DESC=	X11 grabbing using XCB
> XVID_DESC=	Encoding support for MPEG-4 ASP via libxvid
>+XEVD_DESC=	EVC decoding via libxevd
>+XEVE_DESC=	EVC encoding via libxeve
> ZIMG_DESC=	"z" library video scaling filter
> ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
> ZVBI_DESC=	Teletext support via libzvbi
>@@ -231,6 +252,11 @@ DOCS_BINARY_ALIAS=	makeinfo=${FALSE} # force texi2html
> DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
> DRM_CONFIGURE_ENABLE=	libdrm
> 
>+# dvdvideo (dvdnav + dvdread)
>+DVDNAV_LIB_DEPENDS=		libdvdnav.so:multimedia/libdvdnav \
>+				libdvdread.so:multimedia/libdvdread
>+DVDNAV_CONFIGURE_ENABLE=	libdvdnav libdvdread
>+
> # fdk_aac
> FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
> FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
>@@ -436,6 +462,14 @@ POCKETSPHINX_BROKEN=	pocketsphinx < 5prealpha is not supported
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
> 
>+# qrencode
>+QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
>+QRCODES_CONFIGURE_ENABLE=	libqrencode
>+
>+# quirc
>+QUIRC_LIB_DEPENDS=	libquirc.so:graphics/quirc
>+QUIRC_CONFIGURE_ENABLE=	libquirc
>+
> # rav1e
> RAV1E_LIB_DEPENDS=	librav1e.so:multimedia/librav1e
> RAV1E_CONFIGURE_ENABLE=	librav1e
>@@ -502,7 +536,7 @@ SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
> # svt-hevc
> SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
> SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
>-SVTHEVC_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-12-g6cca5b93/ffmpeg_plugin/:svthevc
>+SVTHEVC_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-14-ged80959e/ffmpeg_plugin/:svthevc
> SVTHEVC_PATCHFILES=	master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
> 			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
> .if make(makesum)
>@@ -512,7 +546,7 @@ SVTHEVC_PATCHFILES=	master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.pa
> # svt-vp9
> SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
> SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
>-SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-20-gbab25a6/ffmpeg_plugin/:svtvp9
>+SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-23-g3b9a3fa/ffmpeg_plugin/:svtvp9
> SVTVP9_PATCHFILES=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
> .if make(makesum)
> .MAKEFLAGS:		WITH+=SVTVP9
>@@ -530,6 +564,11 @@ TESSERACT_CONFIGURE_ENABLE=	libtesseract
> THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
> THEORA_CONFIGURE_ENABLE=	libtheora
> 
>+# torch
>+TORCH_LIB_DEPENDS=	libtorch_cpu.so:misc/pytorch
>+TORCH_CONFIGURE_ENABLE=	libtorch
>+TORCH_CPPFLAGS=		-isystem${LOCALBASE}/include/torch/csrc/api/include
>+
> # twolame
> TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
> TWOLAME_CONFIGURE_ENABLE=	libtwolame
>@@ -603,6 +642,14 @@ XCB_USES=		xorg
> XCB_USE=		XORG=xcb
> XCB_CONFIGURE_ENABLE=	libxcb
> 
>+# xevd
>+XEVD_LIB_DEPENDS=	libxevd.so:multimedia/xevd
>+XEVD_CONFIGURE_ENABLE=	libxevd
>+
>+# xeve
>+XEVE_LIB_DEPENDS=	libxeve.so:multimedia/xeve
>+XEVE_CONFIGURE_ENABLE=	libxeve
>+
> # xvid
> XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
> XVID_CONFIGURE_ENABLE=	libxvid
>diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
>index 811067130802..7c4b3eeb3eb3 100644
>--- a/multimedia/ffmpeg/distinfo
>+++ b/multimedia/ffmpeg/distinfo
>@@ -1,9 +1,9 @@
>-TIMESTAMP = 1722554574
>-SHA256 (ffmpeg-6.1.2.tar.xz) = 3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38
>-SIZE (ffmpeg-6.1.2.tar.xz) = 10466152
>-SHA256 (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
>-SIZE (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 25395
>+TIMESTAMP = 1722639325
>+SHA256 (ffmpeg-7.0.2.tar.xz) = 8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389
>+SIZE (ffmpeg-7.0.2.tar.xz) = 10795332
>+SHA256 (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 9047e18d34716812d4ea7eafc1d0fd8b376d922a4b6b4dc20237662fcaf0c996
>+SIZE (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 25331
> SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
> SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5461
>-SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c
>-SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 25894
>+SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 59da61f2b2c556fbe0cdbf84bcc00977ee3d2447085decb21f6298226559f2aa
>+SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 25922
>diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
>index 9654237228cc..e5c72765e1cc 100644
>--- a/multimedia/ffmpeg/files/patch-configure
>+++ b/multimedia/ffmpeg/files/patch-configure
>@@ -15,16 +15,3 @@
>  cpu="generic"
>  intrinsics="none"
>  
>-@@ -6715,10 +6709,10 @@ enabled libglslang && { check_lib spirv_compiler glsla
>- enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
>- enabled libharfbuzz       && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
>- enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
>--                            -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
>-+                            -lglslang -lMachineIndependent -lOSDependent -lGenericCodeGen \
>-                             -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
>-                         require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
>--                            -lglslang -lOSDependent -lHLSL -lOGLCompiler \
>-+                            -lglslang -lOSDependent \
>-                             -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
>- enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
>-                                require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
>index 1ddbc2b3fceb..e18d8090db4a 100644
>--- a/multimedia/ffmpeg/pkg-plist
>+++ b/multimedia/ffmpeg/pkg-plist
>@@ -25,7 +25,6 @@ include/libavcodec/version.h
> include/libavcodec/version_major.h
> include/libavcodec/videotoolbox.h
> include/libavcodec/vorbis_parser.h
>-include/libavcodec/xvmc.h
> include/libavdevice/avdevice.h
> include/libavdevice/version.h
> include/libavdevice/version_major.h
>@@ -82,6 +81,7 @@ include/libavutil/hmac.h
> include/libavutil/hwcontext.h
> include/libavutil/hwcontext_cuda.h
> include/libavutil/hwcontext_d3d11va.h
>+include/libavutil/hwcontext_d3d12va.h
> include/libavutil/hwcontext_drm.h
> include/libavutil/hwcontext_dxva2.h
> include/libavutil/hwcontext_mediacodec.h
>@@ -91,6 +91,7 @@ include/libavutil/hwcontext_vaapi.h
> include/libavutil/hwcontext_vdpau.h
> include/libavutil/hwcontext_videotoolbox.h
> include/libavutil/hwcontext_vulkan.h
>+include/libavutil/iamf.h
> include/libavutil/imgutils.h
> include/libavutil/intfloat.h
> include/libavutil/intreadwrite.h
>@@ -142,29 +143,29 @@ include/libswscale/swscale.h
> include/libswscale/version.h
> include/libswscale/version_major.h
> lib/libavcodec.so
>-lib/libavcodec.so.60
>-lib/libavcodec.so.60.31.102
>+lib/libavcodec.so.61
>+lib/libavcodec.so.61.3.100
> lib/libavdevice.so
>-lib/libavdevice.so.60
>-lib/libavdevice.so.60.3.100
>+lib/libavdevice.so.61
>+lib/libavdevice.so.61.1.100
> lib/libavfilter.so
>-lib/libavfilter.so.9
>-lib/libavfilter.so.9.12.100
>+lib/libavfilter.so.10
>+lib/libavfilter.so.10.1.100
> lib/libavformat.so
>-lib/libavformat.so.60
>-lib/libavformat.so.60.16.100
>+lib/libavformat.so.61
>+lib/libavformat.so.61.1.100
> lib/libavutil.so
>-lib/libavutil.so.58
>-lib/libavutil.so.58.29.100
>+lib/libavutil.so.59
>+lib/libavutil.so.59.8.100
> lib/libpostproc.so
>-lib/libpostproc.so.57
>-lib/libpostproc.so.57.3.100
>+lib/libpostproc.so.58
>+lib/libpostproc.so.58.1.100
> lib/libswresample.so
>-lib/libswresample.so.4
>-lib/libswresample.so.4.12.100
>+lib/libswresample.so.5
>+lib/libswresample.so.5.1.100
> lib/libswscale.so
>-lib/libswscale.so.7
>-lib/libswscale.so.7.5.100
>+lib/libswscale.so.8
>+lib/libswscale.so.8.1.100
> libdata/pkgconfig/libavcodec.pc
> libdata/pkgconfig/libavdevice.pc
> libdata/pkgconfig/libavfilter.pc

Actions: View | Diff

Attachments on bug 278705: 250337 | 252736