diff --git a/libjpeg-turbo-2.1.4.tar.gz b/libjpeg-turbo-2.1.4.tar.gz deleted file mode 100644 index 72e394c9f6c1b7c50467c72bb2c78bb29552f3bd..0000000000000000000000000000000000000000 Binary files a/libjpeg-turbo-2.1.4.tar.gz and /dev/null differ 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 0000000000000000000000000000000000000000..0a4a0fa277688681057bc09fd56e5c92de98ffd9 Binary files /dev/null and b/libjpeg-turbo-2.1.5.1.tar.gz differ diff --git a/libjpeg-turbo-cmake.patch b/libjpeg-turbo-cmake.patch index 293fc33f960fda411decf14c6d3cd9c56167ad1e..4129d6102c1baa2e211562d262a4e863b4f43b1c 100644 --- a/libjpeg-turbo-cmake.patch +++ b/libjpeg-turbo-cmake.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1198ece..39ebbc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1436,8 +1436,6 @@ if(WITH_TURBOJPEG) +@@ -1464,8 +1464,6 @@ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -11,12 +11,12 @@ index 1198ece..39ebbc7 100644 if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$" -@@ -1448,15 +1446,6 @@ if(WITH_TURBOJPEG) +@@ -1476,15 +1474,6 @@ install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT ENABLE_SHARED) -- if(MSVC_IDE OR XCODE) +- if(GENERATOR_IS_MULTI_CONFIG) - set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") - else() - set(DIR ${CMAKE_CURRENT_BINARY_DIR}) @@ -27,7 +27,7 @@ index 1198ece..39ebbc7 100644 endif() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -@@ -1483,18 +1472,6 @@ endif() +@@ -1511,18 +1500,6 @@ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -46,7 +46,7 @@ index 1198ece..39ebbc7 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 -@@ -1515,7 +1492,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets +@@ -1546,7 +1523,7 @@ 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 72e992d9a961ef75c2e209e99b95bf2813990cae..9428466bb4405cdc85e23282305bc97c356015f5 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ -%define anolis_release 2 +%define anolis_release 1 Name: libjpeg-turbo -Version: 2.1.4 +Version: 2.1.5.1 Release: %{anolis_release}%{?dist} Summary: A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files License: IJG @@ -81,7 +81,6 @@ export LDFLAGS="$RPM_LD_FLAGS -Wl,-z,ibt -Wl,-z,shstk" %install %cmake_install -find %{buildroot} -name "*.la" -delete # Fix perms chmod -x README.md @@ -92,9 +91,6 @@ chmod -x README.md export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %ctest -%ldconfig_scriptlets -%ldconfig_scriptlets -n turbojpeg - %files %dir %{abidir} %license LICENSE.md @@ -122,11 +118,6 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_bindir}/jpegtran %{_bindir}/rdjpgcom %{_bindir}/wrjpgcom -%{abidir}/cjpeg-option.list -%{abidir}/djpeg-option.list -%{abidir}/jpegtran-option.list -%{abidir}/rdjpgcom-option.list -%{abidir}/wrjpgcom-option.list %{_mandir}/man1/cjpeg.1* %{_mandir}/man1/djpeg.1* %{_mandir}/man1/jpegtran.1* @@ -146,6 +137,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_libdir}/pkgconfig/libturbojpeg.pc %changelog +* Wed Feb 15 2023 Funda Wang - 2.1.5.1-1 +- New version 2.1.5.1 + * Mon Oct 24 2022 mgb01105731 - 2.1.3-2 - optimise spec file & add doc package