download.lst | 4 ++--
external/libjpeg-turbo/README | 2 +-
external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk | 10 +++++-----
external/libjpeg-turbo/jconfig.h | 4 ++--
external/libjpeg-turbo/jconfigint.h | 4 ++--
external/libjpeg-turbo/jversion.h | 6 +++---
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 5e80f82ae4380e01437a0802938fa98ef484a1f2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Mar 15 23:22:33 2023 +0900
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Mar 26 12:01:24 2023 +0000
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/+/149308
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index cd1046402046..e4332f8de06c 100644
--- a/download.lst
+++ b/download.lst
@@ -270,8 +270,8 @@ JFREEREPORT_SAC_TARBALL :=
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBJPEG_TURBO_SHA256SUM :=
bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf
-LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.tar.gz
+LIBJPEG_TURBO_SHA256SUM :=
2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
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"
