diff options
| author | Felix Palmen <zirias@FreeBSD.org> | 2023-05-13 05:32:38 +0000 |
|---|---|---|
| committer | Felix Palmen <zirias@FreeBSD.org> | 2023-05-13 08:35:29 +0000 |
| commit | 16de7a66163d68f90879b6c5b9a24f82aa89cb87 (patch) | |
| tree | 98e507f70d35ed2a2a5daa8f51296e70c8e36b23 | |
| parent | 35df570816a68c7ce9700063fd408350fc5b82d0 (diff) | |
| download | ports-16de7a66163d68f90879b6c5b9a24f82aa89cb87.tar.gz ports-16de7a66163d68f90879b6c5b9a24f82aa89cb87.zip | |
multimedia/makemkv: Update ffmpeg to 6.0
Update the statically linked ffmpeg to 6.0. For now, this also allows to
share the distfile with multimedia/ffmpeg
Approved by: tcberner (mentor, implicit)
| -rw-r--r-- | multimedia/makemkv/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/makemkv/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/makemkv/files/patch-ffmpeg6-compat | 11 |
3 files changed, 16 insertions, 4 deletions
diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index 8504405cc77c..3bba98b4c879 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -1,5 +1,6 @@ PORTNAME= makemkv DISTVERSION= 1.17.3 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.makemkv.com/download/:makemkv \ http://www.makemkv.com/download/old/:makemkv \ @@ -49,7 +50,7 @@ SUB_LIST= LINUXBASE=${LINUXBASE} PLIST_SUB= LINUXBASE=${LINUXBASE} FDKAACVERSION= 2.0.2 -FFMPEGVERSION= 5.1.2 +FFMPEGVERSION= 6.0 DISTFL_MAKEMKV= makemkv-oss-${DISTVERSION}.tar.gz \ makemkv-bin-${DISTVERSION}.tar.gz diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo index 0f85f152ef98..73d90ee0d198 100644 --- a/multimedia/makemkv/distinfo +++ b/multimedia/makemkv/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1676796381 +TIMESTAMP = 1683955871 SHA256 (makemkv-oss-1.17.3.tar.gz) = 16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb SIZE (makemkv-oss-1.17.3.tar.gz) = 6618376 SHA256 (makemkv-bin-1.17.3.tar.gz) = 1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0 SIZE (makemkv-bin-1.17.3.tar.gz) = 16402650 -SHA256 (ffmpeg-5.1.2.tar.xz) = 619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc -SIZE (ffmpeg-5.1.2.tar.xz) = 10004956 +SHA256 (ffmpeg-6.0.tar.xz) = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 +SIZE (ffmpeg-6.0.tar.xz) = 10234012 SHA256 (fdk-aac-2.0.2.tar.gz) = c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f SIZE (fdk-aac-2.0.2.tar.gz) = 2886434 diff --git a/multimedia/makemkv/files/patch-ffmpeg6-compat b/multimedia/makemkv/files/patch-ffmpeg6-compat new file mode 100644 index 000000000000..80b44064d07a --- /dev/null +++ b/multimedia/makemkv/files/patch-ffmpeg6-compat @@ -0,0 +1,11 @@ +--- libffabi/src/ffabi.c.orig 2023-05-13 05:57:55 UTC ++++ libffabi/src/ffabi.c +@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init( + #else + ctx->frame = av_frame_alloc(); + if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) { +- ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels, ++ ctx->frame_extended_data = av_calloc(ctx->avctx->channels, + sizeof(*ctx->frame_extended_data)); + if (!ctx->frame_extended_data) { + ffm_audio_encode_close(ctx); |