external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk | 1 +
external/libjpeg-turbo/jconfigint.h | 5 +++++
2 files changed, 6 insertions(+)
New commits:
commit 274f1fb5f43ff416d3262382cf4edfd6d2e72ee0
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Thu Apr 3 08:43:06 2025 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Thu Apr 3 11:13:30 2025 +0200
Fix some --without-system-jpeg builds
...like <https://ci.libreoffice.org/job/lo_daily_tb_linux_wasm/1026/>,
> wasm-ld: error:
/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/LinkTarget/StaticLibrary/liblibjpeg-turbo.a(jchuff.o):
undefined symbol: jpeg_nbits_table
apparently broken with 451a7e9c435f2c76a718995faf52a59fd3a89127
"libjpeg-turbo:
upgrade to 3.0.4". But just enabling the missing
workdir/UnpackedTarball/libjpeg-turbo/jpeg_nbits.cxx then caused
> workdir/UnpackedTarball/libjpeg-turbo/jpeg_nbits.c:29:27: error: expected
';' after top level declarator
> 29 | const unsigned char HIDDEN jpeg_nbits_table[65536] = {
> | ^
> | ;
so tweak external/libjpeg-turbo/jconfigint.h a bit more (cf.
workdir/UnpackedTarball/libjpeg-turbo/CMakeLists.txt and
workdir/UnpackedTarball/libjpeg-turbo/jconfigint.h.in).
Change-Id: I3ca1c78b467fb9f1d7584799591dbb8a797320ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183653
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
index 39bdac3bb246..8607a824ab23 100644
--- a/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk
@@ -91,6 +91,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
UnpackedTarball/libjpeg-turbo/jidctred \
UnpackedTarball/libjpeg-turbo/jmemmgr \
UnpackedTarball/libjpeg-turbo/jmemnobs \
+ UnpackedTarball/libjpeg-turbo/jpeg_nbits \
UnpackedTarball/libjpeg-turbo/jquant1 \
UnpackedTarball/libjpeg-turbo/jquant2 \
UnpackedTarball/libjpeg-turbo/jutils \
diff --git a/external/libjpeg-turbo/jconfigint.h
b/external/libjpeg-turbo/jconfigint.h
index 2aa841a17656..03370914d3bd 100644
--- a/external/libjpeg-turbo/jconfigint.h
+++ b/external/libjpeg-turbo/jconfigint.h
@@ -3,6 +3,11 @@
/* libjpeg-turbo build number */
#define BUILD "20230315"
+/* How to hide global symbols. */
+#if defined __GNUC__
+#define HIDDEN __attribute__((visibility("hidden")))
+#endif
+
/* Compiler's inline keyword */
#undef inline
