From e880d53e5017639d3f62562467f6ebcf17e8c4ed Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 28 Jan 2021 14:46:14 +0100 Subject: [PATCH] Update to 2.0.90 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 10 +++++----- mingw-libjpeg-turbo.spec | 9 +++++++-- sources | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bf8760e..1ecad02 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libjpeg-turbo-2.0.3.tar.gz /libjpeg-turbo-2.0.4.tar.gz /libjpeg-turbo-2.0.5.tar.gz +/libjpeg-turbo-2.0.90.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch index 3c7b896..2c093ea 100644 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ b/libjpeg-turbo-match-autoconf-behavior.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference libjpeg-turbo-2.0.5/win/jconfig.h.in libjpeg-turbo-2.0.5-new/win/jconfig.h.in ---- libjpeg-turbo-2.0.5/win/jconfig.h.in 2020-06-19 06:40:20.000000000 +0200 -+++ libjpeg-turbo-2.0.5-new/win/jconfig.h.in 2020-07-04 09:54:58.390069926 +0200 +diff -rupN --no-dereference libjpeg-turbo-2.0.90/win/jconfig.h.in libjpeg-turbo-2.0.90-new/win/jconfig.h.in +--- libjpeg-turbo-2.0.90/win/jconfig.h.in 2020-11-25 04:56:19.000000000 +0100 ++++ libjpeg-turbo-2.0.90-new/win/jconfig.h.in 2021-01-28 13:40:54.823347735 +0100 @@ -9,13 +9,13 @@ #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ @@ -18,8 +18,8 @@ diff -rupN --no-dereference libjpeg-turbo-2.0.5/win/jconfig.h.in libjpeg-turbo-2 +#define HAVE_UNSIGNED_SHORT 1 #undef INCOMPLETE_TYPES_BROKEN #undef RIGHT_SHIFT_IS_UNSIGNED - #undef __CHAR_UNSIGNED__ -@@ -24,7 +24,7 @@ + +@@ -23,7 +23,7 @@ #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ typedef unsigned char boolean; #endif diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 4243ddf..690fa4b 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,8 +5,8 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.0.5 -Release: 3%{?dist} +Version: 2.0.90 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets @@ -123,6 +123,7 @@ chmod -x README.md %{mingw32_includedir}/jmorecfg.h %{mingw32_includedir}/jpeglib.h %{mingw32_includedir}/turbojpeg.h +%{mingw32_libdir}/cmake/libjpeg-turbo/ %{mingw32_libdir}/libjpeg.dll.a %{mingw32_libdir}/libturbojpeg.dll.a %{mingw32_libdir}/pkgconfig/libjpeg.pc @@ -146,6 +147,7 @@ chmod -x README.md %{mingw64_includedir}/jmorecfg.h %{mingw64_includedir}/jpeglib.h %{mingw64_includedir}/turbojpeg.h +%{mingw64_libdir}/cmake/libjpeg-turbo/ %{mingw64_libdir}/libjpeg.dll.a %{mingw64_libdir}/libturbojpeg.dll.a %{mingw64_libdir}/pkgconfig/libjpeg.pc @@ -157,6 +159,9 @@ chmod -x README.md %changelog +* Thu Jan 28 2021 Sandro Mani - 2.0.90-1 +- Update to 2.0.90 + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index de45df5..2d86f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.0.5.tar.gz) = 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555 +SHA512 (libjpeg-turbo-2.0.90.tar.gz) = e00cab142c81e90d0eaf891d44ce3dccfdfe7d61e4efe8e81c5983dc6444ca1775f555316cce17b6551afc4b9e285202f53f6d0a8561433840fda311f630bc6d