4 files changed, 192 insertions, 0 deletions
diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch
new file mode 100644
index 000000000000..1180e7a63115
--- /dev/null
+++ b/jpeg/jpeg-6b.patch
@@ -0,0 +1,113 @@
+--- misc/jpeg-6b/jconfig.h	2009-03-19 11:30:46.000000000 +0100
++++ misc/build/jpeg-6b/jconfig.h	2009-03-19 11:30:30.000000000 +0100
+@@ -1 +1,16 @@
+-dummy
++#define HAVE_PROTOTYPES
++#define HAVE_UNSIGNED_CHAR
++#define HAVE_UNSIGNED_SHORT
++#undef CHAR_IS_UNSIGNED
++#define HAVE_STDDEF_H
++#define HAVE_STDLIB_H
++#undef NEED_BSD_STRINGS
++#undef NEED_SYS_TYPES_H
++#undef NEED_FAR_POINTERS
++#undef NEED_SHORT_EXTERNAL_NAMES
++#undef INCOMPLETE_TYPES_BROKEN
++
++#ifdef JPEG_INTERNALS
++#undef RIGHT_SHIFT_IS_UNSIGNED
++#define NO_GETENV
++#endif
+--- misc/jpeg-6b/jmorecfg.h	1997-08-10 01:58:56.000000000 +0200
++++ misc/build/jpeg-6b/jmorecfg.h	2009-03-19 11:30:30.000000000 +0100
+@@ -157,8 +157,8 @@
+ 
+ /* INT32 must hold at least signed 32-bit values. */
+ 
+-#ifndef XMD_H			/* X11/xmd.h correctly defines INT32 */
+-typedef long INT32;
++#if !defined XMD_H && !defined _SOLAR_H		/* X11/xmd.h correctly defines INT32 */
++typedef int INT32;
+ #endif
+ 
+ /* Datatype used for image dimensions.  The JPEG standard only supports
+--- misc/jpeg-6b/makefile.mk	2009-03-19 11:30:46.000000000 +0100
++++ misc/build/jpeg-6b/makefile.mk	2009-03-19 11:30:30.000000000 +0100
+@@ -1 +1,76 @@
+-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)$/jcapimin.obj \
++			$(SLO)$/jcapistd.obj \
++			$(SLO)$/jccoefct.obj \
++			$(SLO)$/jccolor.obj  \
++			$(SLO)$/jcdctmgr.obj \
++			$(SLO)$/jcinit.obj   \
++			$(SLO)$/jchuff.obj   \
++			$(SLO)$/jcphuff.obj  \
++			$(SLO)$/jcmainct.obj \
++			$(SLO)$/jcmarker.obj \
++			$(SLO)$/jcmaster.obj \
++			$(SLO)$/jcomapi.obj  \
++			$(SLO)$/jcparam.obj  \
++			$(SLO)$/jcprepct.obj \
++			$(SLO)$/jcsample.obj \
++			$(SLO)$/jdhuff.obj   \
++			$(SLO)$/jdinput.obj  \
++			$(SLO)$/jdtrans.obj  \
++			$(SLO)$/jdapimin.obj \
++			$(SLO)$/jdapistd.obj \
++			$(SLO)$/jdatadst.obj \
++			$(SLO)$/jdatasrc.obj \
++			$(SLO)$/jdcoefct.obj \
++			$(SLO)$/jdcolor.obj  \
++			$(SLO)$/jddctmgr.obj \
++			$(SLO)$/jdphuff.obj  \
++			$(SLO)$/jdmainct.obj \
++			$(SLO)$/jdmarker.obj \
++			$(SLO)$/jdmaster.obj \
++			$(SLO)$/jdmerge.obj  \
++			$(SLO)$/jdpostct.obj \
++			$(SLO)$/jdsample.obj \
++			$(SLO)$/jerror.obj   \
++			$(SLO)$/jfdctflt.obj \
++			$(SLO)$/jfdctfst.obj \
++			$(SLO)$/jfdctint.obj \
++			$(SLO)$/jidctflt.obj \
++			$(SLO)$/jidctfst.obj \
++			$(SLO)$/jidctint.obj \
++			$(SLO)$/jidctred.obj \
++			$(SLO)$/jmemmgr.obj  \
++			$(SLO)$/jmemnobs.obj \
++			$(SLO)$/jquant1.obj  \
++			$(SLO)$/jquant2.obj  \
++			$(SLO)$/jutils.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE :  target.mk
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
new file mode 100644
index 000000000000..b2553dd1b4f2
--- /dev/null
+++ b/jpeg/makefile.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# 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-6b
+TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
+
+PATCH_FILES=jpeg-6b.patch
+ADDITIONAL_FILES=makefile.mk \
+                 jconfig.h
+
+#relative to CONFIGURE_DIR
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+OUT2INC=jerror.h   \
+        jpeglib.h  \
+        jconfig.h  \
+        jmorecfg.h
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
diff --git a/jpeg/prj/build.lst b/jpeg/prj/build.lst
new file mode 100644
index 000000000000..b0fe1f0aaf68
--- /dev/null
+++ b/jpeg/prj/build.lst
@@ -0,0 +1,2 @@
+jg	jpeg	:	soltools NULL
+jg	jpeg						nmake	-	all	jg_mkout NULL
diff --git a/jpeg/prj/d.lst b/jpeg/prj/d.lst
new file mode 100644
index 000000000000..8bda1b88ea9d
--- /dev/null
+++ b/jpeg/prj/d.lst
@@ -0,0 +1,10 @@
+mkdir: %_DEST%\inc%_EXT%\external
+mkdir: %_DEST%\inc%_EXT%\external\jpeg
+
+..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
+..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
+
+..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\jerror.h
+..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\jpeglib.h
+..\%__SRC%\inc\jconfig.h %_DEST%\inc%_EXT%\external\jconfig.h
+..\%__SRC%\inc\jmorecfg.h %_DEST%\inc%_EXT%\external\jmorecfg.h