diff options
author | ka <kai.ahrens@oracle.com> | 2011-03-07 03:30:31 +0100 |
---|---|---|
committer | ka <kai.ahrens@oracle.com> | 2011-03-07 03:30:31 +0100 |
commit | 9d0e7743fa8ec4efdfe47288c715732372cf84ce (patch) | |
tree | d01c5b9f3b86738258755ffd19e45e7315c53123 | |
parent | d9698e83a5b9428db2500937181cb344625b7172 (diff) |
rsvglibs: added external sources for jpeg8 library
-rw-r--r-- | libjpeg/jpeg-8c.patch | 142 | ||||
-rw-r--r-- | libjpeg/makefile.mk | 66 | ||||
-rw-r--r-- | libjpeg/prj/build.lst | 3 | ||||
-rw-r--r-- | libjpeg/prj/d.lst | 11 |
4 files changed, 222 insertions, 0 deletions
diff --git a/libjpeg/jpeg-8c.patch b/libjpeg/jpeg-8c.patch new file mode 100644 index 000000000000..216608d6e50e --- /dev/null +++ b/libjpeg/jpeg-8c.patch @@ -0,0 +1,142 @@ +--- misc/jpeg-8c/makefile.mk 2011-03-06 23:04:22.985821034 +0100 ++++ misc/build/jpeg-8c/makefile.mk 2011-03-06 23:03:28.424821116 +0100 +@@ -1 +1,76 @@ +-dummy ++#************************************************************************* ++# ++# Copyright according the GNU Public License. ++# ++#************************************************************************* ++ ++PRJ=..$/..$/..$/.. ++ ++PRJNAME=jpeg8 ++TARGET=jpeg8 ++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)$/jmemnobs.obj \ ++ $(SLO)$/jutils.obj ++ ++LIB1TARGET=$(SLB)$/$(TARGET).lib ++LIB1ARCHIV=$(LB)$/$(TARGET).a ++LIB1OBJFILES=$(SLOFILES) ++ ++.INCLUDE : target.mk +--- misc/jpeg-8c/jconfig.h 2011-03-06 23:19:25.611821058 +0100 ++++ misc/build/jpeg-8c/jconfig.h 2011-03-06 23:10:22.070821059 +0100 +@@ -1 +1,58 @@ +-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 ++#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 ++ ++#define BMP_SUPPORTED /* BMP image file format */ ++#define GIF_SUPPORTED /* GIF image file format */ ++#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */ ++/* #undef RLE_SUPPORTED */ ++#define 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/libjpeg/makefile.mk b/libjpeg/makefile.mk new file mode 100644 index 000000000000..779f0bce7c64 --- /dev/null +++ b/libjpeg/makefile.mk @@ -0,0 +1,66 @@ +#************************************************************************* +# +# 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=libjpeg +TARGET=jpeg8 + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_LIBJPEG)" == "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 +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/libjpeg/prj/build.lst b/libjpeg/prj/build.lst new file mode 100644 index 000000000000..fbb2f6f45704 --- /dev/null +++ b/libjpeg/prj/build.lst @@ -0,0 +1,3 @@ +ljpeg libjpeg : soltools NULL +ljpeg libjpeg usr1 - all ljpeg_mkout NULL +ljpeg libjpeg nmake - all ljpeg_libjpeg NULL diff --git a/libjpeg/prj/d.lst b/libjpeg/prj/d.lst new file mode 100644 index 000000000000..7306d54a5fd9 --- /dev/null +++ b/libjpeg/prj/d.lst @@ -0,0 +1,11 @@ +mkdir: %_DEST%\inc%_EXT%\external +mkdir: %_DEST%\inc%_EXT%\external\libjpeg + +..\%__SRC%\slb\jpeg8.lib %_DEST%\lib%_EXT%\jpeg8.lib +..\%__SRC%\lib\jpeg8.a %_DEST%\lib%_EXT%\jpeg8.a + +..\%__SRC%\inc\jpeglib.h %_DEST%\inc%_EXT%\external\libjpeg\jpeglib.h +..\%__SRC%\inc\jconfig.h %_DEST%\inc%_EXT%\external\libjpeg\jconfig.h +..\%__SRC%\inc\jmorecfg.h %_DEST%\inc%_EXT%\external\libjpeg\jmorecfg.h +..\%__SRC%\inc\jerror.h %_DEST%\inc%_EXT%\external\libjpeg\jerror.h +..\%__SRC%\inc\jpegint.h %_DEST%\inc%_EXT%\external\libjpeg\jpegint.h |