From a969aee6970afaee2a02d46646d36877bd85a346 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Feb 2022 09:48:48 +0100 Subject: [PATCH] Update to 2.1.3 --- .gitignore | 1 + libjpeg-turbo-match-autoconf-behavior.patch | 30 --------------------- mingw-libjpeg-turbo.spec | 11 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 libjpeg-turbo-match-autoconf-behavior.patch diff --git a/.gitignore b/.gitignore index 2514829..bce01e6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /libjpeg-turbo-2.1.0.tar.gz /libjpeg-turbo-2.1.1.tar.gz /libjpeg-turbo-2.1.2.tar.gz +/libjpeg-turbo-2.1.3.tar.gz diff --git a/libjpeg-turbo-match-autoconf-behavior.patch b/libjpeg-turbo-match-autoconf-behavior.patch deleted file mode 100644 index be7b9b1..0000000 --- a/libjpeg-turbo-match-autoconf-behavior.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rupN --no-dereference libjpeg-turbo-2.1.2/win/jconfig.h.in libjpeg-turbo-2.1.2-new/win/jconfig.h.in ---- libjpeg-turbo-2.1.2/win/jconfig.h.in 2021-11-19 04:04:35.000000000 +0100 -+++ libjpeg-turbo-2.1.2-new/win/jconfig.h.in 2021-11-23 10:45:37.808397996 +0100 -@@ -9,13 +9,13 @@ - - #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ - --#define HAVE_STDDEF_H --#define HAVE_STDLIB_H -+#define HAVE_STDDEF_H 1 -+#define HAVE_STDLIB_H 1 - #undef NEED_SYS_TYPES_H - #undef NEED_BSD_STRINGS - --#define HAVE_UNSIGNED_CHAR --#define HAVE_UNSIGNED_SHORT -+#define HAVE_UNSIGNED_CHAR 1 -+#define HAVE_UNSIGNED_SHORT 1 - #undef INCOMPLETE_TYPES_BROKEN - #undef RIGHT_SHIFT_IS_UNSIGNED - -@@ -23,7 +23,7 @@ - #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ - typedef unsigned char boolean; - #endif --#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */ - - /* Define "INT32" as int, not long, per Windows custom */ - #if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */ diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec index 62bbb99..8aed91f 100644 --- a/mingw-libjpeg-turbo.spec +++ b/mingw-libjpeg-turbo.spec @@ -5,18 +5,14 @@ %global build_programs 0 Name: mingw-libjpeg-turbo -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.3 +Release: 1%{?dist} Summary: MinGW Windows Libjpeg-turbo library License: wxWidgets URL: http://libjpeg-turbo.virtualgl.org/ Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz -# Make jconfig.h more autoconf friendly -# https://bugzilla.redhat.com/show_bug.cgi?id=843193 -Patch0: libjpeg-turbo-match-autoconf-behavior.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -201,6 +197,9 @@ chmod -x README.md %changelog +* Mon Feb 28 2022 Sandro Mani - 2.1.3-1 +- Update to 2.1.3 + * Thu Jan 20 2022 Fedora Release Engineering - 2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 8fafb9d..883e638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libjpeg-turbo-2.1.2.tar.gz) = f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5 +SHA512 (libjpeg-turbo-2.1.3.tar.gz) = 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d