From 1ddc40632c11d2b762772417002b25ed7d7a7027 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 30 Apr 2021 10:39:12 +0200 Subject: Simplify bundled libjpeg build Move the config headers of the bundled libjpeg back into its source directory, where they originally live, to avoid having to trick with the include path to find them. The goal is unification across maintained Qt branches, making version updates simpler. Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 5df88b85c6e61409c5c759e78f32edaac7b2022f) (cherry picked from commit 19fedbafb5efaf27765bc25677ee9295ec08dc06) Reviewed-by: Eirik Aavitsland --- src/3rdparty/libjpeg.pri | 1 - .../libjpeg/import_from_libjpeg_tarball.sh | 2 +- src/3rdparty/libjpeg/jconfig.h | 23 ---------------------- src/3rdparty/libjpeg/jconfigint.h | 17 ---------------- src/3rdparty/libjpeg/src/jconfig.h | 23 ++++++++++++++++++++++ src/3rdparty/libjpeg/src/jconfigint.h | 17 ++++++++++++++++ 6 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 src/3rdparty/libjpeg/jconfig.h delete mode 100644 src/3rdparty/libjpeg/jconfigint.h create mode 100644 src/3rdparty/libjpeg/src/jconfig.h create mode 100644 src/3rdparty/libjpeg/src/jconfigint.h diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 5effbe9d26..6ef4069794 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -5,7 +5,6 @@ gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main INCLUDEPATH += \ - $$PWD/libjpeg \ $$PWD/libjpeg/src SOURCES += \ diff --git a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh index 9b7e1fff82..2153eca35a 100755 --- a/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh +++ b/src/3rdparty/libjpeg/import_from_libjpeg_tarball.sh @@ -165,4 +165,4 @@ for i in $FILES; do copy_file "$i" "src/$i" done -echo Done. $TARGET_DIR/jconfig.h and jconfigint.h may need manual updating. +echo Done. $TARGET_DIR/src/jconfig.h and jconfigint.h may need manual updating. diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/jconfig.h deleted file mode 100644 index 74a74f754c..0000000000 --- a/src/3rdparty/libjpeg/jconfig.h +++ /dev/null @@ -1,23 +0,0 @@ -// Definitions for building in Qt source, ref. src/jconfig.h.in - -#define JPEG_LIB_VERSION 80 - -#define LIBJPEG_TURBO_VERSION 2.0.6 - -#define LIBJPEG_TURBO_VERSION_NUMBER 2000006 - -#define C_ARITH_CODING_SUPPORTED 1 - -#define D_ARITH_CODING_SUPPORTED 1 - -#define MEM_SRCDST_SUPPORTED 1 - -#define BITS_IN_JSAMPLE 8 - -#define HAVE_STDDEF_H 1 - -#define HAVE_STDLIB_H 1 - -#define HAVE_UNSIGNED_CHAR 1 - -#define HAVE_UNSIGNED_SHORT 1 diff --git a/src/3rdparty/libjpeg/jconfigint.h b/src/3rdparty/libjpeg/jconfigint.h deleted file mode 100644 index 40d7748e10..0000000000 --- a/src/3rdparty/libjpeg/jconfigint.h +++ /dev/null @@ -1,17 +0,0 @@ -// Definitions for building in Qt source, ref. src/jconfigint.h.in - -#include - -#define BUILD "" - -#define INLINE inline - -#define PACKAGE_NAME "libjpeg-turbo" - -#define VERSION "2.0.6" - -#if SIZE_MAX == 0xffffffff -#define SIZEOF_SIZE_T 4 -#elif SIZE_MAX == 0xffffffffffffffff -#define SIZEOF_SIZE_T 8 -#endif diff --git a/src/3rdparty/libjpeg/src/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h new file mode 100644 index 0000000000..74a74f754c --- /dev/null +++ b/src/3rdparty/libjpeg/src/jconfig.h @@ -0,0 +1,23 @@ +// Definitions for building in Qt source, ref. src/jconfig.h.in + +#define JPEG_LIB_VERSION 80 + +#define LIBJPEG_TURBO_VERSION 2.0.6 + +#define LIBJPEG_TURBO_VERSION_NUMBER 2000006 + +#define C_ARITH_CODING_SUPPORTED 1 + +#define D_ARITH_CODING_SUPPORTED 1 + +#define MEM_SRCDST_SUPPORTED 1 + +#define BITS_IN_JSAMPLE 8 + +#define HAVE_STDDEF_H 1 + +#define HAVE_STDLIB_H 1 + +#define HAVE_UNSIGNED_CHAR 1 + +#define HAVE_UNSIGNED_SHORT 1 diff --git a/src/3rdparty/libjpeg/src/jconfigint.h b/src/3rdparty/libjpeg/src/jconfigint.h new file mode 100644 index 0000000000..40d7748e10 --- /dev/null +++ b/src/3rdparty/libjpeg/src/jconfigint.h @@ -0,0 +1,17 @@ +// Definitions for building in Qt source, ref. src/jconfigint.h.in + +#include + +#define BUILD "" + +#define INLINE inline + +#define PACKAGE_NAME "libjpeg-turbo" + +#define VERSION "2.0.6" + +#if SIZE_MAX == 0xffffffff +#define SIZEOF_SIZE_T 4 +#elif SIZE_MAX == 0xffffffffffffffff +#define SIZEOF_SIZE_T 8 +#endif -- cgit v1.2.3