gentoo auto-resync : 23:03:2024 - 07:01:01

3 files changed, 0 insertions, 91 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 124816849542..4ffd2a36920a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 4941041b2dcc..b75901a03ff7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,7 +3,6 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
 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.18-drop-minizip-dep.patch 1024 BLAKE2B f00df51fe46743b760785151fdc4b770347331b80fcb4208860b4cf99555504e634959384c236a3539c9235547d5eb54c0a1b18e0183b0864e0c4fc070359e15 SHA512 5911e0e64d07fd23a67b142adaec684c581125f06295a64dee9aade31e780b6010538007c7477ea9ef69e4e7b4aeb1cc30891dd22bf273c18407f694111a66f8
-AUX vlc-3.0.18-flac-crc.patch 4105 BLAKE2B 1d5d9103a5fe538f35be2f1a6a248e5d4312f75958e63f667c24abfe5d9f217d85fc79963f092041e300f8ab76363dc623a2d02b90827acba4e5ae0e3f2ced4e SHA512 8f9db986a72d0112b065699cd7459eaeae6270ff4f416b4490a11e100592ddff67adc28ebdc4c97a13433a506bbc5c6225f556545fcdb9c9c31a2524e57a1630
 AUX vlc-3.0.20-c99-2.patch 1062 BLAKE2B 5af148382216fbea0a5fa0e8431c340946eb11a2615cd46dac6ea656c7248ca0c3b274c4f4306f068702a1729a44ddc55b0983e95f16093582ac63554175da40 SHA512 1b5d40171ca9247fe144284eef8bf832626700d3daae76a7b7b2928c774de54e3e646da0ffcc8f2f0874d7fa1f289fa027c44cdc4b8461e0b2f9cdd8bc049f3f
 AUX vlc-3.0.20-c99.patch 5600 BLAKE2B 60abb31fde0687232f9d77808836a76e63945a2f805a7830a85b8bc374b2413ee1988d55cd992ad0d39644e66f5ba68f94620d13cb1213c00216539a809d5c43 SHA512 2b609afab28bf57adca34e11d9eeb120d6c61c7d3d3b06c999bac13987d1d4116819ce18d5af68e737c4f2eda727d619d129640d240ffdccdc634eeac91dd27a
 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.18-flac-crc.patch b/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
deleted file mode 100644
index 5e4d896bc7e7..000000000000
--- a/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/903665
-https://code.videolan.org/videolan/vlc/-/commit/c2dd4bfefe079e49db1789eb76be3885e4fc31b4
-
-(changed VLC_TICKS_INVALID -> VLC_TS_INVALID to avoid needing https://code.videolan.org/videolan/vlc/-/commit/0b4dff80ac381dd7de75125c70145a206a01eed8 too.)
-
-From c2dd4bfefe079e49db1789eb76be3885e4fc31b4 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev@free.fr>
-Date: Mon, 7 Nov 2022 15:02:57 +0100
-Subject: [PATCH] packetizer: flac: fix CRC from emulated sync
-
-also skips some memcpy
-
-refs #27454 #27477
-
-(cherry picked from commit c14b5aa6a7bd3aa25fa951e2b4136aff70f5702a)
---- a/modules/packetizer/flac.c
-+++ b/modules/packetizer/flac.c
-@@ -78,6 +78,7 @@ struct decoder_sys_t
- 
-     size_t i_last_frame_size;
-     uint16_t crc;
-+    size_t i_buf_offset; /* in final buffer before crc check / validation / retry */
-     size_t i_buf;
-     uint8_t *p_buf;
- 
-@@ -386,6 +387,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-         p_sys->headerinfo = headerinfo;
-         p_sys->i_state = STATE_NEXT_SYNC;
-         p_sys->i_offset = FLAC_FRAME_SIZE_MIN;
-+        p_sys->i_buf_offset = 0;
-         p_sys->crc = 0;
- 
-         /* We have to read until next frame sync code to compute current frame size
-@@ -461,6 +463,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             block_SkipBytes( &p_sys->bytestream, FLAC_HEADER_SIZE_MAX + 2 );
-             block_BytestreamFlush( &p_sys->bytestream );
-             p_sys->crc = 0;
-+            p_sys->i_buf_offset = 0;
-             p_sys->i_offset = 0;
-             p_sys->i_state = STATE_NOSYNC;
-             p_sys->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
-@@ -484,10 +487,12 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             }
- 
-             /* Copy from previous sync point up to to current (offset) */
--            block_PeekOffsetBytes( &p_sys->bytestream, 0, p_sys->p_buf, p_sys->i_offset );
-+            block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_buf_offset,
-+                                   &p_sys->p_buf[p_sys->i_buf_offset],
-+                                    p_sys->i_offset - p_sys->i_buf_offset );
- 
-             /* update crc to include this data chunk */
--            for( size_t i = 0; i < p_sys->i_offset - 2; i++ )
-+            for( size_t i = p_sys->i_buf_offset; i < p_sys->i_offset - 2; i++ )
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[i] );
- 
-             uint16_t stream_crc = GetWBE(&p_sys->p_buf[p_sys->i_offset - 2]);
-@@ -497,6 +502,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-                 /* Add the 2 last bytes which were not the CRC sum, and go for next sync point */
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 2] );
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 1] );
-+                p_sys->i_buf_offset = p_sys->i_offset;
-                 p_sys->i_offset += 1;
-                 p_sys->i_state = !pp_block ? STATE_NOSYNC : STATE_NEXT_SYNC;
-                 break; /* continue */
-@@ -513,6 +519,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             block_BytestreamFlush( &p_sys->bytestream );
-             p_sys->i_offset = 0;
-             p_sys->crc = 0;
-+            p_sys->i_buf_offset = 0;
- 
-             if( block_BytestreamRemaining(&p_sys->bytestream) > 0 || pp_block == NULL /* drain */)
-                 p_sys->i_state = STATE_SEND_DATA;
-@@ -553,6 +560,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-         else
-             free( p_sys->p_buf );
- 
-+        p_sys->i_buf_offset = 0;
-         p_sys->i_buf = 0;
-         p_sys->p_buf = NULL;
-         p_sys->i_offset = 0;
-@@ -587,6 +595,7 @@ static int Open(vlc_object_t *p_this)
-     p_sys->b_stream_info = false;
-     p_sys->i_last_frame_size = FLAC_FRAME_SIZE_MIN;
-     p_sys->headerinfo.i_pts  = VLC_TS_INVALID;
-+    p_sys->i_buf_offset  = 0;
-     p_sys->i_buf         = 0;
-     p_sys->p_buf         = NULL;
-     p_sys->i_next_block_flags = 0;
--- 
-GitLab