summaryrefslogtreecommitdiff
path: root/jpeg
diff options
context:
space:
mode:
Diffstat (limited to 'jpeg')
-rw-r--r--jpeg/jpeg-6b.patch113
-rw-r--r--jpeg/jpeg-8c.patch174
-rw-r--r--jpeg/makefile.mk71
-rw-r--r--jpeg/prj/build.lst2
-rw-r--r--jpeg/prj/d.lst12
5 files changed, 372 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/jpeg-8c.patch b/jpeg/jpeg-8c.patch
new file mode 100644
index 000000000000..77c1ff592c7a
--- /dev/null
+++ b/jpeg/jpeg-8c.patch
@@ -0,0 +1,174 @@
+--- 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
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
new file mode 100644
index 000000000000..adc0c664c127
--- /dev/null
+++ b/jpeg/makefile.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# 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_NAME=jpeg-8c
+
+#TARFILE_MD5=dbd5f3b47ed13132f04c685d608a7547
+TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9
+
+#PATCH_FILES=jpeg-6b.patch
+PATCH_FILES=jpeg-8c.patch
+
+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
diff --git a/jpeg/prj/build.lst b/jpeg/prj/build.lst
new file mode 100644
index 000000000000..ef26ed4a7926
--- /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..42e3945e8747
--- /dev/null
+++ b/jpeg/prj/d.lst
@@ -0,0 +1,12 @@
+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
generated by cgit (git 2.34.1) at 2025-01-04 04:41:39 +0000