diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-28 09:04:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-28 15:56:04 +0000 |
| commit | 8a180b663323be2cd36a17562d7052d9549ae89e (patch) | |
| tree | 3b4416c709ee0bf9d6dd213a0a43baecafdc09f8 | |
| parent | cc460f5b8f67470d1c3b2fc069466191a0773d2a (diff) | |
upgrade to libjpeg-turbo 2.1.5
Change-Id: Ia6355beaf19765e6255f9388d60e2179206ddc5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147951
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libjpeg-turbo/jconfigint.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/download.lst b/download.lst index 7a5030a05adf..3085109d0f4a 100644 --- a/download.lst +++ b/download.lst @@ -269,8 +269,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 |