New upstream release 2.1.1 (#1991844)

libjpeg-turbo-CET.patch

@@ -1,4 +1,4 @@
-From a4f0a1781a96968c5d2db63e5f123b72dbce1876 Mon Sep 17 00:00:00 2001
+From ec7dcec4d423b8af21ef32381de5a4c1f7a541ec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
 Date: Thu, 3 Dec 2020 18:19:33 +0100
 Subject: [PATCH] x86 SIMD: Add endbr32/endbr64 instructions
@@ -171,7 +171,7 @@ index 278cf5e..b16b974 100644
  %assign stack_offset      0
  %define arg_state         4 + stack_offset
 diff --git a/simd/i386/jcphuff-sse2.asm b/simd/i386/jcphuff-sse2.asm
-index 8b73178..87190d1 100644
+index c26b48a..7fb01e5 100644
 --- a/simd/i386/jcphuff-sse2.asm
 +++ b/simd/i386/jcphuff-sse2.asm
 @@ -281,6 +281,7 @@
@@ -862,10 +862,10 @@ index f1d399a..550fc2f 100644
      mov         rax, rsp                     ; rax = original rbp
      sub         rsp, byte 4
 diff --git a/simd/x86_64/jchuff-sse2.asm b/simd/x86_64/jchuff-sse2.asm
-index 0072028..1770a84 100644
+index 9ea6df9..7e5ca30 100644
 --- a/simd/x86_64/jchuff-sse2.asm
 +++ b/simd/x86_64/jchuff-sse2.asm
-@@ -258,6 +258,7 @@ times 1 << 14 db 15
+@@ -259,6 +259,7 @@ times 1 << 15 db 16
      GLOBAL_FUNCTION(jsimd_huff_encode_one_block_sse2)
  
  EXTN(jsimd_huff_encode_one_block_sse2):
@@ -874,7 +874,7 @@ index 0072028..1770a84 100644
  %ifdef WIN64
  
 diff --git a/simd/x86_64/jcphuff-sse2.asm b/simd/x86_64/jcphuff-sse2.asm
-index 8ed4472..f316b27 100644
+index 01b5c02..4625c11 100644
 --- a/simd/x86_64/jcphuff-sse2.asm
 +++ b/simd/x86_64/jcphuff-sse2.asm
 @@ -281,6 +281,7 @@
@@ -1246,5 +1246,5 @@ index 3ee4420..fb1b4ae 100644
      mov         rax, rsp
      mov         rbp, rsp
 -- 
-2.26.2
+2.31.1
 

libjpeg-turbo-cmake.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10a198f..b77a0d0 100644
+index c01ec25..491ae0c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1434,8 +1434,6 @@ if(WITH_TURBOJPEG)
+@@ -1446,8 +1446,6 @@ if(WITH_TURBOJPEG)
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -11,7 +11,7 @@ index 10a198f..b77a0d0 100644
      if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
        CMAKE_C_LINKER_SUPPORTS_PDB)
        install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
-@@ -1446,15 +1444,6 @@ if(WITH_TURBOJPEG)
+@@ -1458,15 +1456,6 @@ if(WITH_TURBOJPEG)
      install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -27,7 +27,7 @@ index 10a198f..b77a0d0 100644
    endif()
    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-@@ -1481,18 +1470,6 @@ endif()
+@@ -1493,18 +1482,6 @@ endif()
  
  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  
@@ -46,7 +46,7 @@ index 10a198f..b77a0d0 100644
  if(UNIX OR MINGW)
    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
      ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
-@@ -1513,7 +1490,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
+@@ -1525,7 +1502,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
  
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
    ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h

libjpeg-turbo.spec

@@ -1,6 +1,6 @@
 Name:           libjpeg-turbo
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files
 License:        IJG
 URL:            http://sourceforge.net/projects/libjpeg-turbo
@@ -179,6 +179,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 %{_libdir}/pkgconfig/libturbojpeg.pc
 
 %changelog
+* Wed Aug 11 2021 Nikola Forró <nforro@redhat.com> - 2.1.1-1
+- New upstream release 2.1.1 (#1991844)
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libjpeg-turbo-2.1.0.tar.gz) = 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
+SHA512 (libjpeg-turbo-2.1.1.tar.gz) = 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673