fdo#70393: move jpeg to a subdir of external

Change-Id: I56be33efe0cc1deaf7a7e7ce6c6ea292dbe7786d
Reviewed-on: https://gerrit.libreoffice.org/6543
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

8 files changed, 214 insertions, 0 deletions

diff --git a/external/Module_external.mk b/external/Module_external.mk
index feee429a8e05..089a6323979b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -43,6 +43,7 @@ $(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,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
diff --git a/external/jpeg/Makefile b/external/jpeg/Makefile
new file mode 100644
index 000000000000..e4968cf85fb6
--- /dev/null
+++ b/external/jpeg/Makefile
@@ -0,0 +1,7 @@
+# -*- 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
new file mode 100644
index 000000000000..fea0f0bbdff7
--- /dev/null
+++ b/external/jpeg/Module_jpeg.mk
@@ -0,0 +1,21 @@
+# -*- 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))
+
+ifeq ($(SYSTEM_JPEG),NO)
+
+$(eval $(call gb_Module_add_targets,jpeg,\
+    UnpackedTarball_jpeg \
+    StaticLibrary_jpeg \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/README b/external/jpeg/README
new file mode 100644
index 000000000000..a5c3c0267052
--- /dev/null
+++ b/external/jpeg/README
@@ -0,0 +1,6 @@
+External library for reading/writing jpegs
+
+This is only used by the svtools jpeg import filter that is provided
+for use by VCL see [[svtools/source/filter/jpeg]]
+
+
diff --git a/external/jpeg/StaticLibrary_jpeg.mk b/external/jpeg/StaticLibrary_jpeg.mk
new file mode 100644
index 000000000000..c70f81cf834e
--- /dev/null
+++ b/external/jpeg/StaticLibrary_jpeg.mk
@@ -0,0 +1,70 @@
+# -*- 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
new file mode 100644
index 000000000000..dae63e2ec4f8
--- /dev/null
+++ b/external/jpeg/UnpackedTarball_jpeg.mk
@@ -0,0 +1,20 @@
+# -*- 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
new file mode 100644
index 000000000000..7ea8f50d47ce
--- /dev/null
+++ b/external/jpeg/configs/jconfig.h
@@ -0,0 +1,60 @@
+/* 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 int, on Windows systems. */
+#ifdef WNT
+#ifndef __RPCNDR_H__/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN/* prevent jmorecfg.h from redefining it */
+#endif
+
+#ifdef JPEG_INTERNALS
+
+/* #undef RIGHT_SHIFT_IS_UNSIGNED */
+#ifdef WNT
+#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
new file mode 100644
index 000000000000..34437440220f
--- /dev/null
+++ b/external/jpeg/patches/jpeg-8c-jmorecfg.patch
@@ -0,0 +1,29 @@
+--- misc/jpeg-8c/jmorecfg.h	2009-11-20 09:01:24.000000000 +0100
++++ misc/build/jpeg-8c/jmorecfg.h	2011-03-24 21:29:02.073761750 +0100
+@@ -21,7 +21,7 @@
+  * We do not support run-time selection of data precision, sorry.
+  */
+ 
+-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
++#define BITS_IN_JSAMPLE  8	/* use 8                                                                                                                                                                                                                             or 12 */
+ 
+ 
+ /*
+@@ -158,7 +158,8 @@
+ 
+ /* INT32 must hold at least signed 32-bit values. */
+ 
+-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
++#ifndef XMD_H           /* X11/xmd.h correctly defines INT32 */
++#ifndef _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 */
+@@ -166,6 +167,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ #endif
+ 
+ /* Datatype used for image dimensions.  The JPEG standard only supports