rpms/libjpeg-turbo
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release 3.0.2 (Fixes RHBZ#2256228 and RHBZ#2166459)

Browse Source
This commit is contained in:
František Zatloukal 2024-02-05 16:39:45 +01:00
parent cca2878439
commit be16e25662
4 changed files with 253 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

466
libjpeg-turbo-CET.patch
View File

File diff suppressed because it is too large Load Diff

42
libjpeg-turbo-cmake.patch
View File

@ -1,38 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cca2966..4875bf3 100644
index adb0ca4..902c271 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1434,8 +1434,6 @@ if(WITH_TURBOJPEG)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- install(TARGETS tjbench
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
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)
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)
- set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
- else()
- set(DIR ${CMAKE_CURRENT_BINARY_DIR})
- endif()
- install(PROGRAMS ${DIR}/tjbench-static${EXE}
- DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
- endif()
endif()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
@@ -1481,18 +1470,6 @@ endif()
@@ -1768,18 +1768,6 @@ endif()
install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c
- ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
- ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
@ -46,12 +21,13 @@ index cca2966..4875bf3 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
@@ -1516,7 +1493,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
@@ -1803,7 +1791,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
- ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/jpegint.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
include(cmakescripts/BuildPackages.cmake)
--

16
libjpeg-turbo.spec
View File

@ -1,11 +1,11 @@
Name: libjpeg-turbo
Version: 2.1.4
Release: 6%{?dist}
Version: 3.0.2
Release: 1%{?dist}
Summary: A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files
License: Zlib AND BSD-3-Clause AND MIT AND IJG
URL: http://sourceforge.net/projects/libjpeg-turbo
URL: https://github.com/%{name}/%{name}
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: libjpeg-turbo-cmake.patch
Patch1: libjpeg-turbo-CET.patch
@ -92,6 +92,9 @@ export LDFLAGS="$RPM_LD_FLAGS -Wl,-z,ibt -Wl,-z,shstk"
%cmake_install
find %{buildroot} -name "*.la" -delete
# Remove tjbench
rm -f %{buildroot}/%{_bindir}/tjbench
# Fix perms
chmod -x README.md
@ -146,7 +149,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%{_libdir}/libjpeg.so.62*
%files devel
%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.txt
%doc coderules.txt jconfig.txt libjpeg.txt structure.txt
%{_includedir}/jconfig*.h
%{_includedir}/jerror.h
%{_includedir}/jmorecfg.h
@ -181,6 +184,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%{_libdir}/pkgconfig/libturbojpeg.pc
%changelog
* Mon Feb 05 2024 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.0.2-1
- New upstream release 3.0.2 (Fixes RHBZ#2256228 and RHBZ#2166459 and RHBZ#2208448)
* Mon Jan 29 2024 Matej Mužila <mmuzila@redhat.com> - 2.1.4-6
- migrated to SPDX license

2
sources
View File

@ -1 +1 @@
SHA512 (libjpeg-turbo-2.1.4.tar.gz) = 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
SHA512 (libjpeg-turbo-3.0.2.tar.gz) = f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29