ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

libjpeg-turbo: upgrade to release 2.1.5.1

Browse Source 
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>
This commit is contained in:
Taichi Haradaguchi
2023-03-29 15:29:42 +00:00
committed by Caolán McNamara
parent 0bd23b6240
commit 4bf27aa3a1
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -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 := 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
external/libjpeg-turbo/README
Vendored
+1 -1
View File
@@ -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/].
external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
Vendored
+5 -5
View File
@@ -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),)
external/libjpeg-turbo/jconfig.h
Vendored
+2 -2
View File
@@ -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
external/libjpeg-turbo/jconfigint.h
Vendored
+2 -2
View File
@@ -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 */
external/libjpeg-turbo/jversion.h
Vendored
+3 -3
View File
@@ -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"