From 2a89ec5ccd826157931de6aef1cc66a047731572 Mon Sep 17 00:00:00 2001 From: Daniel Kinsman Date: Wed, 14 May 2025 15:43:11 +1000 Subject: [PATCH] Fix libjpeg-turbo not working on 32-bit builds --- .../patches/0001-cmake-generated-headers.patch | 12 ++++++++++-- thirdparty/libjpeg-turbo/src/jconfigint.h | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch b/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch index 2a018164a32..65339fd982a 100644 --- a/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch +++ b/thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch @@ -107,10 +107,18 @@ index 0000000000..f6171bf846 +#define PACKAGE_NAME "libjpeg-turbo" + +/* Version number of package */ -+#define VERSION "3.1.1" ++#define VERSION "3.1.0" + +/* The size of `size_t', as computed by sizeof. */ -+#define SIZEOF_SIZE_T 8 ++#if defined(__SIZEOF_SIZE_T__) ++ #define SIZEOF_SIZE_T __SIZEOF_SIZE_T__ ++#elif defined(_WIN64) ++ #define SIZEOF_SIZE_T 8 ++#elif defined(_WIN32) ++ #define SIZEOF_SIZE_T 4 ++#else ++ #error "Cannot determine size of size_t" ++#endif + +/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ +#if defined(__GNUC__) diff --git a/thirdparty/libjpeg-turbo/src/jconfigint.h b/thirdparty/libjpeg-turbo/src/jconfigint.h index f6171bf8465..45bd3ec3210 100644 --- a/thirdparty/libjpeg-turbo/src/jconfigint.h +++ b/thirdparty/libjpeg-turbo/src/jconfigint.h @@ -33,10 +33,18 @@ #define PACKAGE_NAME "libjpeg-turbo" /* Version number of package */ -#define VERSION "3.1.1" +#define VERSION "3.1.0" /* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 8 +#if defined(__SIZEOF_SIZE_T__) + #define SIZEOF_SIZE_T __SIZEOF_SIZE_T__ +#elif defined(_WIN64) + #define SIZEOF_SIZE_T 8 +#elif defined(_WIN32) + #define SIZEOF_SIZE_T 4 +#else + #error "Cannot determine size of size_t" +#endif /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ #if defined(__GNUC__)