From fe426f1c9cdd6c07d9bea9f5e7bacee672ef4056649deac250c5a3fa599dd6ea Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Thu, 16 Nov 2023 13:37:02 +0000
Subject: [PATCH] revert

OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=148
---
 libjpeg-turbo-1.3.0-tiff-ojpeg.patch |   8 +-
 libjpeg-turbo-2.1.5.1.tar.gz         |   3 +
 libjpeg-turbo-2.1.5.1.tar.gz.sig     | Bin 0 -> 543 bytes
 libjpeg-turbo-3.0.1.tar.gz           |   3 -
 libjpeg-turbo-3.0.1.tar.gz.sig       | Bin 543 -> 0 bytes
 libjpeg-turbo.changes                | 196 ---------------------------
 libjpeg-turbo.spec                   |   6 +-
 7 files changed, 9 insertions(+), 207 deletions(-)
 create mode 100644 libjpeg-turbo-2.1.5.1.tar.gz
 create mode 100644 libjpeg-turbo-2.1.5.1.tar.gz.sig
 delete mode 100644 libjpeg-turbo-3.0.1.tar.gz
 delete mode 100644 libjpeg-turbo-3.0.1.tar.gz.sig

diff --git a/libjpeg-turbo-1.3.0-tiff-ojpeg.patch b/libjpeg-turbo-1.3.0-tiff-ojpeg.patch
index b52dc20..12db22a 100644
--- a/libjpeg-turbo-1.3.0-tiff-ojpeg.patch
+++ b/libjpeg-turbo-1.3.0-tiff-ojpeg.patch
@@ -1,8 +1,6 @@
-Index: libjpeg-turbo-3.0.1/jdhuff.c
-===================================================================
---- libjpeg-turbo-3.0.1.orig/jdhuff.c
-+++ libjpeg-turbo-3.0.1/jdhuff.c
-@@ -834,3 +834,35 @@ jinit_huff_decoder(j_decompress_ptr cinf
+--- a/jdhuff.c
++++ b/jdhuff.c
+@@ -649,3 +649,35 @@
      entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
    }
  }
