summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.fetch1
-rw-r--r--RepositoryExternal.mk21
-rw-r--r--configure.ac68
-rw-r--r--distro-configs/Jenkins/Linux_ubsan_master.conf1
-rw-r--r--download.lst3
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/jpeg-turbo/ExternalProject_jpeg-turbo.mk1
-rw-r--r--external/jpeg/Makefile7
-rw-r--r--external/jpeg/Module_jpeg.mk17
-rw-r--r--external/jpeg/README6
-rw-r--r--external/jpeg/StaticLibrary_jpeg.mk70
-rw-r--r--external/jpeg/UnpackedTarball_jpeg.mk20
-rw-r--r--external/jpeg/configs/jconfig.h66
-rw-r--r--external/jpeg/patches/jpeg-8c-jmorecfg.patch18
14 files changed, 25 insertions, 275 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index 63622b12d9ff..2f9e5a43fbf1 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -149,7 +149,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBSERIALIZER_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
- $(call fetch_Optional,JPEG,JPEG_TARBALL) \
$(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b7eb499504d3..414f70b6af46 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -396,7 +396,7 @@ endef
gb_ExternalProject__use_jpeg :=
-else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),)
+else
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_set_include,$(1),\
@@ -413,25 +413,6 @@ $(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo)
endef
-else # !SYSTEM_JPEG
-
-define gb_LinkTarget__use_jpeg
-$(call gb_LinkTarget_set_include,$(1),\
- $(LIBJPEG_CFLAGS) \
- $$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_use_static_libraries,$(1),\
- jpeg \
-)
-
-endef
-
-define gb_ExternalProject__use_jpeg
-$(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
-
-endef
-
endif # SYSTEM_JPEG
ifneq ($(SYSTEM_MYTHES),)
diff --git a/configure.ac b/configure.ac
index e835dfefc024..e02ecb99f101 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1964,11 +1964,6 @@ AC_ARG_WITH(system-liblangtag,
[Use liblangtag library already on system.]),,
[with_system_liblangtag="$with_system_libs"])
-AC_ARG_WITH(jpeg-turbo,
- AS_HELP_STRING([--with-jpeg-turbo],
- [Use internal libjpeg-turbo library.]),,
- [with_jpeg_turbo=auto])
-
AC_ARG_WITH(webdav,
AS_HELP_STRING([--with-webdav],
[Specify which library to use for webdav implementation.
@@ -7713,18 +7708,6 @@ dnl ===================================================================
dnl Check for system jpeg
dnl ===================================================================
AC_MSG_CHECKING([which libjpeg to use])
-if test "$with_jpeg_turbo" = "auto"; then
- # TODO use jpeg-turbo on Darwin too
- case "$_os" in
- WINNT)
- with_jpeg_turbo=yes
- ;;
- *)
- with_jpeg_turbo=no
- ;;
- esac
-fi
-
if test "$with_system_jpeg" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_JPEG=TRUE
@@ -7735,11 +7718,12 @@ if test "$with_system_jpeg" = "yes"; then
libo_MINGW_CHECK_DLL([libjpeg])
else
SYSTEM_JPEG=
- if test "$with_jpeg_turbo" = "yes"; then
- AC_MSG_RESULT([internal, jpeg-turbo])
- BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
- AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
+ AC_MSG_RESULT([internal, jpeg-turbo])
+ BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
+ case "$host_cpu" in
+ x86_64 | amd64 | i*86 | x86 | ia32)
+ AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
if test -z "$NASM" -a "$build_os" = "cygwin"; then
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/nasm"; then
NASM="$LODE_HOME/opt/bin/nasm"
@@ -7750,25 +7734,18 @@ else
if test -z "$NASM"; then
cat << _EOS
****************************************************************************
-You need nasm (Netwide Assembler) to build internal jpeg library.
-To get one please do:
+You need yasm or nasm (Netwide Assembler) to build the internal jpeg library optimally.
+To get one please:
_EOS
- if test "$build_os" = "cygwin"; then
+ if test "$build_os" = "cygwin"; then
cat << _EOS
install a pre-compiled binary for Win32
- mkdir -p /opt/lo/bin
- cd /opt/lo/bin
- wget http://dev-www.libreoffice.org/bin/cygwin/nasm.exe
- chmod +x nasm
-_EOS
- else
-cat << _EOS
-consult http://svn.code.sf.net/p/libjpeg-turbo/code/trunk/BUILDING.txt
-_EOS
- fi
-cat << _EOS
+mkdir -p /opt/lo/bin
+cd /opt/lo/bin
+wget http://dev-www.libreoffice.org/bin/cygwin/nasm.exe
+chmod +x nasm
or get and install one from http://www.nasm.us/
@@ -7778,7 +7755,13 @@ Note: autogen.sh will try to use /opt/lo/bin/nasm if the environment variable NA
Alternatively, you can install the 'new' nasm where ever you want and make sure that \`which nasm\` finds it.
_EOS
- AC_MSG_ERROR([no nasm (Netwide Assembler) found])
+ else
+cat << _EOS
+consult http://svn.code.sf.net/p/libjpeg-turbo/code/trunk/BUILDING.txt
+
+_EOS
+ fi
+ AC_MSG_WARN([no nasm (Netwide Assembler) found])
fi
LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
if test "$COM" = "MSC"; then
@@ -7786,17 +7769,10 @@ _EOS
else
LIBJPEG_LIBS="-L${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs -ljpeg"
fi
- else
- AC_MSG_RESULT([internal, jpeg])
- BUILD_TYPE="$BUILD_TYPE JPEG"
- LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg"
- if test "$COM" = "MSC"; then
- LIBJPEG_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/libjpeg.lib"
- else
- LIBJPEG_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -ljpeg"
- fi
- fi
+ ;;
+ esac
fi
+
AC_SUBST(NASM)
AC_SUBST(LIBJPEG_CFLAGS)
AC_SUBST(LIBJPEG_LIBS)
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf
index 55cdb13d4ae2..4ca0c9b069ec 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -19,7 +19,6 @@
--enable-vlc
--enable-werror
--with-help
---with-jpeg-turbo
--with-lang=de en-US fi hu
--with-myspell-dicts
--without-system-libpng
diff --git a/download.lst b/download.lst
index 149a4f10c68f..d19840ae6afc 100644
--- a/download.lst
+++ b/download.lst
@@ -95,9 +95,8 @@ export JFREEREPORT_LIBREPOSITORY_TARBALL := 8ce2fcd72becf06c41f7201d15373ed9-lib
export JFREEREPORT_LIBSERIALIZER_TARBALL := f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
export JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
export JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-export JPEG_MD5SUM := 3353992aecaee1805ef4109aadd433e7
-export JPEG_TARBALL := jpegsrc.v9a.tar.gz
export JPEG_TURBO_MD5SUM := 55deb139b0cac3c8200b75d485fc13f3
+export JPEG_TURBO_SHA256SUM := 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
export LANGTAGREG_MD5SUM := 59a3595c1052c5b51f996f44fe9994b9
export LANGTAGREG_TARBALL := language-subtag-registry-2017-04-19.tar.bz2
diff --git a/external/Module_external.mk b/external/Module_external.mk
index d744018fe6db..09c31ac59498 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HYPHEN,hyphen) \
$(call gb_Helper_optional,ICU,icu) \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
- $(call gb_Helper_optional,JPEG,jpeg) \
$(call gb_Helper_optional,JPEG_TURBO,jpeg-turbo) \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
index 437d574b8988..f3affa14e203 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
--with-jpeg8 \
--without-java \
--without-turbojpeg \
+ $(if $(NASM),,--without-simd) \
CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) $(CFLAGS)' \
)
diff --git a/external/jpeg/Makefile b/external/jpeg/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/jpeg/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk
deleted file mode 100644
index 3d66f8f87b67..000000000000
--- a/external/jpeg/Module_jpeg.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,jpeg))
-
-$(eval $(call gb_Module_add_targets,jpeg,\
- UnpackedTarball_jpeg \
- StaticLibrary_jpeg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/README b/external/jpeg/README
deleted file mode 100644
index ab97a9ed2458..000000000000
--- a/external/jpeg/README
+++ /dev/null
@@ -1,6 +0,0 @@
-External library for reading/writing jpegs
-
-This is only used by the jpeg import filter that is provided
-for use by VCL see [[vcl/source/filter/jpeg]]
-
-
diff --git a/external/jpeg/StaticLibrary_jpeg.mk b/external/jpeg/StaticLibrary_jpeg.mk
deleted file mode 100644
index c70f81cf834e..000000000000
--- a/external/jpeg/StaticLibrary_jpeg.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,jpeg))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg))
-
-$(eval $(call gb_StaticLibrary_set_include,jpeg,\
- -I$(call gb_UnpackedTarball_get_dir,jpeg) \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\
- UnpackedTarball/jpeg/jaricom \
- UnpackedTarball/jpeg/jcapimin \
- UnpackedTarball/jpeg/jcapistd \
- UnpackedTarball/jpeg/jcarith \
- UnpackedTarball/jpeg/jccoefct \
- UnpackedTarball/jpeg/jccolor \
- UnpackedTarball/jpeg/jcdctmgr \
- UnpackedTarball/jpeg/jchuff \
- UnpackedTarball/jpeg/jcinit \
- UnpackedTarball/jpeg/jcmainct \
- UnpackedTarball/jpeg/jcmarker \
- UnpackedTarball/jpeg/jcmaster \
- UnpackedTarball/jpeg/jcomapi \
- UnpackedTarball/jpeg/jcparam \
- UnpackedTarball/jpeg/jcprepct \
- UnpackedTarball/jpeg/jcsample \
- UnpackedTarball/jpeg/jctrans \
- UnpackedTarball/jpeg/jdapimin \
- UnpackedTarball/jpeg/jdapistd \
- UnpackedTarball/jpeg/jdarith \
- UnpackedTarball/jpeg/jdatadst \
- UnpackedTarball/jpeg/jdatasrc \
- UnpackedTarball/jpeg/jdcoefct \
- UnpackedTarball/jpeg/jdcolor \
- UnpackedTarball/jpeg/jddctmgr \
- UnpackedTarball/jpeg/jdhuff \
- UnpackedTarball/jpeg/jdinput \
- UnpackedTarball/jpeg/jdmainct \
- UnpackedTarball/jpeg/jdmarker \
- UnpackedTarball/jpeg/jdmaster \
- UnpackedTarball/jpeg/jdmerge \
- UnpackedTarball/jpeg/jdpostct \
- UnpackedTarball/jpeg/jdsample \
- UnpackedTarball/jpeg/jdtrans \
- UnpackedTarball/jpeg/jerror \
- UnpackedTarball/jpeg/jfdctflt \
- UnpackedTarball/jpeg/jfdctfst \
- UnpackedTarball/jpeg/jfdctint \
- UnpackedTarball/jpeg/jidctflt \
- UnpackedTarball/jpeg/jidctfst \
- UnpackedTarball/jpeg/jidctint \
- UnpackedTarball/jpeg/jquant1 \
- UnpackedTarball/jpeg/jquant2 \
- UnpackedTarball/jpeg/jmemmgr \
- UnpackedTarball/jpeg/jmemnobs \
- UnpackedTarball/jpeg/jutils \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/UnpackedTarball_jpeg.mk b/external/jpeg/UnpackedTarball_jpeg.mk
deleted file mode 100644
index dae63e2ec4f8..000000000000
--- a/external/jpeg/UnpackedTarball_jpeg.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,jpeg,$(JPEG_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_file,jpeg,jconfig.h,external/jpeg/configs/jconfig.h))
-
-$(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
- external/jpeg/patches/jpeg-8c-jmorecfg.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/configs/jconfig.h b/external/jpeg/configs/jconfig.h
deleted file mode 100644
index 1ac8ea9e5daf..000000000000
--- a/external/jpeg/configs/jconfig.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* jconfig.h. Generated from jconfig.cfg by configure. */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.txt for explanations */
-
-#define HAVE_PROTOTYPES 1
-#define HAVE_UNSIGNED_CHAR 1
-#define HAVE_UNSIGNED_SHORT 1
-/* #undef void */
-/* #undef const */
-/* #undef CHAR_IS_UNSIGNED */
-#define HAVE_STDDEF_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_LOCALE_H 1
-/* #undef NEED_BSD_STRINGS */
-/* #undef NEED_SYS_TYPES_H */
-/* #undef NEED_FAR_POINTERS */
-/* #undef NEED_SHORT_EXTERNAL_NAMES */
-/* Define this if you get warnings about undefined structures. */
-/* #undef INCOMPLETE_TYPES_BROKEN */
-
-/* Define "boolean" as unsigned char, not enum, on Windows systems. */
-#ifdef _WIN32
-#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#ifndef FALSE /* in case these macros already exist */
-#define FALSE 0 /* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
-#endif
-
-#ifdef JPEG_INTERNALS
-
-/* #undef RIGHT_SHIFT_IS_UNSIGNED */
-#ifdef _WIN32
-#define INLINE __inline
-#elif defined SOLARIS
-#define INLINE
-#else
-#define INLINE inline
-#endif
-/* These are for configuring the JPEG memory manager. */
-/* #undef DEFAULT_MAX_MEM */
-/* #undef NO_MKTEMP */
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#undef BMP_SUPPORTED /* BMP image file format */
-#undef GIF_SUPPORTED /* GIF image file format */
-#undef PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
-/* #undef RLE_SUPPORTED */
-#undef TARGA_SUPPORTED /* Targa image file format */
-
-/* #undef TWO_FILE_COMMANDLINE */
-/* #undef NEED_SIGNAL_CATCHER */
-/* #undef DONT_USE_B_MODE */
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-/* #undef PROGRESS_REPORT */
-
-#endif /* JPEG_CJPEG_DJPEG */
diff --git a/external/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch
deleted file mode 100644
index 89a92c66691d..000000000000
--- a/external/jpeg/patches/jpeg-8c-jmorecfg.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/jpeg-9a/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100
-+++ misc/build/jpeg-9a/jmorecfg.h 2011-03-24 21:29:02.073761750 +0100
-@@ -210,6 +210,7 @@
- /* INT32 must hold at least signed 32-bit values. */
-
- #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
-+#ifndef INCLUDED_TOOLS_SOLAR_H
- #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
- #ifndef _BASETSD_H /* MinGW is slightly different */
- #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */
-@@ -217,6 +218,7 @@
- #endif
- #endif
- #endif
-+#endif
- #endif
-
- /* Datatype used for image dimensions. The JPEG standard only supports
generated by cgit (git 2.34.1) at 2025-01-10 12:17:42 +0000