Update bundled libjpeg-turbo to version 3.0.0

[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 3.0.0 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I960c4bfdef268eced93317ded814e2c84befa451 Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
HoBoIs · Aug 8, 2023 · 3498bae · 3498bae
1 parent b4a55e6
commit 3498bae
Show file tree

Hide file tree

Showing 85 changed files with 6,367 additions and 2,155 deletions.
diff --git a/src/3rdparty/libjpeg/CMakeLists.txt b/src/3rdparty/libjpeg/CMakeLists.txt
@@ -1,59 +1,103 @@
+set(JPEG16_SOURCES
+    src/jcapistd.c
+    src/jccolor.c
+    src/jcdiffct.c
+    src/jclossls.c
+    src/jcmainct.c
+    src/jcprepct.c
+    src/jcsample.c
+    src/jdapistd.c
+    src/jdcolor.c
+    src/jddiffct.c
+    src/jdlossls.c
+    src/jdmainct.c
+    src/jdpostct.c
+    src/jdsample.c
+    src/jutils.c)
+
+set(JPEG12_SOURCES
+    ${JPEG16_SOURCES}
+    src/jccoefct.c
+    src/jcdctmgr.c
+    src/jdcoefct.c
+    src/jddctmgr.c
+    src/jdmerge.c
+    src/jfdctfst.c
+    src/jfdctint.c
+    src/jidctflt.c
+    src/jidctfst.c
+    src/jidctint.c
+    src/jidctred.c
+    src/jquant1.c
+    src/jquant2.c)
+
+set(JPEG_SOURCES
+    ${JPEG12_SOURCES}
+    src/jaricom.c
+    src/jcapimin.c
+    src/jcarith.c
+    src/jchuff.c
+    src/jcicc.c
+    src/jcinit.c
+    src/jclhuff.c
+    src/jcmarker.c
+    src/jcmaster.c
+    src/jcomapi.c
+    src/jcparam.c
+    src/jcphuff.c
+    src/jctrans.c
+    src/jdapimin.c
+    src/jdarith.c
+    src/jdatadst.c
+    src/jdatasrc.c
+    src/jdhuff.c
+    src/jdicc.c
+    src/jdinput.c
+    src/jdlhuff.c
+    src/jdmarker.c
+    src/jdmaster.c
+    src/jdphuff.c
+    src/jdtrans.c
+    src/jerror.c
+    src/jfdctflt.c
+    src/jmemmgr.c
+    src/jmemnobs.c)
+
+qt_internal_add_3rdparty_library(BundledLibjpeg16bits
+    STATIC
+    SKIP_AUTOMOC
+    SOURCES
+        ${JPEG16_SOURCES}
+    DEFINES
+        BITS_IN_JSAMPLE=16
+    INCLUDE_DIRECTORIES
+        src
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+
+qt_internal_add_3rdparty_library(BundledLibjpeg12bits
+    STATIC
+    SKIP_AUTOMOC
+    SOURCES
+        ${JPEG12_SOURCES}
+    DEFINES
+        BITS_IN_JSAMPLE=12
+    INCLUDE_DIRECTORIES
+        src
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+
 qt_internal_add_3rdparty_library(BundledLibjpeg
     QMAKE_LIB_NAME libjpeg
     STATIC
     SKIP_AUTOMOC
     INSTALL
     SOURCES
-        src/jaricom.c
-        src/jcapimin.c
-        src/jcapistd.c
-        src/jcarith.c
-        src/jccoefct.c
-        src/jccolor.c
-        src/jcdctmgr.c
-        src/jchuff.c
-        src/jcinit.c
-        src/jcmainct.c
-        src/jcmarker.c
-        src/jcmaster.c
-        src/jcomapi.c
-        src/jcparam.c
-        src/jcphuff.c
-        src/jcprepct.c
-        src/jcsample.c
-        src/jctrans.c
-        src/jdapimin.c
-        src/jdapistd.c
-        src/jdarith.c
-        src/jdatadst.c
-        src/jdatasrc.c
-        src/jdcoefct.c
-        src/jdcolor.c
-        src/jddctmgr.c
-        src/jdhuff.c
-        src/jdinput.c
-        src/jdmainct.c
-        src/jdmarker.c
-        src/jdmaster.c
-        src/jdmerge.c
-        src/jdphuff.c
-        src/jdpostct.c
-        src/jdsample.c
-        src/jdtrans.c
-        src/jerror.c
-        src/jfdctflt.c
-        src/jfdctfst.c
-        src/jfdctint.c
-        src/jidctflt.c
-        src/jidctfst.c
-        src/jidctint.c
-        src/jidctred.c
-        src/jmemmgr.c
-        src/jmemnobs.c
-        src/jquant1.c
-        src/jquant2.c
-        src/jsimd_none.c
-        src/jutils.c
+        ${JPEG_SOURCES}
+        $<TARGET_OBJECTS:BundledLibjpeg12bits>
+        $<TARGET_OBJECTS:BundledLibjpeg16bits>
     INCLUDE_DIRECTORIES
         src
     PUBLIC_INCLUDE_DIRECTORIES
@@ -69,7 +113,11 @@ qt_internal_add_3rdparty_header_module(JpegPrivate
 )
 
 qt_disable_warnings(BundledLibjpeg)
+qt_disable_warnings(BundledLibjpeg12bits)
+qt_disable_warnings(BundledLibjpeg16bits)
 qt_set_symbol_visibility_hidden(BundledLibjpeg)
+qt_set_symbol_visibility_hidden(BundledLibjpeg12bits)
+qt_set_symbol_visibility_hidden(BundledLibjpeg16bits)
 
 qt_internal_extend_target(BundledLibjpeg CONDITION MSVC
     DEFINES

diff --git a/src/3rdparty/libjpeg/COPYRIGHT.txt b/src/3rdparty/libjpeg/COPYRIGHT.txt
@@ -9,4 +9,5 @@ Copyright (C) 2013-2014 MIPS Technologies, Inc.
 Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB
 Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)
 Copyright (C) 1999-2006 MIYASAKA Masaru
+Copyright (C) 1999 Ken Murchison
 Copyright (C) 1991-2020 Thomas G. Lane, Guido Vollbeding
diff --git a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh
@@ -57,12 +57,17 @@ FILES="
    jccolext.c
    jccolor.c
    jcdctmgr.c
+   jcdiffct.c
    jchuff.c
    jchuff.h
+   jcicc.c
    jcinit.c
+   jclhuff.c
+   jclossls.c
    jcmainct.c
    jcmarker.c
    jcmaster.c
+   jcmaster.h
    jcomapi.c
    jcparam.c
    jcphuff.c
@@ -81,10 +86,15 @@ FILES="
    jdcolor.c
    jdct.h
    jddctmgr.c
+   jddiffct.c
    jdhuff.c
    jdhuff.h
+   jdicc.c
    jdphuff.c
    jdinput.c
+   jdlhuff.c
+   jdlossls.c
+   jlossls.h
    jdmainct.c
    jdmainct.h
    jdmarker.c
@@ -108,7 +118,7 @@ FILES="
    jidctfst.c
    jidctint.c
    jinclude.h
-   jpegcomp.h
+   jpegapicomp.h
    jpegint.h
    jpeglib.h
    jmemmgr.c
@@ -118,8 +128,8 @@ FILES="
    jpeg_nbits_table.h
    jquant1.c
    jquant2.c
+   jsamplecomp.h
    jsimd.h
-   jsimd_none.c
    jsimddct.h
    jstdhuff.c
    jutils.c

diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json
@@ -7,8 +7,8 @@
 
     "Description": "The Independent JPEG Group's JPEG software",
     "Homepage": "http://libjpeg-turbo.virtualgl.org/",
-    "Version": "2.1.5",
-    "DownloadLocation": "https://sourceforge.net/projects/libjpeg-turbo/files/2.1.5/libjpeg-turbo-2.1.5.tar.gz",
+    "Version": "3.0.0",
+    "DownloadLocation": "https://sourceforge.net/projects/libjpeg-turbo/files/3.0.0/libjpeg-turbo-3.0.0.tar.gz",
 
     "License": "Independent JPEG Group License and BSD 3-Clause \"New\" or \"Revised\" License and zlib License",
     "LicenseId": "IJG AND BSD-3-Clause AND Zlib",