gbuildification of jpeg

Change-Id: I466f13f1132103bc20b9918411a54fd3106f4553

Makefile.top

@@ -90,6 +90,7 @@ idlc\
 io\
 javaunohelper\
 jfreereport\
+jpeg\
 jurt\
 jvmaccess\
 jvmfwk\
@@ -220,7 +221,6 @@ hunspell\
 hyphen\
 icu\
 instsetoo_native\
-jpeg\
 libcroco\
 libexttextcat\
 libgsf\

RepositoryModule_ooo.mk

@@ -88,6 +88,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     javaunohelper \
 	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
     jurt \
+    $(call gb_Helper_optional,JPEG,jpeg) \
     jvmaccess \
     jvmfwk \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \

config_host.mk.in

@@ -284,6 +284,7 @@ export JDK=@JDK@
 @x_JDKLIB@ export JDKLIB=@JDKLIB@
 export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
+export JPEG_TARBALL=@JPEG_TARBALL@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
 export TDE_CFLAGS=@TDE_CFLAGS@
 export TDE_LIBS=@TDE_LIBS@

configure.in

@@ -6839,9 +6839,11 @@ if test "$with_system_jpeg" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_JPEG=NO
+    JPEG_TARBALL="a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz"
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 AC_SUBST(SYSTEM_JPEG)
+AC_SUBST(JPEG_TARBALL)
 AC_SUBST([MINGW_JPEG_DLL])
 
 dnl ===================================================================

jpeg/Makefile

+# -*- 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:

jpeg/Module_jpeg.mk

+# -*- 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:

jpeg/StaticLibrary_jpeg.mk

+# -*- 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,jpeglib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeglib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,jpeglib,jpeg))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeglib,\
+    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:

jpeg/UnpackedTarball_jpeg.mk

+# -*- 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,jpeg/configs/jconfig.h))
+
+$(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
+    jpeg/patches/jpeg-8c-jmorecfg.patch \
+))
+
+ifeq ($(OS)$(CPU),MACOSXP)
+$(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
+    jpeg/patches/struct_alignment.patch \
+))
+endif
+
+$(eval $(call gb_UnpackedTarball_mark_output_files,jpeg,\
+	jconfig.h \
+	jerror.h \
+	jmorecfg.h \
+	jpeglib.h \
+))
+
+# vim: set noet sw=4 ts=4:

jpeg/configs/jconfig.h

+/* 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 */

jpeg/jpeg-8c.patch

