10 files changed, 3 insertions, 81 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 102acf2bb50c..b76e20195799 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3759833ba3fc..ca6fad779747 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,7 +4,6 @@ AUX ffmpeg-4.2.7-libsdl2-new-version-scheme.patch 1132 BLAKE2B 59d40a3edcb19909a
 AUX ffmpeg-4.4.2-libsdl2-new-version-scheme.patch 1061 BLAKE2B bd2efcc869ad19acbf312568bda705c83999e31ac365a7fbdedc281186d2ec567afb1f0af021e750e5cd76e6715de7006b642a24a936115760da10371a3db982 SHA512 9a005a86b817fdccd0f05704348a8446c3a9b269bdd8ad0243f07a8d0bf9dc0f388a134065e0695073b1df2867a3c8e5e725917ce331bf1ee03c20d8187d1dbe
 AUX ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
-AUX ffmpeg-5.0.1-libsdl2-new-version-scheme.patch 1061 BLAKE2B 262d6baf3592044d5cc520cc25e213f41d1d6c02c8848178ec1001ef4d8893ca6f3630fe74b8a5171e46b8607687a899e9970a97915e5e903cb78d34afc6ece0 SHA512 00dae0ebf2fcc0e99fde2d0126cb32262831402e1119e93d0b091fd32431fb36c6ac8b122ba4bf5d8a917e9aa965c9c5624b88aef598c11f9e20ad27731b9d50
 AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a
 DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
diff --git a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
deleted file mode 100644
index f95ff1cb7065..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/240d82f26eef10461c8b78b09a0db76c464deea8
-
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Wed, 11 May 2022 15:11:04 -0500
-Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
-
-sdl2 recently changed their versioning, moving the patch level to minor level
-https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
-and have said that they will instead ship sdl3.pc for 3.0.0
-
-Fixes ticket 9768
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
-Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
---- a/configure
-+++ b/configure
-@@ -6739,7 +6739,7 @@ fi
- 
- if enabled sdl2; then
-     SDL2_CONFIG="${cross_prefix}sdl2-config"
--    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
-+    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
-     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
-         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
-         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 70b26f2b3246..15d47540f5d7 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,3 +1,3 @@
 DIST ogmrip-1.0.1.tar.gz 3276396 BLAKE2B eed64f401483a44a5df17faeb51cc95a1626f71d0e074ca33a084f74dc8fb485339ed74b1a8d8958700f0d1b7689e653abc9ab6b8a1230217b416c9518b0c3be SHA512 22261b1a5086fc05139e8b9924b75d9a5a5e85b18e245e32545687e72273b485fe1c5041b89db653c6e2e9714518e17ea955435a20ac26fcc875fa8d1a90994c
-EBUILD ogmrip-1.0.1.ebuild 2159 BLAKE2B c6c7548ee235eac026ffc4f78ca2e7d8ae7fd3b533ad742dde67b3aee8755e5e14c1269b2ee239cd29a08e29df2fdd46dc06de5987f66cd8b7033df3ed226f0c SHA512 e3498b4da5b90fe7b533e4b589ff6403de242eaef0e6cde2cd22593ff9a55486fcd56c952717d0db65c492eb105ec2cc067fbcccd27d2caad6a7cc5b0902641b
+EBUILD ogmrip-1.0.1.ebuild 2158 BLAKE2B 24e54fde3b28d908b5f4fcba85d41dcf7cda07613509a3f8c4ffa2928cba9eb1f573b7fbc947fe19715668c8ab8ce022e9c22720435ffc51b57dd144088fb7d5 SHA512 d46603aa6a071b5c999c370b4a1d02c9504f1aeb70021fa0dc8dd2ba9fbb41c6237baa5f6db01b7140c56b921853381f9dbc5189a6152d6d1b827190a5a2e4a9
 MISC metadata.xml 484 BLAKE2B 62f523614a04106e887ba82aad1e21b9f10970566921c450036ec6d67742bea9cace03f82fb7d7034a8d8845be493c29317b088e738dbaefd9c9bf328acf6caa SHA512 32a3a57f27c5539daea26a8d125ff1b74ed02417909edd7eb488f89e4663e6027ea160bb0e0f8d3cf9072cfe9005432e1d4a073e4ee5bee12e80ef14e560c6e5
