download.lst | 4 ++--
external/libjpeg-turbo/jconfigint.h | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit c025220d9e22f90c416b7eac186c531ba5b3f40c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 28 09:04:28 2023 +0000
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Mar 1 08:50:29 2023 +0000
upgrade to libjpeg-turbo 2.1.5
Change-Id: Ia6355beaf19765e6255f9388d60e2179206ddc5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147910
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 13bd4794bd34..b95e9eba8317 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 :=
d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
-LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.4.tar.gz
+LIBJPEG_TURBO_SHA256SUM :=
bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf
+LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libjpeg-turbo/jconfigint.h
b/external/libjpeg-turbo/jconfigint.h
index f0987ba31609..6cd960a03368 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 "20221122"
+#define BUILD "20230228"
/* Compiler's inline keyword */
#undef inline
@@ -19,11 +19,14 @@
#define PACKAGE_NAME "libjpeg-turbo"
/* Version number of package */
-#define VERSION "2.1.4"
+#define VERSION "2.1.5"
/* The size of `size_t', as computed by sizeof. */
/* #undef SIZEOF_SIZE_T */
+/* How to obtain thread-local storage */
+#define THREAD_LOCAL
+
#if defined(__GNUC__) && SAL_TYPES_SIZEOFLONG == SIZEOF_SIZE_T
/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) ==
sizeof(size_t). */
#define HAVE_BUILTIN_CTZL