---- misc/jpeg-8c/jconfig.h	2011-03-30 11:20:06.266329889 +0200
-+++ misc/build/jpeg-8c/jconfig.h	2011-03-30 11:02:01.926080079 +0200
-@@ -1 +1,60 @@
--dummy
-+/* 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 	*/
---- 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
---- misc/jpeg-8c/makefile.mk	2011-03-24 21:20:52.540761397 +0100
-+++ misc/build/jpeg-8c/makefile.mk	2011-03-24 21:15:20.712761156 +0100
-@@ -1 +1,77 @@
--dummy
-+#*************************************************************************
-+#
-+#   Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=jpeg
-+TARGET=jpeglib
-+LIBTARGET=NO
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+VISIBILITY_HIDDEN=TRUE
-+
-+# --- Settings -----------------------------------------------------------
-+
-+.INCLUDE :  settings.mk
-+
-+.IF "$(GUI)$(CPU)"=="WNTP"
-+CFLAGS=$(CFLAGS) -Od
-+.ENDIF
-+
-+# --- Files --------------------------------------------------------
-+
-+SLOFILES=	$(SLO)$/jaricom.obj		\
-+			$(SLO)$/jcapimin.obj	\
-+			$(SLO)$/jcapistd.obj	\
-+			$(SLO)$/jcarith.obj		\
-+			$(SLO)$/jccoefct.obj	\
-+			$(SLO)$/jccolor.obj		\
-+			$(SLO)$/jcdctmgr.obj	\
-+			$(SLO)$/jchuff.obj		\
-+			$(SLO)$/jcinit.obj		\
-+			$(SLO)$/jcmainct.obj	\
-+			$(SLO)$/jcmarker.obj	\
-+			$(SLO)$/jcmaster.obj	\
-+			$(SLO)$/jcomapi.obj		\
-+			$(SLO)$/jcparam.obj		\
-+			$(SLO)$/jcprepct.obj	\
-+			$(SLO)$/jcsample.obj	\
-+			$(SLO)$/jctrans.obj		\
-+			$(SLO)$/jdapimin.obj	\
-+			$(SLO)$/jdapistd.obj	\
-+			$(SLO)$/jdarith.obj		\
-+			$(SLO)$/jdatadst.obj	\
-+			$(SLO)$/jdatasrc.obj	\
-+			$(SLO)$/jdcoefct.obj	\
-+			$(SLO)$/jdcolor.obj		\
-+			$(SLO)$/jddctmgr.obj	\
-+			$(SLO)$/jdhuff.obj		\
-+			$(SLO)$/jdinput.obj		\
-+			$(SLO)$/jdmainct.obj	\
-+			$(SLO)$/jdmarker.obj	\
-+			$(SLO)$/jdmaster.obj	\
-+			$(SLO)$/jdmerge.obj		\
-+			$(SLO)$/jdpostct.obj	\
-+			$(SLO)$/jdsample.obj	\
-+			$(SLO)$/jdtrans.obj		\
-+			$(SLO)$/jerror.obj		\
-+			$(SLO)$/jfdctflt.obj	\
-+			$(SLO)$/jfdctfst.obj	\
-+			$(SLO)$/jfdctint.obj	\
-+			$(SLO)$/jidctflt.obj	\
-+			$(SLO)$/jidctfst.obj	\
-+			$(SLO)$/jidctint.obj	\
-+			$(SLO)$/jquant1.obj		\
-+			$(SLO)$/jquant2.obj		\
-+			$(SLO)$/jutils.obj		\
-+			$(SLO)$/jmemmgr.obj		\
-+			$(SLO)$/jmemnobs.obj	\
-+			$(SLO)$/jutils.obj		
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE :  target.mk

jpeg/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=jpeg
-TARGET=jpeg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_JPEG)" == "YES"
-all:
-	@echo "An already available installation of libjpeg should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=jpeg-8c
-
-TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
-
-PATCH_FILES=jpeg-8c.patch
-.IF "$(OS)$(CPU)"=="MACOSXP"
-PATCH_FILES+=struct_alignment.patch
-.ENDIF
-
-ADDITIONAL_FILES=makefile.mk jconfig.h	
-
-#relative to CONFIGURE_DIR
-
-BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC=    jconfig.h	\
-            jerror.h	\
-            jmorecfg.h	\
-            jpegint.h	\
-            jpeglib.h	
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk

jpeg/patches/jpeg-8c-jmorecfg.patch

+--- 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

jpeg/prj/build.lst

-jg	jpeg : 	soltools NULL
-jg	jpeg	nmake	-	all	jg_mkout NULL
+jg	jpeg :          soltools NULL
+jg	jpeg\prj        nmake	-       all	jg_mkout NULL

jpeg/prj/d.lst

-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\jpeg
-
-..\%__SRC%\slb\jpeglib.lib %_DEST%\lib\jpeglib.lib
-..\%__SRC%\slb\jpeglib.lib %_DEST%\lib\jpeg.lib
-..\%__SRC%\lib\libjpeglib.a %_DEST%\lib\libjpeglib.a
-..\%__SRC%\lib\libjpeglib.a %_DEST%\lib\libjpeg.a
-
-..\%__SRC%\inc\jerror.h %_DEST%\inc\external\jpeg\jerror.h
-..\%__SRC%\inc\jpeglib.h %_DEST%\inc\external\jpeg\jpeglib.h
-..\%__SRC%\inc\jconfig.h %_DEST%\inc\external\jpeg\jconfig.h
-..\%__SRC%\inc\jmorecfg.h %_DEST%\inc\external\jpeg\jmorecfg.h

ooo.lst.in

@@ -42,7 +42,6 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
 22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
 0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
 d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
-a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
@@ -83,6 +82,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
 @JFREEREPORT_LIBSERIALIZER_TARBALL@
 @JFREEREPORT_LIBXML_TARBALL@
 @JFREEREPORT_SAC_TARBALL@
+@JPEG_TARBALL@
 @LANGUAGETOOL_TARBALL@
 @MDDS_TARBALL@
 @MOZ_TARBALL@