summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin23233 -> 23232 bytes
-rw-r--r--media-video/ffmpeg/Manifest5
-rw-r--r--media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild1
-rw-r--r--media-video/ffmpeg/ffmpeg-6.1.2.ebuild1
-rw-r--r--media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch35
-rw-r--r--media-video/mkvtoolnix/Manifest9
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch44
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild (renamed from media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild)2
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild (renamed from media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild)4
-rw-r--r--media-video/xvid4conf/Manifest2
-rw-r--r--media-video/xvid4conf/xvid4conf-1.12-r1.ebuild (renamed from media-video/xvid4conf/xvid4conf-1.12.ebuild)15
11 files changed, 60 insertions, 58 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 1812f07924e0..fede58f7c175 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a740ad73cc92..a47d01f65167 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -23,6 +23,7 @@ AUX ffmpeg-6.1.1-amd-av1-vaapi.patch 11069 BLAKE2B f30d00fd00215b8753ba720bde8b0
AUX ffmpeg-6.1.1-memory-leak.patch 4184 BLAKE2B 93499876d5bab3dede021f646146f449d209f520ace803d9d46b0132d32aaea2bf6047c67f8804545a8eb90530c8884f5c687836cff2af111baeb52bbf1884ba SHA512 926c662c27f379c9f91ee48eb23090ba7d0c429a0e00a1ebc0fcba75657c0091da1a1b11441a61cfa77e6ba659906127bf3a51ad17d9ff921455d5495381b658
AUX ffmpeg-6.1.1-vulkan-rename.patch 5784 BLAKE2B 25e85dc0e5d3915a709d86be60a938f4669d87a370c98bd5d17b94fd3e1fec4ae78a6fc696dd862ce5c932987aac601dfcf8f8c8a6a2acd8adf6166a4368b11d SHA512 f7d2a10b1c143d9ddbc08f0faa96ccabbbadb7ab2e293cef53f77f93b44560bf099b4a40e434295925683963887afaf34ee28052737b4207ca531d399e0243f5
AUX ffmpeg-6.1.1-wint-inconversion-libgcrypt.patch 3442 BLAKE2B 21d441dd39595c13b7be7407c774a9e3a9d4ae8b2334aeed79d2fa5b88f4c637665b782b0705fabe6283062549138453fb01d1c1d4bbcd799474a7590e59ed75 SHA512 aa8c0c259e7ab98afd608e4c2167eebe4e373000713c84a2052b9836cd04a029d6123bc1ce27a84589048ee3634ab8b30a8e501ff48394d3fccf9f13c85273af
+AUX ffmpeg-6.1.1-wint-inconversion-vulkan.patch 1565 BLAKE2B 275132b55cdd9b6e1671dc2db5cf5aea1b6198d0942f2ecda5078902ad62172742bf29e17ba63847133b7eb3ff93ccb832ad92e7a7c42ab8c8cc917e964be888 SHA512 fef857daa13fe2b146d22764ede340ccf348d21beda5db4635273c37e22acb054e9d000466fd06b057c97187ba406e5fb08b929808b49e64d67ffcfa0e459a9e
AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f
DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf
@@ -43,8 +44,8 @@ DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969
DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b
EBUILD ffmpeg-4.4.4-r11.ebuild 20088 BLAKE2B b94b463587e62913513bf46443aa26d45979ea13c960c008202c70ca7f5a5058799a5ed6b5dd0a38436a850a0403a5771258d80edab8719308ad28cf88c1a298 SHA512 a9e592bca2a1342d369b91c9c96fccecaf53d6ffbb7313bd4bc13b64c03b62488d89416b9ed77517cf2d8f9d4559ab9ed2a860bf1f7f5fd245f1ddbd46fc5a83
EBUILD ffmpeg-4.4.5-r1.ebuild 19846 BLAKE2B fa792dff1e42d56ef923af54e5ad98832c500b8398604a67c962daf0a396c1205783602132f36e9e9711b228d2d8b3c375ccb9d5b6854e12dbca921fe2239f69 SHA512 d06a2c0d3c55fed10223f63bd1060da5c08c1d8e4b6867a851fd223fe7b9ad9a709052b22109ccc13a8c9db925e1a783b9ce69d64dd5a293080a5c3cee8ad68d
-EBUILD ffmpeg-6.1.1-r8.ebuild 20294 BLAKE2B 9e09f71537f8d73364ab1371ce8627922bf6d952795904a42debf53bfd00a5f42436d3ea31220c8c2a614707bb69f40a28a7d736a74bd18d978f1a182e3427ff SHA512 99259d44b686bf59afb0538e229b3585c09efef82d31fa338a2b5f6cdea4ad4119c6a6349a72feb89d47efc9024c9fb8c8a788b90d942843862f5193ca01701a
-EBUILD ffmpeg-6.1.2.ebuild 20209 BLAKE2B a6c41374f4b3484691be74877da97110711ffe0114fa441635b7096d6f84d4c9256752b1652dc860b8a34a19220a68aae715ee85d2e98f16310cb9dfcbd5f26a SHA512 673f4c60ff2ee97b8b230a9d32975c3db3821eee587e98133ecb105bc9efff15a3b5d58b1a310115accb73019c2d484821200bd779d2455e5e55d64636b8fa65
+EBUILD ffmpeg-6.1.1-r8.ebuild 20352 BLAKE2B 11ab7a671aab1ef238b69740cc1f0def0cbf414c66e496de9de57e25a9096f5c4e6a69187fc0159c1e4a31c9058380769e5dbd349a6c2ec70ea71d7107e18e07 SHA512 a74fc7f4dd6e87148c0c4eba1a11bde934b2b50d8a176e44851f528c5a66ce88608745a460b70650de71cb2da0f029051f8b362f64fe5d4925a8f1c13df0c234
+EBUILD ffmpeg-6.1.2.ebuild 20267 BLAKE2B 75dbaf8b802ad194d6fcccf12fe3c1eb19e756963de1aafa860ad2daaa949ef3fe8cf3882cdff609a30584e5b6df5dfcb97f010c86b247b70cfb35e13582ea6a SHA512 3ccfe3a169c93ce912aa38844f4105d5b9f7966ee32405571e12addd3cc77573fba989021789c5e0172d22b639b54c8ad88d2b307b5269227b457eb2a982627e
EBUILD ffmpeg-7.0.1-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
EBUILD ffmpeg-7.0.2-r1.ebuild 20288 BLAKE2B 95c3335a8eacc6e7aee3c8bb56bc8a6d140172d05376694407c3e442b305eb6d45bdc9e6fdd6d336c40673f7ad8b2f4a853d1eb690940e8b5d9f02cb2e2b03e8 SHA512 5b362a3893950b70c69dfc8377afab78e8aaed2d3fc0e6009bcc445dc5153a5fea9478c5852b2920a104e717462f00eac99da29388f7f2bc910beb8234d6d4b0
EBUILD ffmpeg-9999.ebuild 20350 BLAKE2B 9159ff5687cd4a7ad20136cc748349e2fbfa0607b20e165ec7ca6b5155cb9e8cf110323fdccee5c7557f2f695e967187ebcb0f19888d89fccff416ca00167487 SHA512 f067c01e6602a57424b31f5f2462bb255194a323f15cf5c0139952a037cb49b078a32138595a78767371e7a92cb873eceeda019ee088ed6b2b2d7a549fc54bfa
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index 906e3e77d5e4..5bb0429d2e1f 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -385,6 +385,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.1.1-memory-leak.patch
"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch
"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
+ "${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
)
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index c913e481816f..32eb9022ffd3 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -383,6 +383,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.1-alignment.patch
"${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch
"${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch
+ "${FILESDIR}"/${PN}-6.1.1-wint-inconversion-vulkan.patch
)
MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch
new file mode 100644
index 000000000000..56c2d11efcd1
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-6.1.1-wint-inconversion-vulkan.patch
@@ -0,0 +1,35 @@
+From 5860a966d2fffbbda1af0014f0a4d37a21c4f2ca Mon Sep 17 00:00:00 2001
+From: Lynne <dev@lynne.ee>
+Date: Wed, 31 Jan 2024 14:15:04 +0100
+Subject: [PATCH] lavfi/vsrc_testsrc_vulkan: fix -Wint-conversion
+
+While VK_NULL_HANDLE is equivalent to NULL on 64-bit platforms, the same is not
+true across all platforms.
+
+Fixes building with gcc-14.
+---
+ libavfilter/vsrc_testsrc_vulkan.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavfilter/vsrc_testsrc_vulkan.c b/libavfilter/vsrc_testsrc_vulkan.c
+index 8761c21dfd1ed..1720bfac5e3a2 100644
+--- a/libavfilter/vsrc_testsrc_vulkan.c
++++ b/libavfilter/vsrc_testsrc_vulkan.c
+@@ -231,7 +231,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+ return AVERROR(ENOMEM);
+
+ err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, s->picref, NULL,
+- NULL, &s->opts, sizeof(s->opts));
++ VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+ if (err < 0)
+ return err;
+ }
+@@ -250,7 +250,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+ frame->sample_aspect_ratio = s->sar;
+ if (!s->draw_once) {
+ err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, frame, NULL,
+- NULL, &s->opts, sizeof(s->opts));
++ VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+ if (err < 0) {
+ av_frame_free(&frame);
+ return err;
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 0f39dd6bff70..3f7b322275fb 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,14 +1,13 @@
AUX mkvtoolnix-83.0.0-fix-disable-gui.patch 4772 BLAKE2B 9f1244cd93e1292cc91903846af71dac9bf0a81f2eedebe8166cd3516208a815d7054bec4ad77fb51f4adfc71a6ae5d84eb2096f5dc2d2895adde93d900a5f93 SHA512 f8939d53940fe2cd4a3b4e80b2af111934a5cacb9f87e7d17be9c3a34ce4205ec02ac4a2003c1b55ba97d0c5da132cdd8e123105db02cdcf7dfc289fdbc97314
-AUX mkvtoolnix-84.0.0-fix-libcxx-c++20.patch 1459 BLAKE2B 0836cb4b8d3df74254257b977272d3e6cdc4e9c0b92a95b17b880b722b942ed1a9eafe2b9bb2b822a2a593264d76f8a0941331db08e3377359b357fd5dd7be4f SHA512 8de434ee48cc4021fdbf2b8edf644f85bcfebf1c76a5ebfe11f74c86eb0564f7820db183ea7f2f3103e84a84428694cc946c142da54a5ee86950841feaa7c89e
AUX mkvtoolnix-86.0-libfmt-11-fix.patch 726 BLAKE2B 0379ba93dfb9669123492335516a3618cb970ea1ed19234202be7a28aa6276b51f982c596319f921ec0476e7d25b8ff74d46247f21af00838eed2bde22f36ab3 SHA512 6085ce904bf2ecb4fd43e469778f634b8e609a4a0f2733477605ead9b275a12be0fc1204ec09b601b5efb4328d65790ec424c2a542e14c962172b43797fc821f
DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
-DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
-DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184
DIST mkvtoolnix-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6
DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee
-EBUILD mkvtoolnix-83.0.ebuild 3138 BLAKE2B 71c5d5528b5a6b1f4fa70e85e9cfe0c2aacb292f0d088d93cd6b441fa0b300e5eef9d8d4e9be0ab32d2004c8a046fb2ea8a398a9b2b77ae75f6471be20d6f997 SHA512 0323f6e04b0d32e9ba2bc9c0fef1dce65ab23b2cd6e959a3b4572aedcf3c1f42e3d8e2411891f96d7bf2c9eade8090caba095422be82326434937e3ee3d828df
-EBUILD mkvtoolnix-84.0-r1.ebuild 3191 BLAKE2B cdbcd27d650f4e193a2fc76ff1e97f06be5b2ab49656332a235655465a87998546a160d18e35574c2814db700988951f6933cb8261752dc3b3f8c8b821e6024e SHA512 f5390992e4a381d5744f998fe624b633b2f141c7ee0d47aaced4d5903f1e33c958f8c33c0924106fa4975de03902071f53d816102a865028f9dddfea74947bfd
+DIST mkvtoolnix-88.0.tar.xz 11241552 BLAKE2B 01edcfe995e75fa7cde1916eb37a5f75d9788d5e56ee7a07ca106d861cf2d297a7d72974b0b6f958fec175d3db675e9e852af9f50345ededcca403983dcffa85 SHA512 b1b08a42f55e841c618cbfe19f40310ea7c879d43a6a1db4152abfd5618deccc33332a73b1fc21757660891907b9eb12028b8c016134708f0464d5cc10a343c2
+DIST mkvtoolnix-88.0.tar.xz.sig 833 BLAKE2B b0acd58dbc4c937ec50477e2695c4df1e67d6b40e985d676be38eaaff513a4eed17b19c612892c39c613e3736f516074febd12f76087ade3078d1183b0a3bce1 SHA512 f8175019b12f5a7bf36cc69f806d3dfc18431945f50bd1c4be5e5c1422ea9e53ca8ca93a08a417cae97da163b622ed09e7490a80255fccece6a5cbd32efbfe96
+EBUILD mkvtoolnix-83.0-r1.ebuild 3232 BLAKE2B f260b944cba90951c0db5b83bacb2ebbbd3f466dd14f0e4ba69460430783c334d232ec80c19aacb2dc926f4f1271966ee7444ad5d74d03ab77fbc729ebb65139 SHA512 3620d4f073e157e60e6f67b4f9fff494295cf7bb4df6b7140135902ed1d000fe6a4f712f10132f64adecc23673097f4e21a1ea83c522ee9e462b84575deee284
EBUILD mkvtoolnix-86.0.ebuild 3182 BLAKE2B a081872ad23073066638aebc67ceac238e2200f7e6ebd431706b3dd21f1b3424ba8d361353a5550bf94d0ba696be8e973bfddf98caf57724c137f75c5f48e6e6 SHA512 97f41c0614f8e2cf9e95eaf750671ca913415a6ee88965cad4c7fc3e0dc15fbcfb22bdf756227a171747710ad81f36f84d98228c081fb1a359baef0794836463
+EBUILD mkvtoolnix-88.0.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
EBUILD mkvtoolnix-9999.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c
MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch b/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
deleted file mode 100644
index 9a45aaa9cb9e..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/933417
-https://gitlab.com/mbunkus/mkvtoolnix/-/issues/3695
-https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1
-
-From 7e1bea9527616ab6ab38425e7290579f05dd9bb1 Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <mo@bunkus.online>
-Date: Tue, 30 Apr 2024 16:05:35 +0200
-Subject: [PATCH] replace removed `std::result_of` with `std::invoke_result`
-
-`std::result_of` was deprecated in C++17 & removed in C++20. A lot of
-compilers still make it available even when running in C++20 mode,
-while others don't.
-
-Therefore replace it with equivalent use of `std::invoke_result`.
-
-Fixes #3695.
---- a/NEWS.md
-+++ b/NEWS.md
-@@ -1,3 +1,11 @@
-+# Version ?
-+
-+## Bug fixes
-+
-+* fixed compilation of `src/common/sorting.h` with certain compilers due to
-+ the deprecation & removal of `std::result_of<>` in C++20. Fixes #3695.
-+
-+
- # Version 84.0 "Sleeper" 2024-04-28
-
- ## New features and enhancements
---- a/src/common/sorting.h
-+++ b/src/common/sorting.h
-@@ -27,7 +27,7 @@ namespace mtx::sort {
-
- template< typename Titer
- , typename Tcriterion_maker
-- , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
-+ , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
- , typename Tcomparator = std::less<Tcriterion>
- >
- void
---
-GitLab
-
diff --git a/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild
index 2cef711afba8..ed9f5a45e234 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-83.0-r1.ebuild
@@ -32,12 +32,14 @@ RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
# version requirement updates and other packaging info
+# <libfmt-11 https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259
RDEPEND="
app-text/cmark:0=
dev-libs/boost:=
dev-libs/gmp:=
>=dev-libs/libebml-1.4.5:=
>=dev-libs/libfmt-8.0.1:=
+ <dev-libs/libfmt-11
>=dev-libs/pugixml-1.11
>=dev-qt/qtbase-6.2:6[dbus]
media-libs/flac:=
diff --git a/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
index f5eaf0cade1f..6731cce63b2d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-84.0-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-88.0.ebuild
@@ -73,10 +73,6 @@ if [[ ${PV} != *9999 ]] ; then
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
fi
-PATCHES=(
- "${FILESDIR}"/mkvtoolnix-84.0.0-fix-libcxx-c++20.patch
-)
-
src_prepare() {
default
diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest
index b8d135a4edfd..223c25c698a7 100644
--- a/media-video/xvid4conf/Manifest
+++ b/media-video/xvid4conf/Manifest
@@ -1,3 +1,3 @@
DIST xvid4conf-1.12.tar.gz 133494 BLAKE2B cafe728bd85d2f34ba382d672d38b60378e632358ea7a03b9e3599c8a415517c6a84678a04383fbb2480e3ef35890a134c8fb6aa98eeeea8aac2fe9566282fc9 SHA512 277b081563b3e9ec2e3c78cf0ea7c504acf0585c0184ee359d0174be38c4c32b931360ce543193df3b323083d21a58d2ff94380647773c71eebed6928c857f57
-EBUILD xvid4conf-1.12.ebuild 423 BLAKE2B 963933a20993cd58bac1bf86244f244d9881231e1592db105b1d73d7edd6fa4931a72c6ed7c2f0f521ef707a386135607c6dfd361d538d0b881d48510960cc2b SHA512 0ed39d4587f780dbe74a19e93dadb3089bef10da6374d686f5c9dd36c58a9438846e0b7c91b804093d6e4179db54a57a2e2ac22b49e8b9aba1fb0a6fdb78c4d3
+EBUILD xvid4conf-1.12-r1.ebuild 562 BLAKE2B 92e4b6884d4449b52b0563237cf21f570b33e07ffe5b67359ba09e744bdf70da1093537c92bb60a52f40b928ea56cbaa1ff4412424d5c16c96eb992ae998503b SHA512 3f48f4f922af4d31f40f8ffa6f06b2a87ed3dc21bbac6c42edce1cfe1db38a355ff770a3edb135097345892b959f51b516f09dcf4d19512ad82e8bd7f336fb02
MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12-r1.ebuild
index 9132080a0b58..fae4889ee076 100644
--- a/media-video/xvid4conf/xvid4conf-1.12.ebuild
+++ b/media-video/xvid4conf/xvid4conf-1.12-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit autotools
DESCRIPTION="GTK2-configuration dialog for xvid4"
HOMEPAGE="http://cvs.exit1.org/cgi-bin/viewcvs.cgi/xvid4conf/"
@@ -14,3 +16,12 @@ KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
RDEPEND=">=x11-libs/gtk+-2.2.4:2"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ sed -i -e "s:configure.in:configure.ac:" configure.in || die
+
+ # bug #899916
+ eautoreconf
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 08:41:31 +0000