On Sat Apr 10, 2021 at 07:13:20PM -0400, Brad Smith wrote:
> Here is an update to FFmpeg 4.4.
>
Build and runs fine on amd64, concerns?
>
> Index: graphics/ffmpeg/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.208
> diff -u -p -u -p -r1.208 Makefile
> --- graphics/ffmpeg/Makefile 3 Apr 2021 11:15:46 -0000 1.208
> +++ graphics/ffmpeg/Makefile 9 Apr 2021 00:03:46 -0000
> @@ -2,22 +2,21 @@
>
> COMMENT= audio/video converter and streamer
>
> -V= 4.3.2
> +V= 4.4
> DISTNAME= ffmpeg-${V}
> -REVISION= 0
> EPOCH= 1
> CATEGORIES= graphics multimedia
> MASTER_SITES= https://ffmpeg.org/releases/
> EXTRACT_SUFX= .tar.xz
>
> -SHARED_LIBS= avcodec 24.0 \
> - avdevice 12.0 \
> - avfilter 9.0 \
> - avformat 21.0 \
> +SHARED_LIBS= avcodec 25.0 \
> + avdevice 13.0 \
> + avfilter 10.0 \
> + avformat 22.0 \
> avresample 2.0 \
> - avutil 14.0 \
> - postproc 18.0 \
> - swresample 3.0 \
> + avutil 15.0 \
> + postproc 19.0 \
> + swresample 4.0 \
> swscale 7.0
>
> HOMEPAGE= https://ffmpeg.org/
> Index: graphics/ffmpeg/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
> retrieving revision 1.61
> diff -u -p -u -p -r1.61 distinfo
> --- graphics/ffmpeg/distinfo 23 Feb 2021 14:30:05 -0000 1.61
> +++ graphics/ffmpeg/distinfo 9 Apr 2021 00:04:02 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ffmpeg-4.3.2.tar.xz) = RuTmTx3QIzy8CTS58cDaZ2AIytNHJRE/t/gCz6hMzds=
> -SIZE (ffmpeg-4.3.2.tar.xz) = 9391100
> +SHA256 (ffmpeg-4.4.tar.xz) = BrEKGDzlNx+RXGuxW3sf/74EboJ1CZyWr/wp4XZF2Qk=
> +SIZE (ffmpeg-4.4.tar.xz) = 9557868
> Index: graphics/ffmpeg/patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
> retrieving revision 1.65
> diff -u -p -u -p -r1.65 patch-configure
> --- graphics/ffmpeg/patches/patch-configure 6 Jul 2020 07:14:55 -0000
> 1.65
> +++ graphics/ffmpeg/patches/patch-configure 30 Mar 2021 00:27:00 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.65 2020/07
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -5339,7 +5339,6 @@ case $target_os in
> +@@ -5377,7 +5377,6 @@ case $target_os in
> enable section_data_rel_ro
> striptype=""
> SHFLAGS='-shared'
> @@ -11,7 +11,7 @@ Index: configure
> SLIB_INSTALL_LINKS=
> oss_indev_extralibs="-lossaudio"
> oss_outdev_extralibs="-lossaudio"
> -@@ -5695,7 +5694,7 @@ set_default libdir
> +@@ -5733,7 +5732,7 @@ set_default libdir
> set_default $PATHS_LIST
> set_default nm
>
> Index: graphics/ffmpeg/patches/patch-libavutil_cpu_c
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-libavutil_cpu_c,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-libavutil_cpu_c
> --- graphics/ffmpeg/patches/patch-libavutil_cpu_c 3 Apr 2021 11:15:46
> -0000 1.1
> +++ graphics/ffmpeg/patches/patch-libavutil_cpu_c 3 Apr 2021 18:04:07
> -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-libavutil_cpu_c,v 1.1 20
> Index: libavutil/cpu.c
> --- libavutil/cpu.c.orig
> +++ libavutil/cpu.c
> -@@ -283,6 +283,12 @@ int av_cpu_count(void)
> +@@ -291,6 +291,12 @@ int av_cpu_count(void)
> DWORD_PTR proc_aff, sys_aff;
> if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff))
> nb_cpus = av_popcount64(proc_aff);
> Index: graphics/ffmpeg/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v
> retrieving revision 1.38
> diff -u -p -u -p -r1.38 PLIST
> --- graphics/ffmpeg/pkg/PLIST 18 Jun 2020 07:03:15 -0000 1.38
> +++ graphics/ffmpeg/pkg/PLIST 20 Mar 2021 00:44:45 -0000
> @@ -75,6 +75,7 @@ include/libavutil/eval.h
> include/libavutil/ffversion.h
> include/libavutil/fifo.h
> include/libavutil/file.h
> +include/libavutil/film_grain_params.h
> include/libavutil/frame.h
> include/libavutil/hash.h
> include/libavutil/hdr_dynamic_metadata.h
> Index: x11/mplayer/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
> retrieving revision 1.312
> diff -u -p -u -p -r1.312 Makefile
> --- x11/mplayer/Makefile 23 Feb 2021 14:30:05 -0000 1.312
> +++ x11/mplayer/Makefile 9 Apr 2021 00:04:49 -0000
> @@ -3,9 +3,9 @@
> COMMENT= movie player supporting many formats
>
> V= 20210124
> -FFMPEG_V= 4.3.2
> +FFMPEG_V= 4.4
> DISTNAME= mplayer-${V}
> -REVISION= 0
> +REVISION= 1
> CATEGORIES= x11 multimedia
> MASTER_SITES= https://comstyle.com/source/
> EXTRACT_SUFX= .tar.xz
>
