diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-06 00:30:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-06 00:30:33 +0100 |
| commit | 9323524b4d44f4ec3dc923bd8e9ea04bdde8a067 (patch) | |
| tree | 8ca7b8c58d4e70389d5d4672ebd86cb475cf9f80 /media-video | |
| parent | 8c11cf748cc296d6338a189106a8cc9e3a1e0948 (diff) | |
gentoo auto-resync : 06:04:2024 - 00:30:33
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/Manifest.gz | bin | 24543 -> 24541 bytes | |||
| -rw-r--r-- | media-video/mpv/Manifest | 3 | ||||
| -rw-r--r-- | media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch | 45 | ||||
| -rw-r--r-- | media-video/mpv/mpv-0.37.0-r1.ebuild | 1 |
4 files changed, 48 insertions, 1 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex da3d8447a1e2..a5beb9be9336 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index d5fa6510ae61..0e322c34c46c 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,6 +1,7 @@ AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06d9cab14c40e9108c09d068c1ccba133dd91ba4c1d0735c67d0a8010003c77b85466343504cb220498fa24ac964 SHA512 8ce946f6043abb274b3051e787f5445ad40a3ea404cb2effcf9a4415a589483861381e54762e31f72d03c4975d01b67b662b6fb8a8a9194d7cd7d8acb4cab084 +AUX mpv-0.37.0-ffmpeg7.patch 1656 BLAKE2B 05826bd93c8c63d8114195a9ba595d93ce3fc9a03cc09c4dff364ca72f7ce934576c76b5841b0f45db4e9a85796ced590d2bf2cb34c22774ecbb87f75a383f43 SHA512 3a387c8b985a5aa02c1f7d4d1fba776731a820f057a9121d0ea6f2e95336755fdf3144c3f826ea452c6a5e135e006e3636f0b12c1c02ae6bd5f1eead36018d92 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257 -EBUILD mpv-0.37.0-r1.ebuild 6992 BLAKE2B dcb4a3d408033fcb0f2b1994cbe6071600e265219813782858568bbc172fca4e0824a87b647505ede1390ba8e2a3f34d4f4f729e1fecb01661ee0eae80b9fbd7 SHA512 f55c5aa81b3553fea5ca0edf1dbba18bc79e4839a8e6f26905ac5fe972308961f01caf958501b618947665000f8f4456a30bed5384acc6c47502d3533a4f232e +EBUILD mpv-0.37.0-r1.ebuild 7034 BLAKE2B c951ca2938728125be40ae09e176e9cd1b489f15895ca4321b6221c93d3694f6e1fcf90e833ba4999bdf3eaa7930eb40c39d8625489a9ac28d28816e0a20cf36 SHA512 267e971f5717e7299b833adc0f974dcafa55695d3fb137cafbe4533f67bb1b6d59c318fe68d4506e81f1c4fac93e9be05dcb3d30724219bd5f80db1e4c1f0d56 EBUILD mpv-0.37.0.ebuild 7087 BLAKE2B 322689b3988e47e41ae050e596518ca46d9f12048568d5d8920c98fe92f48adc28430a6fd92734cbf06ee9d01c74dea7f6aed133a9c8eb7aed50e2ffd2b5c0fb SHA512 b38640e3fae2cdaa8db042779516ce4143af50162af42548e49129c259d44bf76b217744d8541a7cc223f4385f1f9c55ba2fc8e7ea1c257a9034994a3b7f859d EBUILD mpv-9999.ebuild 6881 BLAKE2B d440452a44439fb4f0a74ff6a3e221a98c80b8a910a5f0230fd8425c34580f4f4fdcf0a3a587f92d564e207d4db087952e7aa99815b60bc82ab52dc970395bda SHA512 c20624072cc97e353589793e1fee3da0edc49fc95d041c67cfa396fa54fe1bebd166425d5f51a17b81cc5045c9d8307e59673fe820f01e965c6b4a74def90087 MISC metadata.xml 2248 BLAKE2B 384962e209948418c928a4a8d903f57a226116929db253847e7977d0febbf3fc23b18f947e9896b5a16e816267eb06c0e64145fc15270f66dca4fe7321c36897 SHA512 c4f1191adacde565a5d6ff6fdf10a9dedc84fae3d04792baac456e37fabcd80f04858031f442dcf1dd07c3d59e2343319c955969b23d0aef456c2d927a76bcbf diff --git a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch new file mode 100644 index 000000000000..3ac8d9b7b8dc --- /dev/null +++ b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch @@ -0,0 +1,45 @@ +https://github.com/mpv-player/mpv/pull/13659 +From: Dudemanguy <random342@airmail.cc> +Date: Thu, 7 Mar 2024 13:42:25 -0600 +Subject: [PATCH 1/2] ad_spdif: handle const buf pointee in avio_alloc_context + +ffmpeg recently changed this field to be const which causes our CI to +fail on newer versions. + +See: https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5 +--- a/audio/decode/ad_spdif.c ++++ b/audio/decode/ad_spdif.c +@@ -59,7 +59,11 @@ struct spdifContext { + struct mp_decoder public; + }; + ++#if LIBAVCODEC_VERSION_MAJOR < 61 + static int write_packet(void *p, uint8_t *buf, int buf_size) ++#else ++static int write_packet(void *p, const uint8_t *buf, int buf_size) ++#endif + { + struct spdifContext *ctx = p; + + +From 7f9eabfb023611565db8b6cce9a3473a6eb6c731 Mon Sep 17 00:00:00 2001 +From: Dudemanguy <random342@airmail.cc> +Date: Thu, 7 Mar 2024 14:12:15 -0600 +Subject: [PATCH 2/2] filters/f_lavfi: handle removed + AV_OPT_TYPE_CHANNEL_LAYOUT + +See: https://github.com/FFmpeg/FFmpeg/commit/65ddc74988245a01421a63c5cffa4d900c47117c +--- a/filters/f_lavfi.c ++++ b/filters/f_lavfi.c +@@ -1034,7 +1034,11 @@ static const char *get_avopt_type_name(enum AVOptionType type) + case AV_OPT_TYPE_VIDEO_RATE: return "fps"; + case AV_OPT_TYPE_DURATION: return "duration"; + case AV_OPT_TYPE_COLOR: return "color"; ++#if LIBAVUTIL_VERSION_MAJOR < 59 + case AV_OPT_TYPE_CHANNEL_LAYOUT: return "channellayout"; ++#else ++ case AV_OPT_TYPE_CHLAYOUT: return "channellayout"; ++#endif + case AV_OPT_TYPE_BOOL: return "bool"; + case AV_OPT_TYPE_CONST: // fallthrough + default: diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild index 9ac7b7e545b7..a0cb7dee8450 100644 --- a/media-video/mpv/mpv-0.37.0-r1.ebuild +++ b/media-video/mpv/mpv-0.37.0-r1.ebuild @@ -129,6 +129,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.37.0-drm-fix.patch + "${FILESDIR}"/${PN}-0.37.0-ffmpeg7.patch ) pkg_setup() { |