diff options
author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2023-03-15 23:22:33 +0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2023-03-29 15:29:42 +0000 |
commit | 4bf27aa3a12cf4013ec1884ada902e905f751af7 (patch) | |
tree | 48221650196521f004df5d4117ce436300259b50 /external | |
parent | 0bd23b624035f0796fb161feadf948fd730b7cf8 (diff) |
libjpeg-turbo: upgrade to release 2.1.5.1
Fixes a serious regression that 2.1.5 had.[1]
[1] "Release 2.1.5.1 · libjpeg-turbo/libjpeg-turbo"
<https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.5.1>
Change-Id: I0586d735e17789482e0e8e667aafd2b5613a1232
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148941
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/libjpeg-turbo/README | 2 | ||||
-rw-r--r-- | external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk | 10 | ||||
-rw-r--r-- | external/libjpeg-turbo/jconfig.h | 4 | ||||
-rw-r--r-- | external/libjpeg-turbo/jconfigint.h | 4 | ||||
-rw-r--r-- | external/libjpeg-turbo/jversion.h | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/external/libjpeg-turbo/README b/external/libjpeg-turbo/README index 46eff7cb7487..66ab7ad9660d 100644 --- a/external/libjpeg-turbo/README +++ b/external/libjpeg-turbo/README @@ -3,4 +3,4 @@ External library for reading/writing jpegs This is only used by the jpeg import filter that is provided for use by VCL see [[vcl/source/filter/jpeg]] -From [http://www.libjpeg-turbo.org/]. +From [https://www.libjpeg-turbo.org/]. diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk index 0b6b3044d1b2..ace14fd8fc5d 100644 --- a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk +++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk @@ -37,8 +37,10 @@ endif endif $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ + UnpackedTarball/libjpeg-turbo/jaricom \ UnpackedTarball/libjpeg-turbo/jcapimin \ UnpackedTarball/libjpeg-turbo/jcapistd \ + UnpackedTarball/libjpeg-turbo/jcarith \ UnpackedTarball/libjpeg-turbo/jccoefct \ UnpackedTarball/libjpeg-turbo/jccolor \ UnpackedTarball/libjpeg-turbo/jcdctmgr \ @@ -56,6 +58,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ UnpackedTarball/libjpeg-turbo/jctrans \ UnpackedTarball/libjpeg-turbo/jdapimin \ UnpackedTarball/libjpeg-turbo/jdapistd \ + UnpackedTarball/libjpeg-turbo/jdarith \ UnpackedTarball/libjpeg-turbo/jdatadst \ UnpackedTarball/libjpeg-turbo/jdatasrc \ UnpackedTarball/libjpeg-turbo/jdcoefct \ @@ -80,14 +83,11 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\ UnpackedTarball/libjpeg-turbo/jidctfst \ UnpackedTarball/libjpeg-turbo/jidctint \ UnpackedTarball/libjpeg-turbo/jidctred \ + UnpackedTarball/libjpeg-turbo/jmemmgr \ + UnpackedTarball/libjpeg-turbo/jmemnobs \ UnpackedTarball/libjpeg-turbo/jquant1 \ UnpackedTarball/libjpeg-turbo/jquant2 \ UnpackedTarball/libjpeg-turbo/jutils \ - UnpackedTarball/libjpeg-turbo/jmemmgr \ - UnpackedTarball/libjpeg-turbo/jmemnobs \ - UnpackedTarball/libjpeg-turbo/jaricom \ - UnpackedTarball/libjpeg-turbo/jcarith \ - UnpackedTarball/libjpeg-turbo/jdarith \ )) ifneq ($(NASM),) diff --git a/external/libjpeg-turbo/jconfig.h b/external/libjpeg-turbo/jconfig.h index 65151c1422ad..3855ccec9cfd 100644 --- a/external/libjpeg-turbo/jconfig.h +++ b/external/libjpeg-turbo/jconfig.h @@ -4,10 +4,10 @@ #define JPEG_LIB_VERSION 62 /* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 2.1.4 +#define LIBJPEG_TURBO_VERSION 2.1.5.1 /* libjpeg-turbo version in integer form */ -#define LIBJPEG_TURBO_VERSION_NUMBER 2001004 +#define LIBJPEG_TURBO_VERSION_NUMBER 2001005 /* Support arithmetic encoding */ #define C_ARITH_CODING_SUPPORTED 1 diff --git a/external/libjpeg-turbo/jconfigint.h b/external/libjpeg-turbo/jconfigint.h index 6cd960a03368..b7644cbac90e 100644 --- a/external/libjpeg-turbo/jconfigint.h +++ b/external/libjpeg-turbo/jconfigint.h @@ -1,7 +1,7 @@ #include <sal/types.h> /* libjpeg-turbo build number */ -#define BUILD "20230228" +#define BUILD "20230315" /* Compiler's inline keyword */ #undef inline @@ -19,7 +19,7 @@ #define PACKAGE_NAME "libjpeg-turbo" /* Version number of package */ -#define VERSION "2.1.5" +#define VERSION "2.1.5.1" /* The size of `size_t', as computed by sizeof. */ /* #undef SIZEOF_SIZE_T */ diff --git a/external/libjpeg-turbo/jversion.h b/external/libjpeg-turbo/jversion.h index 63db95b99b55..ea6de648d926 100644 --- a/external/libjpeg-turbo/jversion.h +++ b/external/libjpeg-turbo/jversion.h @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2010, 2012-2022, D. R. Commander. + * Copyright (C) 2010, 2012-2023, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -37,7 +37,7 @@ */ #define JCOPYRIGHT \ - "Copyright (C) 2009-2022 D. R. Commander\n" \ + "Copyright (C) 2009-2023 D. R. Commander\n" \ "Copyright (C) 2015, 2020 Google, Inc.\n" \ "Copyright (C) 2019-2020 Arm Limited\n" \ "Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \ @@ -51,4 +51,4 @@ "Copyright (C) 1991-2020 Thomas G. Lane, Guido Vollbeding" #define JCOPYRIGHT_SHORT \ - "Copyright (C) 1991-2022 The libjpeg-turbo Project and many others" + "Copyright (C) 1991-2023 The libjpeg-turbo Project and many others" |