diff --git a/libjpeg-turbo-2.1.5.1.tar.gz b/libjpeg-turbo-2.1.5.1.tar.gz
new file mode 100644
index 0000000..6bdc0f6
--- /dev/null
+++ b/libjpeg-turbo-2.1.5.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+size 2264936
diff --git a/libjpeg-turbo-2.1.5.1.tar.gz.sig b/libjpeg-turbo-2.1.5.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..136d0ea17a56ac1a86eee28e96bb2504772efc45c16a9208e49d8b84de6c9793
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p;H^!Davo2@rn5+qU%E^fZJ*5B@fsu+_7-pN?Cv&BPjZ
z%_h0-w#Ee@Y~8GQ{ik|K`wzY^p(z5LS$Ptiw717cgL^;mfXPKqV^_JrCo>~r9w{qf
zU&I(|lmZGIBWxM<=i$Ayy7H+8=zV$5AzC{hrCQiP{H@T=Z&O2sc^GbeA{VDX4Uk(#
zizri+X(E8pj^h$QCd|bscS+n>3k_jP$<UVONjG`xkkfwvUh4{+moR@w(6G*@V&+fo
zN|s=-%Gre+p;KuKqyB&>-fs!q%x`n+c<;q&|3qF^>_F0jkIj%ne=`iK0d~#a&UVa&
zM^m<>yuAw*0K(2ISa-LgX;0+yB<H7d%(u~YVyiii9fEB$gDN;@5_*NA4Kn~gwmbq0
zof3akl>%T;X<RRQGzTZFe^m;U-UZ#Jl_y5t2;Q~H^Q|xz_-evj=c20R)?-ZJSfB8w
zxkg48@GV~Br0@eR9;}X`JpQWNVVM?*A6v7)<}+!)8+A;oSM&|Zst3UjCo7u4)~eqX
zh;TCTV8VxXL_*TXwOt3HJGq-E88Md(lv=W6)E4^u)_c7aQgbWx3nc&ajp~2~fchej
z)<h^8w_q%{Ce`ncVfmtBmoN|~Qklyz-Qx4gO?i&|khRJ%py37)dhFA>>c9&OD#ciH
hb_aYhtsN*L{#1!nk7L&iFL{T@0s*QSFc4CbE4>T>0+;{*

literal 0
HcmV?d00001

diff --git a/libjpeg-turbo-3.0.1.tar.gz b/libjpeg-turbo-3.0.1.tar.gz
deleted file mode 100644
index 169e873..0000000
--- a/libjpeg-turbo-3.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75
-size 2800900
diff --git a/libjpeg-turbo-3.0.1.tar.gz.sig b/libjpeg-turbo-3.0.1.tar.gz.sig
deleted file mode 100644
index 2fa127ce4cf3d9bda8f2e1119ba9e352a6bd299b928315f1361d00e5206b56fa..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p;L)bs_)?2@rn5+qU%E^fbUF5B(JL4r<j<ASXo?sjdm|
z+EwQYBV2NP{>2+wLFQ_U@$kJ)?RokC0+Cbbsq?!2#{T>Lrsob#mhBAF>vuY?2tzf5
z-k+{WeT8|VZO-fK1|qNAUhbmR4;t|AvmQ?gltABqq27XFBfi1-BQ<9{7KWU{DKcZp
z(;R$3LDZwjbbKUm??a{kLUXHZgUYlA+sv5-=R;%GFyQo!ruO<$YvpY}yKrafx=ng=
z7_Ulrr+^SOw3HRQUSo0pHgB7m8M}-|O_!H|n~jEZ-%}tzUG+NRg@Q}dq-u}6w5SGV
zR5iszP$<_=ZsRc8kWI>jx$9UtAiVO#hm~j(xXM6m0b!RQo_-g|ETw6S41)9oyYRSH
zFhQg^hnj?f<=oh~*!AhI7E~Z_8*MD)z>{<C$6h%HfQiVMsr<>za(kU1tW1n;sdQ^U
zKG!5k582k+Z``gn<b(C);fd780jH<|&O&R2y}e-6Ij;5(HZC$26du_f+Kk^;R>P52
zH?8sha7rL3jii}BI5wd*UDi#Qp}E*twbTvEgaAA7LbSs`2`)<fK5)o!`=2Jct6P8T
zBI;4)iY1X%xYbjdCI#~aSa6X!fFeHg-~}QIx|yE+sBUlBM6{hjR}Af*kXg>XNkPJ7
hVse|eA!b-Sxv;<1mPB5!!OezNff45l!#9F#t$Ha`5pn<k

diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes
index a3edb55..09db39e 100644
--- a/libjpeg-turbo.changes
+++ b/libjpeg-turbo.changes
@@ -1,199 +1,3 @@
--------------------------------------------------------------------
-Thu Nov 16 13:09:18 UTC 2023 - pgajdos@suse.com
-
-- update to 3.0.1
-  3.0.1
-  =====
-  * The x86-64 SIMD functions now use a standard stack frame, prologue, and
-    epilogue so that debuggers and profilers can reliably capture backtraces from
-    within the functions.
-  * Fixed two minor issues in the interblock smoothing algorithm that caused
-    mathematical (but not necessarily perceptible) edge block errors when
-    decompressing progressive JPEG images exactly two MCU blocks in width or that
-    use vertical chrominance subsampling.
-  * Fixed a regression introduced by 3.0 beta2[6] that, in rare cases, caused
-    the C Huffman encoder (which is not used by default on x86 and Arm CPUs) to
-    generate incorrect results if the Neon SIMD extensions were explicitly disabled
-    at build time (by setting the `WITH_SIMD` CMake variable to `0`) in an AArch64
-    build of libjpeg-turbo.
-  3.0.0
-  =====
-  * The TurboJPEG API now supports 4:4:1 (transposed 4:1:1) chrominance
-    subsampling, which allows losslessly transposed or rotated 4:1:1 JPEG images to
-    be losslessly cropped, partially decompressed, or decompressed to planar YUV
-    images.
-  * Fixed various segfaults and buffer overruns (CVE-2023-2804) that occurred
-    when attempting to decompress various specially-crafted malformed
-    12-bit-per-component and 16-bit-per-component lossless JPEG images using color
-    quantization or merged chroma upsampling/color conversion.  The underlying
-    cause of these issues was that the color quantization and merged chroma
-    upsampling/color conversion algorithms were not designed with lossless
-    decompression in mind.  Since libjpeg-turbo explicitly does not support color
-    conversion when compressing or decompressing lossless JPEG images, merged
-    chroma upsampling/color conversion never should have been enabled for such
-    images.  Color quantization is a legacy feature that serves little or no
-    purpose with lossless JPEG images, so it is also now disabled when
-    decompressing such images.  (As a result, djpeg can no longer decompress a
-    lossless JPEG image into a GIF image.)
-  * Fixed an oversight in 1.4 beta1[8] that caused various segfaults and buffer
-    overruns when attempting to decompress various specially-crafted malformed
-    12-bit-per-component JPEG images using djpeg with both color quantization and
-    RGB565 color conversion enabled.
-  * Fixed an issue whereby `jpeg_crop_scanline()` sometimes miscalculated the
-    downsampled width for components with 4x2 or 2x4 subsampling factors if
-    decompression scaling was enabled.  This caused the components to be upsampled
-    incompletely, which caused the color converter to read from uninitialized
-    memory.  With 12-bit data precision, this caused a buffer overrun or underrun
-    and subsequent segfault if the sample value read from uninitialized memory was
-    outside of the valid sample range.
-  * Fixed a long-standing issue whereby the `tj3Transform()` function, when used
-    with the `TJXOP_TRANSPOSE`, `TJXOP_TRANSVERSE`, `TJXOP_ROT90`, or
-    `TJXOP_ROT270` transform operation and without automatic JPEG destination
-    buffer (re)allocation or lossless cropping, computed the worst-case transformed
-    JPEG image size based on the source image dimensions rather than the
-    transformed image dimensions.  If a calling program allocated the JPEG
-    destination buffer based on the transformed image dimensions, as the API
-    documentation instructs, and attempted to transform a specially-crafted 4:2:2,
-    4:4:0, 4:1:1, or 4:4:1 JPEG source image containing a large amount of metadata,
-    the issue caused `tj3Transform()` to overflow the JPEG destination buffer
-    rather than fail gracefully.  The issue could be worked around by setting
-    `TJXOPT_COPYNONE`.  Note that, irrespective of this issue, `tj3Transform()`
-    cannot reliably transform JPEG source images that contain a large amount of
-    metadata unless automatic JPEG destination buffer (re)allocation is used or
-    `TJXOPT_COPYNONE` is set.
-  * Fixed a regression introduced by 3.0 beta2[6] that prevented the djpeg
-    `-map` option from working when decompressing 12-bit-per-component lossy JPEG
-    images.
-  * Fixed an issue that caused the C Huffman encoder (which is not used by
-    default on x86 and Arm CPUs) to read from uninitialized memory when attempting
-    to transform a specially-crafted malformed arithmetic-coded JPEG source image
-    into a baseline Huffman-coded JPEG destination image.
-  2.1.91 (3.0 beta2)
-  ==================
-  * Significantly sped up the computation of optimal Huffman tables.  This
-    speeds up the compression of tiny images by as much as 2x and provides a
-    noticeable speedup for images as large as 256x256 when using optimal Huffman
-    tables.
-  * All deprecated fields, constructors, and methods in the TurboJPEG Java API
-    have been removed.
-  * Arithmetic entropy coding is now supported with 12-bit-per-component JPEG
-    images.
-  * Overhauled the TurboJPEG API to address long-standing limitations and to
-    make the API more extensible and intuitive:
-         - All C function names are now prefixed with `tj3`, and all version
-    suffixes have been removed from the function names.  Future API overhauls will
-    increment the prefix to `tj4`, etc., thus retaining backward API/ABI
-    compatibility without versioning each individual function.
-         - Stateless boolean flags have been replaced with stateful integer API
-    parameters, the values of which persist between function calls.  New
-    functions/methods (`tj3Set()`/`TJCompressor.set()`/`TJDecompressor.set()` and
-    `tj3Get()`/`TJCompressor.get()`/`TJDecompressor.get()`) can be used to set and
-    query the value of a particular API parameter.
-         - The JPEG quality and subsampling are now implemented using API
-    parameters rather than stateless function arguments (C) or dedicated set/get
-    methods (Java.)
-         - `tj3DecompressHeader()` now stores all relevant information about the
-    JPEG image, including the width, height, subsampling type, entropy coding
-    algorithm, etc., in API parameters rather than returning that information
-    through pointer arguments.
-         - `TJFLAG_LIMITSCANS`/`TJ.FLAG_LIMITSCANS` has been reimplemented as an
-    API parameter (`TJPARAM_SCANLIMIT`/`TJ.PARAM_SCANLIMIT`) that allows the number
-    of scans to be specified.
-         - Optimized baseline entropy coding (the computation of optimal Huffman
-    tables, as opposed to using the default Huffman tables) can now be specified,
-    using a new API parameter (`TJPARAM_OPTIMIZE`/`TJ.PARAM_OPTIMIZE`), a new
-    transform option (`TJXOPT_OPTIMIZE`/`TJTransform.OPT_OPTIMIZE`), and a new
-    TJBench option (`-optimize`.)
-         - Arithmetic entropy coding can now be specified or queried, using a new
-    API parameter (`TJPARAM_ARITHMETIC`/`TJ.PARAM_ARITHMETIC`), a new transform
-    option (`TJXOPT_ARITHMETIC`/`TJTransform.OPT_ARITHMETIC`), and a new TJBench
-    option (`-arithmetic`.)
-         - The restart marker interval can now be specified, using new API
-    parameters (`TJPARAM_RESTARTROWS`/`TJ.PARAM_RESTARTROWS` and
-    `TJPARAM_RESTARTBLOCKS`/`TJ.PARAM_RESTARTBLOCKS`) and a new TJBench option
-    (`-restart`.)
-         - Pixel density can now be specified or queried, using new API parameters
-    (`TJPARAM_XDENSITY`/`TJ.PARAM_XDENSITY`,
-    `TJPARAM_YDENSITY`/`TJ.PARAM_YDENSITY`, and
-    `TJPARAM_DENSITYUNITS`/`TJ.PARAM_DENSITYUNITS`.)
-         - The accurate DCT/IDCT algorithms are now the default for both
-    compression and decompression, since the "fast" algorithms are considered to be
-    a legacy feature.  (The "fast" algorithms do not pass the ISO compliance tests,
-    and those algorithms are not any faster than the accurate algorithms on modern
-    x86 CPUs.)
-         - All C initialization functions have been combined into a single function
-    (`tj3Init()`) that accepts an integer argument specifying the subsystems to
-    initialize.
-         - All C functions now use the `const` keyword for pointer arguments that
-    point to unmodified buffers (and for both dimensions of pointer arguments that
-    point to sets of unmodified buffers.)
-         - All C functions now use `size_t` rather than `unsigned long` to
-    represent buffer sizes, for compatibility with `malloc()` and to avoid
-    disparities in the size of `unsigned long` between LP64 (Un*x) and LLP64
-    (Windows) operating systems.
-         - All C buffer size functions now return 0 if an error occurs, rather than
-    trying to awkwardly return -1 in an unsigned data type (which could easily be
-    misinterpreted as a very large value.)
-         - Decompression scaling is now enabled explicitly, using a new
-    function/method (`tj3SetScalingFactor()`/`TJDecompressor.setScalingFactor()`),
-    rather than implicitly using awkward "desired width"/"desired height"
-    arguments.
-         - Partial image decompression has been implemented, using a new
-    function/method (`tj3SetCroppingRegion()`/`TJDecompressor.setCroppingRegion()`)
-    and a new TJBench option (`-crop`.)
-         - The JPEG colorspace can now be specified explicitly when compressing,
-    using a new API parameter (`TJPARAM_COLORSPACE`/`TJ.PARAM_COLORSPACE`.)  This
-    allows JPEG images with the RGB and CMYK colorspaces to be created.
-         - TJBench no longer generates error/difference images, since identical
-    functionality is already available in ImageMagick.
-         - JPEG images with unknown subsampling configurations can now be
-    fully decompressed into packed-pixel images or losslessly transformed (with the
-    exception of lossless cropping.)  They cannot currently be partially
-    decompressed or decompressed into planar YUV images.
-         - `tj3Destroy()` now silently accepts a NULL handle.
-         - `tj3Alloc()` and `tj3Free()` now return/accept void pointers, as
-    `malloc()` and `free()` do.
-         - The C image I/O functions now accept a TurboJPEG instance handle, which
-    is used to transmit/receive API parameter values and to receive error
-    information.
-  * Added support for 8-bit-per-component, 12-bit-per-component, and
-    16-bit-per-component lossless JPEG images.  A new libjpeg API function
-    (`jpeg_enable_lossless()`), TurboJPEG API parameters
-    (`TJPARAM_LOSSLESS`/`TJ.PARAM_LOSSLESS`,
-    `TJPARAM_LOSSLESSPSV`/`TJ.PARAM_LOSSLESSPSV`, and
-    `TJPARAM_LOSSLESSPT`/`TJ.PARAM_LOSSLESSPT`), and a cjpeg/TJBench option
-    (`-lossless`) can be used to create a lossless JPEG image.  (Decompression of
-    lossless JPEG images is handled automatically.)  Refer to
-    [libjpeg.txt](libjpeg.txt), [usage.txt](usage.txt), and the TurboJPEG API
-    documentation for more details.
-  * Added support for 12-bit-per-component (lossy and lossless) and
-    16-bit-per-component (lossless) JPEG images to the libjpeg and TurboJPEG APIs:
-         - The existing `data_precision` field in `jpeg_compress_struct` and
-    `jpeg_decompress_struct` has been repurposed to enable the creation of
-    12-bit-per-component and 16-bit-per-component JPEG images or to detect whether
-    a 12-bit-per-component or 16-bit-per-component JPEG image is being
-    decompressed.
-         - New 12-bit-per-component and 16-bit-per-component versions of
-    `jpeg_write_scanlines()` and `jpeg_read_scanlines()`, as well as new
-    12-bit-per-component versions of `jpeg_write_raw_data()`,
-    `jpeg_skip_scanlines()`, `jpeg_crop_scanline()`, and `jpeg_read_raw_data()`,
-    provide interfaces for compressing from/decompressing to 12-bit-per-component
-    and 16-bit-per-component packed-pixel and planar YUV image buffers.
-         - New 12-bit-per-component and 16-bit-per-component compression,
-    decompression, and image I/O functions/methods have been added to the TurboJPEG
-    API, and a new API parameter (`TJPARAM_PRECISION`/`TJ.PARAM_PRECISION`) can be
-    used to query the data precision of a JPEG image.  (YUV functions are currently
-    limited to 8-bit data precision but can be expanded to accommodate 12-bit data
-    precision in the future, if such is deemed beneficial.)
-         - A new cjpeg and TJBench command-line argument (`-precision`) can be used
-    to create a 12-bit-per-component or 16-bit-per-component JPEG image.
-    (Decompression and transformation of 12-bit-per-component and
-    16-bit-per-component JPEG images is handled automatically.)
-        Refer to [libjpeg.txt](libjpeg.txt), [usage.txt](usage.txt), and the
-    TurboJPEG API documentation for more details.
-- modified patches
-  % libjpeg-turbo-1.3.0-tiff-ojpeg.patch (refreshed)
-
 -------------------------------------------------------------------
 Fri Jun 23 17:39:37 UTC 2023 - pgajdos@suse.com
 
diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index b784f71..b669b80 100644
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -23,13 +23,13 @@
 
 %define asan_build 0
 %define debug_build 0
-%define srcver 3.0.1
+%define srcver 2.1.5.1
 %if "%{flavor}" == "libjpeg-turbo"
 %define major    8
-%define minor    3
+%define minor    2
 %define micro    2
 %define tmajor   0
-%define tminor   3
+%define tminor   2
 %define tmicro   0
 %define tlibver  %{tmajor}.%{tminor}.%{tmicro}
 %endif