diff --git a/media-video/ogmrip/ogmrip-1.0.1.ebuild b/media-video/ogmrip/ogmrip-1.0.1.ebuild
index c0d8008fc0a1..a830cd1b2acd 100644
--- a/media-video/ogmrip/ogmrip-1.0.1.ebuild
+++ b/media-video/ogmrip/ogmrip-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit gnome2
 
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+DESCRIPTION="Graphical frontend and libraries for ripping DVD and encoding to AVI/OGM/MKV/MP4"
 HOMEPAGE="http://ogmrip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
 
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 0a8a7601f3da..b117ccb12cad 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,3 @@
-AUX pitivi-2021.05-python-collections.patch 406 BLAKE2B e3c70bb271d95ac5b6bd6f0fb8738b24e8db544140e565173aa71c652ee1c25f8e50f77ef822c3843e4609d531e5f9b25ce299cf82f59db975121a44c1ad0e58 SHA512 20c6c6df1d86a3e5e126b5f3d851fa56651a18a86313c358eef63a423d70e501b28abfc767e7fca8d01e0cd2106d346e2dcdbf8075f60596ac6ada8059e2f5e8
 DIST pitivi-2022.06.tar.xz 11352412 BLAKE2B f7d14f9bff136a8b50c0ce82e66fad92ba7df429d8cf588c526ae04f673617d882a0cc024c5a21c97471d2b31cb0001cefdeb8e32c9f62e1c6600d9500d1e428 SHA512 649c8e61d9545cbf35a0a0c8f648490c14c8bfb6c6637794887c03bffd6998c63cb2cc22102cd2f7a59974f79488a13f29beceadab29ddd1c1c01abff33a85fa
 EBUILD pitivi-2022.06.ebuild 2014 BLAKE2B ee9b5fb21c0a6ee376eaf95782d5ee1917b8286eed504bf5a85ab88da0a02baf5d9ede57ba65095ef15e5bab43561fae9b6a9c68e3da1c12ad668873c404353d SHA512 16c582d40a36a46b4a608b64ec8e7ada63c66f5eabaf36ea2d0fdee086d99592a771294fc37c45a906e5a2a129ffd40c22a5c34afd7dc4e5b002abf01a013d86
 MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459
diff --git a/media-video/pitivi/files/pitivi-2021.05-python-collections.patch b/media-video/pitivi/files/pitivi-2021.05-python-collections.patch
deleted file mode 100644
index fc04cd8d8726..000000000000
--- a/media-video/pitivi/files/pitivi-2021.05-python-collections.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://src.fedoraproject.org/rpms/pitivi/raw/rawhide/f/collections.patch
---- a/pitivi/utils/loggable.py
-+++ b/pitivi/utils/loggable.py
-@@ -14,7 +14,7 @@
- #
- # You should have received a copy of the GNU Lesser General Public
- # License along with this program; if not, see <http://www.gnu.org/licenses/>.
--import collections
-+import collections.abc as collections
- import errno
- import fnmatch
- import os
-
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3f793af8648f..2c4046280153 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,8 +2,6 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
-AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b04457e1cfc37954d30d9f2b29d711ea80ae2ec5431ed87be626caa16effa1565a34520dd7a54e89ee470e6aace6d3c594 SHA512 333480c279ad743b30ae61ab2e4e1c7bdca8e406009075f669c84fbaffe7fd68a9e9c58615d44cdba1056b973726c486cacd8d2dbcfea6f282173a929f5f8d68
-AUX vlc-3.0.13-srt-1.3.0.patch 446 BLAKE2B e02bad6bcc81508fd8d28a2b10f1760339c6a9432e951bf04596053493f2cec197468032ec29773fdf1b980cee5e2c71b556a4cdef4076fb08f0b1edc6965dba SHA512 1b4165bdb95d128ae9afdb1f650f629c219801eaf6f6e1f12659eb45026e732099ad3a714406e8ad0cdeb1f4e6988c187b7e60b69a8d00bdc759649f1d08b5e5
 AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 AUX vlc-3.0.17.3-dav1d-1.0.0.patch 3256 BLAKE2B 49403c38c7b05b80d7bc075debb584fd71d58c9368d32e8da7129d2e50c2a4152cd4a7f2e62426f520665e0c973a66061ed2622f275f9111b1c1b4bf3da17716 SHA512 5b5414e3c4bfaf62aaf479957c1e13f2747362cc26e2569036f8cb6be52e7148289a160366f3ba3a70198e1ac6cbad248d0d13b045db81e5e894490fa315ce63
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
deleted file mode 100644
index d617a8357ff7..000000000000
--- a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY.
-https://github.com/Haivision/srt/pull/1364
-https://bugs.gentoo.org/758062
---- b/modules/access/srt.c
-+++ a/modules/access/srt.c
-@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_stream, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     psz_passphrase = var_InheritString( p_stream, "passphrase" );
---- a/modules/access_output/srt.c
-+++ b/modules/access_output/srt.c
-@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_access, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')
diff --git a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
deleted file mode 100644
index c255689c1ca0..000000000000
--- a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4016,7 +4016,7 @@
- dnl
- dnl  SRT plugin
- dnl
--PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
-+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
- 
- EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
- dnl