From 1c9c33b6abc5325ed9632b27e45490459efccbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 5 Sep 2019 11:22:50 +0200 Subject: [PATCH] New upstream release 2.0.3 (#1749130) --- libjpeg-turbo-CET.patch | 10 +++++----- libjpeg-turbo-cmake.patch | 12 ++++++------ libjpeg-turbo.spec | 7 +++++-- sources | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libjpeg-turbo-CET.patch b/libjpeg-turbo-CET.patch index 1d62990..cb40697 100644 --- a/libjpeg-turbo-CET.patch +++ b/libjpeg-turbo-CET.patch @@ -1,4 +1,4 @@ -From 525936a83e019540870f54ffb60d2281805d84bf Mon Sep 17 00:00:00 2001 +From df564b5e94c2c405f41708da7f6414257e4a9649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Mon, 29 Apr 2019 11:28:51 +0200 Subject: [PATCH] x86 SIMD: Add endbr32/endbr64 instructions @@ -171,7 +171,7 @@ index 6ea69f6..98edd0a 100644 mov eax, esp ; eax = original ebp sub esp, byte 4 diff --git a/simd/i386/jcphuff-sse2.asm b/simd/i386/jcphuff-sse2.asm -index 25c63c7..5ab8bdb 100644 +index e35a7d8..5e55f4b 100644 --- a/simd/i386/jcphuff-sse2.asm +++ b/simd/i386/jcphuff-sse2.asm @@ -283,6 +283,7 @@ @@ -182,7 +182,7 @@ index 25c63c7..5ab8bdb 100644 push ebp mov eax, esp ; eax = original ebp sub esp, byte 4 -@@ -460,6 +461,7 @@ EXTN(jsimd_encode_mcu_AC_first_prepare_sse2): +@@ -462,6 +463,7 @@ EXTN(jsimd_encode_mcu_AC_first_prepare_sse2): GLOBAL_FUNCTION(jsimd_encode_mcu_AC_refine_prepare_sse2) EXTN(jsimd_encode_mcu_AC_refine_prepare_sse2): @@ -874,7 +874,7 @@ index 1b091ad..5265f3b 100644 mov rax, rsp ; rax = original rbp sub rsp, byte 4 diff --git a/simd/x86_64/jcphuff-sse2.asm b/simd/x86_64/jcphuff-sse2.asm -index b17488a..59d4d8d 100644 +index a9446b7..e01966c 100644 --- a/simd/x86_64/jcphuff-sse2.asm +++ b/simd/x86_64/jcphuff-sse2.asm @@ -283,6 +283,7 @@ @@ -885,7 +885,7 @@ index b17488a..59d4d8d 100644 push rbp mov rax, rsp ; rax = original rbp sub rsp, byte 4 -@@ -449,6 +450,7 @@ EXTN(jsimd_encode_mcu_AC_first_prepare_sse2): +@@ -451,6 +452,7 @@ EXTN(jsimd_encode_mcu_AC_first_prepare_sse2): GLOBAL_FUNCTION(jsimd_encode_mcu_AC_refine_prepare_sse2) EXTN(jsimd_encode_mcu_AC_refine_prepare_sse2): diff --git a/libjpeg-turbo-cmake.patch b/libjpeg-turbo-cmake.patch index a31a117..3ac8ca9 100644 --- a/libjpeg-turbo-cmake.patch +++ b/libjpeg-turbo-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bc3458..46b9ee6 100644 +index 28fd443..52f9a8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1328,7 +1328,7 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) +@@ -1337,7 +1337,7 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) if(WITH_TURBOJPEG) if(ENABLE_SHARED) @@ -11,12 +11,12 @@ index 2bc3458..46b9ee6 100644 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -@@ -1341,15 +1341,6 @@ if(WITH_TURBOJPEG) +@@ -1350,15 +1350,6 @@ if(WITH_TURBOJPEG) if(ENABLE_STATIC) install(TARGETS turbojpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT ENABLE_SHARED) -- if(MSVC_IDE) +- if(MSVC_IDE OR XCODE) - set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") - else() - set(DIR ${CMAKE_CURRENT_BINARY_DIR}) @@ -27,7 +27,7 @@ index 2bc3458..46b9ee6 100644 endif() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -@@ -1374,18 +1365,6 @@ endif() +@@ -1383,18 +1374,6 @@ endif() install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -46,7 +46,7 @@ index 2bc3458..46b9ee6 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 -@@ -1399,7 +1378,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc +@@ -1408,7 +1387,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 807f9d2..14745f5 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ Name: libjpeg-turbo -Version: 2.0.2 -Release: 4%{?dist} +Version: 2.0.3 +Release: 1%{?dist} Summary: A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files License: IJG URL: http://sourceforge.net/projects/libjpeg-turbo @@ -176,6 +176,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags} %{_libdir}/pkgconfig/libturbojpeg.pc %changelog +* Thu Sep 05 2019 Nikola Forró - 2.0.3-1 +- New upstream release 2.0.3 (#1749130) + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index bc1b8f3..317c743 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.2.tar.gz) = 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08 +SHA512 (libjpeg-turbo-2.0.3.tar.gz) = ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36