diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-07-28 18:38:55 +0200 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2017-09-28 10:06:26 +0000 |
| commit | 9c13ec5fa392930e9a1880ad20c11ba47fdc54ba (patch) | |
| tree | 71355136ba851d004e7f902d13077fdc9388f607 /src/3rdparty/libjpeg/qt_attribution.json | |
| parent | 0731c092d107415cc300be2209cd2bfb417950e9 (diff) | |
Replace bundled libjpeg by libjpeg-turbo 1.5.2
Most linux distribution uses libjpeg-turbo as a replacement for libjpeg.
Since Qt will be linked against -turbo more frequently than the "original"
libjpeg we should use it for the bundled copy, too.
Also add an import script.
[ChangeLog][Third-Party Code] Replaced bundled libjpeg by libjpeg-turbo 1.5.2
Change-Id: I41081db74f194cbc288820fc783c9fef16545efd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/libjpeg/qt_attribution.json | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json index ee5c094a0f..a1966d43d6 100644 --- a/src/3rdparty/libjpeg/qt_attribution.json +++ b/src/3rdparty/libjpeg/qt_attribution.json @@ -1,13 +1,23 @@ { "Id": "libjpeg", - "Name": "LibJPEG", + "Name": "LibJPEG-turbo", "QDocModule": "qtgui", "QtUsage": "Used in the QJPEG image plugin. Configure with -no-jpeg to avoid.", "Description": "The Independent JPEG Group's JPEG software", - "Homepage": "http://www.ijg.org/", + "Homepage": "http://libjpeg-turbo.virtualgl.org/", + "Version": "1.5.2", "License": "Independent JPEG Group License", "LicenseId": "IJG", "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding." + "Copyright": "Copyright (C) 2009-2017 D. R. Commander +Copyright (C) 2011-2016 Siarhei Siamashka +Copyright (C) 2015-2016 Matthieu Darbois +Copyright (C) 2015 Google, Inc. +Copyright (C) 2013-2014 MIPS Technologies, Inc. +Copyright (C) 2013 Linaro Limited +Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies) +Copyright (C) 2009 Pierre Ossman for Cendio AB +Copyright (C) 1999-2006 MIYASAKA Masaru +Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding" } |