pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg4 ffmpeg4: updated to 4.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/77f6d2b4b32d
branches: trunk
changeset: 450061:77f6d2b4b32d
user: adam <adam%pkgsrc.org@localhost>
date: Sat Apr 10 08:50:43 2021 +0000
description:
ffmpeg4: updated to 4.4
version 4.4:
- AudioToolbox output device
- MacCaption demuxer
- PGX decoder
- chromanr video filter
- VDPAU accelerated HEVC 10/12bit decoding
- ADPCM IMA Ubisoft APM encoder
- Rayman 2 APM muxer
- AV1 encoding support SVT-AV1
- Cineform HD encoder
- ADPCM Argonaut Games encoder
- Argonaut Games ASF muxer
- AV1 Low overhead bitstream format demuxer
- RPZA video encoder
- ADPCM IMA MOFLEX decoder
- MobiClip FastAudio decoder
- MobiClip video decoder
- MOFLEX demuxer
- MODS demuxer
- PhotoCD decoder
- MCA demuxer
- AV1 decoder (Hardware acceleration used only)
- SVS demuxer
- Argonaut Games BRP demuxer
- DAT demuxer
- aax demuxer
- IPU decoder, parser and demuxer
- Intel QSV-accelerated AV1 decoding
- Argonaut Games Video decoder
- libwavpack encoder removed
- ACE demuxer
- AVS3 demuxer
- AVS3 video decoder via libuavs3d
- Cintel RAW decoder
- VDPAU accelerated VP9 10/12bit decoding
- afreqshift and aphaseshift filters
- High Voltage Software ADPCM encoder
- LEGO Racers ALP (.tun & .pcm) muxer
- AV1 VAAPI decoder
- adenorm filter
- ADPCM IMA AMV encoder
- AMV muxer
- NVDEC AV1 hwaccel
- DXVA2/D3D11VA hardware accelerated AV1 decoding
- speechnorm filter
- SpeedHQ encoder
- asupercut filter
- asubcut filter
- Microsoft Paint (MSP) version 2 decoder
- Microsoft Paint (MSP) demuxer
- AV1 monochrome encoding support via libaom >= 2.0.1
- asuperpass and asuperstop filter
- shufflepixels filter
- tmidequalizer filter
- estdif filter
- epx filter
- Dolby E parser
- shear filter
- kirsch filter
- colortemperature filter
- colorcontrast filter
- PFM encoder
- colorcorrect filter
- binka demuxer
- XBM parser
- xbm_pipe demuxer
- colorize filter
- CRI parser
- aexciter audio filter
- exposure video filter
- monochrome video filter
- setts bitstream filter
- vif video filter
- OpenEXR image encoder
- Simbiosis IMX decoder
- Simbiosis IMX demuxer
- Digital Pictures SGA demuxer and decoders
- TTML subtitle encoder and muxer
- identity video filter
- msad video filter
- gophers protocol
- RIST protocol via librist
diffstat:
multimedia/ffmpeg4/Makefile | 3 +-
multimedia/ffmpeg4/Makefile.common | 9 +-
multimedia/ffmpeg4/PLIST | 19 +-
multimedia/ffmpeg4/buildlink3.mk | 20 +-
multimedia/ffmpeg4/distinfo | 15 +-
multimedia/ffmpeg4/patches/patch-configure | 32 +----
multimedia/ffmpeg4/patches/patch-doc_general.texi | 12 --
multimedia/ffmpeg4/patches/patch-doc_general__contents.texi | 14 ++
multimedia/ffmpeg4/patches/patch-libswscale_ppc_yuv2rgb__altivec.c | 51 ----------
9 files changed, 54 insertions(+), 121 deletions(-)
diffs (truncated from 369 to 300 lines):
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/Makefile
--- a/multimedia/ffmpeg4/Makefile Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/Makefile Sat Apr 10 08:50:43 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2021/03/24 20:49:04 maya Exp $
+# $NetBSD: Makefile,v 1.46 2021/04/10 08:50:43 adam Exp $
PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION= 1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://ffmpeg.org/
COMMENT= Decoding, encoding and streaming software (v4.x)
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/Makefile.common
--- a/multimedia/ffmpeg4/Makefile.common Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/Makefile.common Sat Apr 10 08:50:43 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.22 2021/02/21 14:35:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2021/04/10 08:50:43 adam Exp $
# used by multimedia/ffmpeg4/Makefile
# used by multimedia/ffplay4/Makefile
-DISTNAME= ffmpeg-4.3.2
+DISTNAME= ffmpeg-4.4
CATEGORIES= multimedia
MASTER_SITES= http://www.ffmpeg.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -33,11 +33,8 @@
CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg4
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg4
-PLIST_VARS+= opencl
-
-.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
CONFIGURE_ARGS+= --enable-opencl
-PLIST.opencl= yes
.endif
.if ${OPSYS} == "SunOS"
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/PLIST
--- a/multimedia/ffmpeg4/PLIST Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/PLIST Sat Apr 10 08:50:43 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/06/16 16:54:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/04/10 08:50:43 adam Exp $
bin/ffmpeg4
bin/ffprobe4
include/ffmpeg4/libavcodec/ac3_parser.h
@@ -67,6 +67,7 @@
include/ffmpeg4/libavutil/ffversion.h
include/ffmpeg4/libavutil/fifo.h
include/ffmpeg4/libavutil/file.h
+include/ffmpeg4/libavutil/film_grain_params.h
include/ffmpeg4/libavutil/frame.h
include/ffmpeg4/libavutil/hash.h
include/ffmpeg4/libavutil/hdr_dynamic_metadata.h
@@ -131,19 +132,19 @@
lib/ffmpeg4/libavcodec.a
lib/ffmpeg4/libavcodec.so
lib/ffmpeg4/libavcodec.so.58
-lib/ffmpeg4/libavcodec.so.58.91.100
+lib/ffmpeg4/libavcodec.so.58.134.100
lib/ffmpeg4/libavdevice.a
lib/ffmpeg4/libavdevice.so
lib/ffmpeg4/libavdevice.so.58
-lib/ffmpeg4/libavdevice.so.58.10.100
+lib/ffmpeg4/libavdevice.so.58.13.100
lib/ffmpeg4/libavfilter.a
lib/ffmpeg4/libavfilter.so
lib/ffmpeg4/libavfilter.so.7
-lib/ffmpeg4/libavfilter.so.7.85.100
+lib/ffmpeg4/libavfilter.so.7.110.100
lib/ffmpeg4/libavformat.a
lib/ffmpeg4/libavformat.so
lib/ffmpeg4/libavformat.so.58
-lib/ffmpeg4/libavformat.so.58.45.100
+lib/ffmpeg4/libavformat.so.58.76.100
lib/ffmpeg4/libavresample.a
lib/ffmpeg4/libavresample.so
lib/ffmpeg4/libavresample.so.4
@@ -151,19 +152,19 @@
lib/ffmpeg4/libavutil.a
lib/ffmpeg4/libavutil.so
lib/ffmpeg4/libavutil.so.56
-lib/ffmpeg4/libavutil.so.56.51.100
+lib/ffmpeg4/libavutil.so.56.70.100
lib/ffmpeg4/libpostproc.a
lib/ffmpeg4/libpostproc.so
lib/ffmpeg4/libpostproc.so.55
-lib/ffmpeg4/libpostproc.so.55.7.100
+lib/ffmpeg4/libpostproc.so.55.9.100
lib/ffmpeg4/libswresample.a
lib/ffmpeg4/libswresample.so
lib/ffmpeg4/libswresample.so.3
-lib/ffmpeg4/libswresample.so.3.7.100
+lib/ffmpeg4/libswresample.so.3.9.100
lib/ffmpeg4/libswscale.a
lib/ffmpeg4/libswscale.so
lib/ffmpeg4/libswscale.so.5
-lib/ffmpeg4/libswscale.so.5.7.100
+lib/ffmpeg4/libswscale.so.5.9.100
lib/ffmpeg4/pkgconfig/libavcodec.pc
lib/ffmpeg4/pkgconfig/libavdevice.pc
lib/ffmpeg4/pkgconfig/libavfilter.pc
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/buildlink3.mk
--- a/multimedia/ffmpeg4/buildlink3.mk Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/buildlink3.mk Sat Apr 10 08:50:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/08/17 20:17:37 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2021/04/10 08:50:43 adam Exp $
BUILDLINK_TREE+= ffmpeg4
@@ -14,39 +14,39 @@
.include "../../mk/bsd.fast.prefs.mk"
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mav1)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mav1}
. include "../../multimedia/libaom/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mfreetype)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfreetype}
. include "../../graphics/freetype2/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mfontconfig)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfontconfig}
. include "../../fonts/fontconfig/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mtheora)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mtheora}
. include "../../multimedia/libtheora/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mxvid)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mxvid}
. include "../../multimedia/xvidcore/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mx264)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mx264}
. include "../../multimedia/x264-devel/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mlibvpx)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mlibvpx}
. include "../../multimedia/libvpx/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mvaapi)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvaapi}
. include "../../multimedia/libva/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg4:Mvdpau)
+.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvdpau}
. include "../../multimedia/libvdpau/buildlink3.mk"
.endif
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/distinfo
--- a/multimedia/ffmpeg4/distinfo Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/distinfo Sat Apr 10 08:50:43 2021 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.21 2021/02/21 14:35:47 adam Exp $
+$NetBSD: distinfo,v 1.22 2021/04/10 08:50:43 adam Exp $
-SHA1 (ffmpeg-4.3.2.tar.xz) = 017e74ab7014d1e88dc56fecd80a5df5a3fc0016
-RMD160 (ffmpeg-4.3.2.tar.xz) = f5d067267a90002c071fb263712021dc710e9aeb
-SHA512 (ffmpeg-4.3.2.tar.xz) = c85e2ecdd397389da2d7ab9e0d1fa23994931d4ad171a551b0d4863154d7daf42e51de747ec5c6d939ebd668817099bbbd272fa709f20093000376e26597becf
-Size (ffmpeg-4.3.2.tar.xz) = 9391100 bytes
+SHA1 (ffmpeg-4.4.tar.xz) = bb323745507ab70919542f825153d5ed596cee79
+RMD160 (ffmpeg-4.4.tar.xz) = 0169ae4eb185de3a851a9926bc0b3289512c4be0
+SHA512 (ffmpeg-4.4.tar.xz) = 4f9e99958904bf1b99b4b17e2104729dfe67e0080cac525137597974597ff265c9847eb1be0771aa443c85691025bc0747d213e6c1281f7b67d18d8b0e8c5080
+Size (ffmpeg-4.4.tar.xz) = 9557868 bytes
SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
-SHA1 (patch-configure) = ef67e070909ba06aeec153c5320e0d636d56bf1a
+SHA1 (patch-configure) = f1aa00516d5c16fc1da2d26f441549e1d3e58f2d
SHA1 (patch-doc_Makefile) = 3b86307323fa565f9ad19c5bcb6ea71d323062fc
-SHA1 (patch-doc_general.texi) = 4fd158cb76a6a9fec24d3dae5edb32c0531153a2
+SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c
SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
@@ -19,4 +19,3 @@
SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487
-SHA1 (patch-libswscale_ppc_yuv2rgb__altivec.c) = 79b439ea89fd5926a20a725d0a2ca1b091366ea5
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/patches/patch-configure
--- a/multimedia/ffmpeg4/patches/patch-configure Sat Apr 10 08:49:19 2021 +0000
+++ b/multimedia/ffmpeg4/patches/patch-configure Sat Apr 10 08:50:43 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.6 2020/06/26 21:02:27 nia Exp $
+$NetBSD: patch-configure,v 1.7 2021/04/10 08:50:43 adam Exp $
Sun audio support.
@@ -7,11 +7,9 @@
Do not use 'rsync'.
-Portability fixes.
-
---- configure.orig 2020-06-15 18:54:23.000000000 +0000
+--- configure.orig 2021-04-08 21:28:39.000000000 +0000
+++ configure
-@@ -2131,6 +2131,7 @@ HEADERS_LIST="
+@@ -2139,6 +2139,7 @@ HEADERS_LIST="
sys_resource_h
sys_select_h
sys_soundcard_h
@@ -19,7 +17,7 @@
sys_time_h
sys_un_h
sys_videoio_h
-@@ -2272,7 +2273,6 @@ TOOLCHAIN_FEATURES="
+@@ -2280,7 +2281,6 @@ TOOLCHAIN_FEATURES="
inline_asm_labels
inline_asm_nonlocal_labels
pragma_deprecated
@@ -27,7 +25,7 @@
symver_asm_label
symver_gnu_asm
vfp_args
-@@ -3394,6 +3394,8 @@ opengl_outdev_deps="opengl"
+@@ -3430,6 +3430,8 @@ opengl_outdev_deps="opengl"
opengl_outdev_suggest="sdl2"
oss_indev_deps_any="sys_soundcard_h"
oss_outdev_deps_any="sys_soundcard_h"
@@ -36,19 +34,7 @@
pulse_indev_deps="libpulse"
pulse_outdev_deps="libpulse"
sdl2_outdev_deps="sdl2"
-@@ -5033,9 +5035,9 @@ elif enabled mips; then
- disable mipsdsp
- disable mipsdspr2
- # When gcc version less than 5.3.0, add -fno-expensive-optimizations flag.
-- if [ $cc == gcc ]; then
-+ if [ $cc = gcc ]; then
- gcc_version=$(gcc -dumpversion)
-- if [ "$(echo "$gcc_version 5.3.0" | tr " " "\n" | sort -rV | head -n 1)" == "$gcc_version" ]; then
-+ if [ "$(echo "$gcc_version 5.3.0" | tr " " "\n" | sort -rV | head -n 1)" = "$gcc_version" ]; then
- expensive_optimization_flag=""
- else
- expensive_optimization_flag="-fno-expensive-optimizations"
-@@ -5330,6 +5332,8 @@ case $target_os in
+@@ -5368,6 +5370,8 @@ case $target_os in
;;
netbsd)
disable symver
@@ -57,7 +43,7 @@
oss_indev_extralibs="-lossaudio"
oss_outdev_extralibs="-lossaudio"
enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5728,10 +5732,13 @@ done
+@@ -5766,10 +5770,13 @@ done
check_cc pragma_deprecated "" '_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
# The global variable ensures the bits appear unchanged in the object file.
@@ -74,7 +60,7 @@
check_cc const_nan math.h "struct { double d; } static const bar[] = { { NAN } }"
-@@ -6114,6 +6121,7 @@ check_headers malloc.h
+@@ -6169,6 +6176,7 @@ check_headers malloc.h
check_headers mftransform.h
check_headers net/udplite.h
check_headers poll.h
@@ -82,7 +68,7 @@
check_headers sys/param.h
check_headers sys/resource.h
check_headers sys/select.h
-@@ -6537,7 +6545,6 @@ enabled makeinfo \
+@@ -6598,7 +6606,6 @@ enabled makeinfo \
disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
perl -v > /dev/null 2>&1 && enable perl || disable perl
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/patches/patch-doc_general.texi
--- a/multimedia/ffmpeg4/patches/patch-doc_general.texi Sat Apr 10 08:49:19 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-doc_general.texi,v 1.1 2020/03/20 21:19:54 nia Exp $
-
---- doc/general.texi.orig 2019-12-31 21:35:22.000000000 +0000
-+++ doc/general.texi
-@@ -1354,6 +1354,7 @@ performance on systems without hardware
- @item OSS @tab X @tab X
- @item PulseAudio @tab X @tab X
- @item SDL @tab @tab X
-+@item Sun Audio @tab @tab X
- @item Video4Linux2 @tab X @tab X
- @item VfW capture @tab X @tab
- @item X11 grabbing @tab X @tab
diff -r 948fde02edec -r 77f6d2b4b32d multimedia/ffmpeg4/patches/patch-doc_general__contents.texi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg4/patches/patch-doc_general__contents.texi Sat Apr 10 08:50:43 2021 +0000
@@ -0,0 +1,14 @@
Home |
Main Index |
Thread Index |
Old Index