[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/files/

[David Seifert]

commit:     f0aef67613ec8f42c6ee89a97e69c60f39f69943
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 12 16:35:05 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 16:35:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aef676

media-libs/libjpeg-turbo: remove unused patch

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
deleted file mode 100644
index e88ac174684..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.0.4-CVE-2020-13790.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3de15e0c344d11d4b90f4a47136467053eb2d09a Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index 87bc33090..a8507b902 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
-  * Copyright (C) 1991-1997, Thomas G. Lane.
-  * Modified 2009 by Bill Allombert, Guido Vollbeding.
-  * libjpeg-turbo Modifications:
-- * Copyright (C) 2015-2017, D. R. Commander.
-+ * Copyright (C) 2015-2017, 2020, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README.ijg
-  * file.
-  *
-@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
-     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
-     source->rescale = (JSAMPLE *)
-       (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
--                                  (size_t)(((long)maxval + 1L) *
-+                                  (size_t)(((long)MAX(maxval, 255) + 1L) *
-                                            sizeof(JSAMPLE)));
-     half_maxval = maxval / 2;
-     for (val = 0; val <= (long)maxval; val++) {

[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/files/

[Conrad Kostecki]

commit:     c336c58d13a4607538a26f3a2630bf5e063489d0
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Aug 23 17:22:38 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 22:57:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c336c58d

media-libs/libjpeg-turbo: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/26983
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/libjpeg-turbo-2.1.1-arm64-relro.patch      | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
deleted file mode 100644
index 7784ae513d16..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-2.1.1-arm64-relro.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/129f0cb76346ceede8f4d8d87dea8acb0809056c
-
-From: DRC <information@libjpeg-turbo.org>
-Date: Wed, 25 Aug 2021 12:07:58 -0500
-Subject: [PATCH] Neon/AArch64: Don't put GAS functions in .rodata
-
-Regression introduced by 240ba417aa4b3174850d05ea0d22dbe5f80553c1
-
-Closes #546
---- a/simd/arm/aarch64/jsimd_neon.S
-+++ b/simd/arm/aarch64/jsimd_neon.S
-@@ -182,6 +182,8 @@ Ljsimd_huff_encode_one_block_neon_consts:
-     .byte    4,   5,   6,   7, 255, 255, 255, 255, \
-            255, 255, 255, 255, 255, 255, 255, 255  /* L7 : 1 line OK */
- 
-+.text
-+
- 
- /*****************************************************************************/
- 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/files/

[Sam James]

commit:     07c5d1a2b2c82269b8795fc4d9b67163f5898af4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 00:50:41 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 00:52:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c5d1a2

media-libs/libjpeg-turbo: scrub patch, add references

Makes it easier to lookup.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../2.1.5-initialize-simd_support-before-every-use.patch  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch b/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch
index 8ab7ede422b1..8533427938d0 100644
--- a/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch
+++ b/media-libs/libjpeg-turbo/files/2.1.5-initialize-simd_support-before-every-use.patch
@@ -1,4 +1,8 @@
-From d743a2c12e889f7605a56f5144ae2e3899c9dd4f Mon Sep 17 00:00:00 2001
+https://bugs.gentoo.org/893552
+https://github.com/libjpeg-turbo/libjpeg-turbo/commit/4e028ecd63aaa13c8a14937f9f1e9a272ed4b543
+https://github.com/libjpeg-turbo/libjpeg-turbo/issues/649
+
+From 4e028ecd63aaa13c8a14937f9f1e9a272ed4b543 Mon Sep 17 00:00:00 2001
 From: DRC <information@libjpeg-turbo.org>
 Date: Thu, 2 Feb 2023 08:55:37 -0600
 Subject: [PATCH] SIMD/x86: Initialize simd_support before every use
@@ -29,13 +33,6 @@ This patch has been verified to be performance-neutral to within
 W3530 and a 3.6 GHz Intel Xeon W2123.
 
 Fixes #649
----
- simd/i386/jsimd.c   | 71 ++++++++++++++++++++++++++++++++++++++++++++-
- simd/x86_64/jsimd.c | 47 +++++++++++++++++++++++++++++-
- 2 files changed, 116 insertions(+), 2 deletions(-)
-
-diff --git a/simd/i386/jsimd.c b/simd/i386/jsimd.c
-index 7bd61b62f..b429b0a53 100644
 --- a/simd/i386/jsimd.c
 +++ b/simd/i386/jsimd.c
 @@ -2,7 +2,7 @@
@@ -277,8 +274,6 @@ index 7bd61b62f..b429b0a53 100644
    if ((simd_support & JSIMD_SSE2) && IS_ALIGNED_SSE(jconst_idct_float_sse2))
      jsimd_idct_float_sse2(compptr->dct_table, coef_block, output_buf,
                            output_col);
-diff --git a/simd/x86_64/jsimd.c b/simd/x86_64/jsimd.c
-index 227e27657..3f5ee77eb 100644
 --- a/simd/x86_64/jsimd.c
 +++ b/simd/x86_64/jsimd.c
 @@ -2,7 +2,7 @@