Anonymous avatar Anonymous committed bdf21d4

rsvglibs: cleanup

Comments (0)

Files changed (7)

libjpeg/jpeg-8c.patch

---- misc/jpeg-8c/jconfig.h	2011-03-07 13:16:09.000000000 +0100
-+++ misc/build/jpeg-8c/jconfig.h	2011-03-07 13:15:03.000000000 +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 */
---- misc/jpeg-8c/makefile.mk	2011-03-07 13:16:09.000000000 +0100
-+++ misc/build/jpeg-8c/makefile.mk	2011-03-07 13:15:39.000000000 +0100
-@@ -1 +1,77 @@
--dummy
-+#*************************************************************************
-+#
-+#   Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=libjpeg
-+TARGET=jpeg
-+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

libjpeg/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=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

libjpeg/prj/build.lst

-ljpeg   libjpeg : soltools NULL
-ljpeg   libjpeg  usr1   -   all	ljpeg_mkout NULL
-ljpeg   libjpeg  nmake  -   all	ljpeg_libjpeg NULL

libjpeg/prj/d.lst

-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\libjpeg
-
-..\%__SRC%\slb\jpeg.lib %_DEST%\lib%_EXT%\jpeg.lib
-..\%__SRC%\lib\libjpeg.a %_DEST%\lib%_EXT%\libjpeg.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

libpng/libpng-1.5.1.patch

+--- misc/libpng-1.5.1/makefile.mk	2011-03-24 21:49:50.911397154 +0100
++++ misc/build/libpng-1.5.1/makefile.mk	2011-03-24 21:47:23.379397048 +0100
+@@ -1 +1,49 @@
+-dummy
++#*************************************************************************
++#
++#   Copyright according the GNU Public License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..
++
++PRJNAME=libpng
++TARGET=libpng
++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)$/png.obj 		\
++                $(SLO)$/pngerror.obj	\
++                $(SLO)$/pngget.obj	\
++                $(SLO)$/pngmem.obj	\
++                $(SLO)$/pngpread.obj	\
++                $(SLO)$/pngread.obj	\
++                $(SLO)$/pngrio.obj	\
++                $(SLO)$/pngrtran.obj	\
++                $(SLO)$/pngrutil.obj	\
++                $(SLO)$/pngset.obj	\
++                $(SLO)$/pngtest.obj	\
++                $(SLO)$/pngtrans.obj	\
++                $(SLO)$/pngvalid.obj	\
++                $(SLO)$/pngwio.obj	\
++                $(SLO)$/pngwrite.obj	\
++                $(SLO)$/pngwtran.obj	\
++                $(SLO)$/pngwutil.obj
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1ARCHIV=$(LB)$/$(TARGET).a
++LIB1OBJFILES=$(SLOFILES)
++
++.INCLUDE :  target.mk
++
+--- misc/libpng-1.5.1/pnglibconf.h	2011-03-24 21:49:50.913397154 +0100
++++ misc/build/libpng-1.5.1/pnglibconf.h	2011-03-24 21:47:23.380397048 +0100
+@@ -1 +1,176 @@
+-dummy
++
++/* libpng STANDARD API DEFINITION */
++
++/* pnglibconf.h - library build configuration */
++
++/* libpng version 1.5.0 - last changed on January 6, 2011 */
++
++/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
++
++/* This code is released under the libpng license. */
++/* For conditions of distribution and use, see the disclaimer */
++/* and license in png.h */
++
++/* pnglibconf.h */
++/* Machine generated file: DO NOT EDIT */
++/* Derived from: scripts/pnglibconf.dfa */
++#ifndef PNGLCONF_H
++#define PNGLCONF_H
++/* settings */
++#define PNG_MAX_GAMMA_8 11
++#define PNG_CALLOC_SUPPORTED
++#define PNG_QUANTIZE_RED_BITS 5
++#define PNG_USER_WIDTH_MAX 1000000L
++#define PNG_QUANTIZE_GREEN_BITS 5
++#define PNG_API_RULE 0
++#define PNG_QUANTIZE_BLUE_BITS 5
++#define PNG_USER_CHUNK_CACHE_MAX 0
++#define PNG_USER_HEIGHT_MAX 1000000L
++#define PNG_sCAL_PRECISION 5
++#define PNG_COST_SHIFT 3
++#define PNG_WEIGHT_SHIFT 8
++#define PNG_USER_CHUNK_MALLOC_MAX 0
++#define PNG_DEFAULT_READ_MACROS 1
++#define PNG_ZBUF_SIZE 8192
++#define PNG_GAMMA_THRESHOLD_FIXED 5000
++/* end of settings */
++/* options */
++#define PNG_INFO_IMAGE_SUPPORTED
++#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
++#define PNG_POINTER_INDEXING_SUPPORTED
++#define PNG_WARNINGS_SUPPORTED
++#define PNG_FLOATING_ARITHMETIC_SUPPORTED
++#define PNG_WRITE_SUPPORTED
++#define PNG_WRITE_INTERLACING_SUPPORTED
++#define PNG_WRITE_16BIT_SUPPORTED
++#define PNG_EASY_ACCESS_SUPPORTED
++#define PNG_ALIGN_MEMORY_SUPPORTED
++#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
++#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
++#define PNG_USER_LIMITS_SUPPORTED
++#define PNG_FIXED_POINT_SUPPORTED
++/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
++#define PNG_ERROR_TEXT_SUPPORTED
++#define PNG_READ_SUPPORTED
++/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
++#define PNG_BENIGN_ERRORS_SUPPORTED
++#define PNG_SETJMP_SUPPORTED
++#define PNG_WRITE_FLUSH_SUPPORTED
++#define PNG_MNG_FEATURES_SUPPORTED
++#define PNG_FLOATING_POINT_SUPPORTED
++#define PNG_INCH_CONVERSIONS_SUPPORTED
++#define PNG_STDIO_SUPPORTED
++#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
++#define PNG_USER_MEM_SUPPORTED
++#define PNG_IO_STATE_SUPPORTED
++#define PNG_SET_USER_LIMITS_SUPPORTED
++#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
++#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
++#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
++#define PNG_WRITE_FILTER_SUPPORTED
++#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
++#define PNG_WRITE_iCCP_SUPPORTED
++#define PNG_READ_TRANSFORMS_SUPPORTED
++#define PNG_READ_GAMMA_SUPPORTED
++#define PNG_READ_bKGD_SUPPORTED
++#define PNG_UNKNOWN_CHUNKS_SUPPORTED
++#define PNG_READ_sCAL_SUPPORTED
++#define PNG_WRITE_hIST_SUPPORTED
++#define PNG_READ_OPT_PLTE_SUPPORTED
++#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
++#define PNG_WRITE_gAMA_SUPPORTED
++#define PNG_READ_GRAY_TO_RGB_SUPPORTED
++#define PNG_WRITE_pCAL_SUPPORTED
++#define PNG_READ_INVERT_ALPHA_SUPPORTED
++#define PNG_WRITE_TRANSFORMS_SUPPORTED
++#define PNG_READ_sBIT_SUPPORTED
++#define PNG_READ_PACK_SUPPORTED
++#define PNG_WRITE_SWAP_SUPPORTED
++#define PNG_READ_cHRM_SUPPORTED
++#define PNG_WRITE_tIME_SUPPORTED
++#define PNG_READ_INTERLACING_SUPPORTED
++#define PNG_READ_tRNS_SUPPORTED
++#define PNG_WRITE_pHYs_SUPPORTED
++#define PNG_WRITE_INVERT_SUPPORTED
++#define PNG_READ_RGB_TO_GRAY_SUPPORTED
++#define PNG_WRITE_sRGB_SUPPORTED
++#define PNG_READ_oFFs_SUPPORTED
++#define PNG_WRITE_FILLER_SUPPORTED
++#define PNG_WRITE_TEXT_SUPPORTED
++#define PNG_WRITE_SHIFT_SUPPORTED
++#define PNG_PROGRESSIVE_READ_SUPPORTED
++#define PNG_READ_SHIFT_SUPPORTED
++#define PNG_CONVERT_tIME_SUPPORTED
++#define PNG_READ_USER_TRANSFORM_SUPPORTED
++#define PNG_READ_INT_FUNCTIONS_SUPPORTED
++#define PNG_READ_USER_CHUNKS_SUPPORTED
++#define PNG_READ_hIST_SUPPORTED
++#define PNG_READ_16BIT_SUPPORTED
++#define PNG_READ_SWAP_ALPHA_SUPPORTED
++#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
++#define PNG_SEQUENTIAL_READ_SUPPORTED
++#define PNG_READ_BACKGROUND_SUPPORTED
++#define PNG_READ_QUANTIZE_SUPPORTED
++#define PNG_READ_iCCP_SUPPORTED
++#define PNG_READ_STRIP_ALPHA_SUPPORTED
++#define PNG_READ_PACKSWAP_SUPPORTED
++#define PNG_READ_sRGB_SUPPORTED
++#define PNG_WRITE_tEXt_SUPPORTED
++#define PNG_READ_gAMA_SUPPORTED
++#define PNG_READ_pCAL_SUPPORTED
++#define PNG_READ_EXPAND_SUPPORTED
++#define PNG_WRITE_sPLT_SUPPORTED
++#define PNG_READ_SWAP_SUPPORTED
++#define PNG_READ_tIME_SUPPORTED
++#define PNG_READ_pHYs_SUPPORTED
++#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
++#define PNG_TIME_RFC1123_SUPPORTED
++#define PNG_READ_TEXT_SUPPORTED
++#define PNG_WRITE_BGR_SUPPORTED
++#define PNG_USER_CHUNKS_SUPPORTED
++#define PNG_CONSOLE_IO_SUPPORTED
++#define PNG_WRITE_PACK_SUPPORTED
++#define PNG_READ_FILLER_SUPPORTED
++#define PNG_WRITE_bKGD_SUPPORTED
++#define PNG_WRITE_tRNS_SUPPORTED
++#define PNG_READ_sPLT_SUPPORTED
++#define PNG_WRITE_sCAL_SUPPORTED
++#define PNG_WRITE_oFFs_SUPPORTED
++#define PNG_READ_tEXt_SUPPORTED
++#define PNG_WRITE_sBIT_SUPPORTED
++#define PNG_READ_INVERT_SUPPORTED
++#define PNG_READ_16_TO_8_SUPPORTED
++#define PNG_WRITE_cHRM_SUPPORTED
++#define PNG_16BIT_SUPPORTED
++#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
++#define PNG_READ_BGR_SUPPORTED
++#define PNG_WRITE_PACKSWAP_SUPPORTED
++#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
++#define PNG_sCAL_SUPPORTED
++#define PNG_WRITE_zTXt_SUPPORTED
++#define PNG_sBIT_SUPPORTED
++#define PNG_cHRM_SUPPORTED
++#define PNG_bKGD_SUPPORTED
++#define PNG_tRNS_SUPPORTED
++#define PNG_WRITE_iTXt_SUPPORTED
++#define PNG_oFFs_SUPPORTED
++#define PNG_USER_TRANSFORM_PTR_SUPPORTED
++#define PNG_USER_TRANSFORM_INFO_SUPPORTED
++#define PNG_hIST_SUPPORTED
++#define PNG_iCCP_SUPPORTED
++#define PNG_sRGB_SUPPORTED
++#define PNG_READ_zTXt_SUPPORTED
++#define PNG_gAMA_SUPPORTED
++#define PNG_pCAL_SUPPORTED
++#define PNG_CHECK_cHRM_SUPPORTED
++#define PNG_tIME_SUPPORTED
++#define PNG_pHYs_SUPPORTED
++#define PNG_READ_iTXt_SUPPORTED
++#define PNG_TEXT_SUPPORTED
++#define PNG_SAVE_INT_32_SUPPORTED
++#define PNG_sPLT_SUPPORTED
++#define PNG_tEXt_SUPPORTED
++#define PNG_zTXt_SUPPORTED
++#define PNG_iTXt_SUPPORTED
++/* end of options */
++#endif /* PNGLCONF_H */
+--- misc/libpng-1.5.1/pngstruct.h	2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.1/pngstruct.h	2011-03-24 21:47:23.380397048 +0100
+@@ -24,7 +24,11 @@
+  * in this structure and is required for decompressing the LZ compressed
+  * data in PNG files.
+  */
++#if defined MACOSX
+ #include "zlib.h"
++#else
++#include <external/zlib/zlib.h>
++#endif
+
+ struct png_struct_def
+ {
+--- misc/libpng-1.5.1/pngtest.c	2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.1/pngtest.c	2011-03-24 21:47:23.380397048 +0100
+@@ -31,7 +31,12 @@
+  * of files at once by typing "pngtest -m file1.png file2.png ..."
+  */
+
++#if defined MACOSX
+ #include "zlib.h"
++#else
++#include <external/zlib/zlib.h>
++#endif
++
+ #include "png.h"
+ /* Copied from pngpriv.h but only used in error messages below. */
+ #ifndef PNG_ZBUF_SIZE
+--- misc/libpng-1.5.1/pngvalid.c	2011-02-03 05:58:17.000000000 +0100
++++ misc/build/libpng-1.5.1/pngvalid.c	2011-03-24 21:47:23.381397048 +0100
+@@ -51,7 +51,11 @@
+ #define PNG_READ_16BIT_SUPPORTED
+ #endif
+
+-#include "zlib.h"   /* For crc32 */
++#if defined MACOSX
++#include "zlib.h"
++#else
++#include <external/zlib/zlib.h>
++#endif
+
+ #include <float.h>  /* For floating point constants */
+ #include <stdlib.h> /* For malloc */

libpng/libpng.patch

---- misc/libpng-1.5.1/makefile.mk	2011-03-01 00:01:58.221734678 +0100
-+++ misc/build/libpng-1.5.1/makefile.mk	2011-02-28 23:52:40.953319424 +0100
-@@ -1 +1,49 @@
--dummy
-+#*************************************************************************
-+#
-+#   Copyright according the GNU Public License.
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+
-+PRJNAME=libpng
-+TARGET=libpng
-+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)$/png.obj 		\
-+                $(SLO)$/pngerror.obj	\
-+                $(SLO)$/pngget.obj	\
-+                $(SLO)$/pngmem.obj	\
-+                $(SLO)$/pngpread.obj	\
-+                $(SLO)$/pngread.obj	\
-+                $(SLO)$/pngrio.obj	\
-+                $(SLO)$/pngrtran.obj	\
-+                $(SLO)$/pngrutil.obj	\
-+                $(SLO)$/pngset.obj	\
-+                $(SLO)$/pngtest.obj	\
-+                $(SLO)$/pngtrans.obj	\
-+                $(SLO)$/pngvalid.obj	\
-+                $(SLO)$/pngwio.obj	\
-+                $(SLO)$/pngwrite.obj	\
-+                $(SLO)$/pngwtran.obj	\
-+                $(SLO)$/pngwutil.obj
-+
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
-+
-+.INCLUDE :  target.mk
-+
---- misc/libpng-1.5.1/pnglibconf.h	2011-03-02 15:19:29.537422800 +0100
-+++ misc/build/libpng-1.5.1/pnglibconf.h	2011-03-02 15:18:11.492358700 +0100
-@@ -1 +1,176 @@
--dummy
-+
-+/* libpng STANDARD API DEFINITION */
-+
-+/* pnglibconf.h - library build configuration */
-+
-+/* libpng version 1.5.0 - last changed on January 6, 2011 */
-+
-+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
-+
-+/* This code is released under the libpng license. */
-+/* For conditions of distribution and use, see the disclaimer */
-+/* and license in png.h */
-+
-+/* pnglibconf.h */
-+/* Machine generated file: DO NOT EDIT */
-+/* Derived from: scripts/pnglibconf.dfa */
-+#ifndef PNGLCONF_H
-+#define PNGLCONF_H
-+/* settings */
-+#define PNG_MAX_GAMMA_8 11
-+#define PNG_CALLOC_SUPPORTED
-+#define PNG_QUANTIZE_RED_BITS 5
-+#define PNG_USER_WIDTH_MAX 1000000L
-+#define PNG_QUANTIZE_GREEN_BITS 5
-+#define PNG_API_RULE 0
-+#define PNG_QUANTIZE_BLUE_BITS 5
-+#define PNG_USER_CHUNK_CACHE_MAX 0
-+#define PNG_USER_HEIGHT_MAX 1000000L
-+#define PNG_sCAL_PRECISION 5
-+#define PNG_COST_SHIFT 3
-+#define PNG_WEIGHT_SHIFT 8
-+#define PNG_USER_CHUNK_MALLOC_MAX 0
-+#define PNG_DEFAULT_READ_MACROS 1
-+#define PNG_ZBUF_SIZE 8192
-+#define PNG_GAMMA_THRESHOLD_FIXED 5000
-+/* end of settings */
-+/* options */
-+#define PNG_INFO_IMAGE_SUPPORTED
-+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-+#define PNG_POINTER_INDEXING_SUPPORTED
-+#define PNG_WARNINGS_SUPPORTED
-+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-+#define PNG_WRITE_SUPPORTED
-+#define PNG_WRITE_INTERLACING_SUPPORTED
-+#define PNG_WRITE_16BIT_SUPPORTED
-+#define PNG_EASY_ACCESS_SUPPORTED
-+#define PNG_ALIGN_MEMORY_SUPPORTED
-+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_USER_LIMITS_SUPPORTED
-+#define PNG_FIXED_POINT_SUPPORTED
-+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-+#define PNG_ERROR_TEXT_SUPPORTED
-+#define PNG_READ_SUPPORTED
-+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
-+#define PNG_BENIGN_ERRORS_SUPPORTED
-+#define PNG_SETJMP_SUPPORTED
-+#define PNG_WRITE_FLUSH_SUPPORTED
-+#define PNG_MNG_FEATURES_SUPPORTED
-+#define PNG_FLOATING_POINT_SUPPORTED
-+#define PNG_INCH_CONVERSIONS_SUPPORTED
-+#define PNG_STDIO_SUPPORTED
-+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_USER_MEM_SUPPORTED
-+#define PNG_IO_STATE_SUPPORTED
-+#define PNG_SET_USER_LIMITS_SUPPORTED
-+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-+#define PNG_WRITE_FILTER_SUPPORTED
-+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-+#define PNG_WRITE_iCCP_SUPPORTED
-+#define PNG_READ_TRANSFORMS_SUPPORTED
-+#define PNG_READ_GAMMA_SUPPORTED
-+#define PNG_READ_bKGD_SUPPORTED
-+#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-+#define PNG_READ_sCAL_SUPPORTED
-+#define PNG_WRITE_hIST_SUPPORTED
-+#define PNG_READ_OPT_PLTE_SUPPORTED
-+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-+#define PNG_WRITE_gAMA_SUPPORTED
-+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-+#define PNG_WRITE_pCAL_SUPPORTED
-+#define PNG_READ_INVERT_ALPHA_SUPPORTED
-+#define PNG_WRITE_TRANSFORMS_SUPPORTED
-+#define PNG_READ_sBIT_SUPPORTED
-+#define PNG_READ_PACK_SUPPORTED
-+#define PNG_WRITE_SWAP_SUPPORTED
-+#define PNG_READ_cHRM_SUPPORTED
-+#define PNG_WRITE_tIME_SUPPORTED
-+#define PNG_READ_INTERLACING_SUPPORTED
-+#define PNG_READ_tRNS_SUPPORTED
-+#define PNG_WRITE_pHYs_SUPPORTED
-+#define PNG_WRITE_INVERT_SUPPORTED
-+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-+#define PNG_WRITE_sRGB_SUPPORTED
-+#define PNG_READ_oFFs_SUPPORTED
-+#define PNG_WRITE_FILLER_SUPPORTED
-+#define PNG_WRITE_TEXT_SUPPORTED
-+#define PNG_WRITE_SHIFT_SUPPORTED
-+#define PNG_PROGRESSIVE_READ_SUPPORTED
-+#define PNG_READ_SHIFT_SUPPORTED
-+#define PNG_CONVERT_tIME_SUPPORTED
-+#define PNG_READ_USER_TRANSFORM_SUPPORTED
-+#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-+#define PNG_READ_USER_CHUNKS_SUPPORTED
-+#define PNG_READ_hIST_SUPPORTED
-+#define PNG_READ_16BIT_SUPPORTED
-+#define PNG_READ_SWAP_ALPHA_SUPPORTED
-+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-+#define PNG_SEQUENTIAL_READ_SUPPORTED
-+#define PNG_READ_BACKGROUND_SUPPORTED
-+#define PNG_READ_QUANTIZE_SUPPORTED
-+#define PNG_READ_iCCP_SUPPORTED
-+#define PNG_READ_STRIP_ALPHA_SUPPORTED
-+#define PNG_READ_PACKSWAP_SUPPORTED
-+#define PNG_READ_sRGB_SUPPORTED
-+#define PNG_WRITE_tEXt_SUPPORTED
-+#define PNG_READ_gAMA_SUPPORTED
-+#define PNG_READ_pCAL_SUPPORTED
-+#define PNG_READ_EXPAND_SUPPORTED
-+#define PNG_WRITE_sPLT_SUPPORTED
-+#define PNG_READ_SWAP_SUPPORTED
-+#define PNG_READ_tIME_SUPPORTED
-+#define PNG_READ_pHYs_SUPPORTED
-+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-+#define PNG_TIME_RFC1123_SUPPORTED
-+#define PNG_READ_TEXT_SUPPORTED
-+#define PNG_WRITE_BGR_SUPPORTED
-+#define PNG_USER_CHUNKS_SUPPORTED
-+#define PNG_CONSOLE_IO_SUPPORTED
-+#define PNG_WRITE_PACK_SUPPORTED
-+#define PNG_READ_FILLER_SUPPORTED
-+#define PNG_WRITE_bKGD_SUPPORTED
-+#define PNG_WRITE_tRNS_SUPPORTED
-+#define PNG_READ_sPLT_SUPPORTED
-+#define PNG_WRITE_sCAL_SUPPORTED
-+#define PNG_WRITE_oFFs_SUPPORTED
-+#define PNG_READ_tEXt_SUPPORTED
-+#define PNG_WRITE_sBIT_SUPPORTED
-+#define PNG_READ_INVERT_SUPPORTED
-+#define PNG_READ_16_TO_8_SUPPORTED
-+#define PNG_WRITE_cHRM_SUPPORTED
-+#define PNG_16BIT_SUPPORTED
-+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-+#define PNG_READ_BGR_SUPPORTED
-+#define PNG_WRITE_PACKSWAP_SUPPORTED
-+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-+#define PNG_sCAL_SUPPORTED
-+#define PNG_WRITE_zTXt_SUPPORTED
-+#define PNG_sBIT_SUPPORTED
-+#define PNG_cHRM_SUPPORTED
-+#define PNG_bKGD_SUPPORTED
-+#define PNG_tRNS_SUPPORTED
-+#define PNG_WRITE_iTXt_SUPPORTED
-+#define PNG_oFFs_SUPPORTED
-+#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-+#define PNG_hIST_SUPPORTED
-+#define PNG_iCCP_SUPPORTED
-+#define PNG_sRGB_SUPPORTED
-+#define PNG_READ_zTXt_SUPPORTED
-+#define PNG_gAMA_SUPPORTED
-+#define PNG_pCAL_SUPPORTED
-+#define PNG_CHECK_cHRM_SUPPORTED
-+#define PNG_tIME_SUPPORTED
-+#define PNG_pHYs_SUPPORTED
-+#define PNG_READ_iTXt_SUPPORTED
-+#define PNG_TEXT_SUPPORTED
-+#define PNG_SAVE_INT_32_SUPPORTED
-+#define PNG_sPLT_SUPPORTED
-+#define PNG_tEXt_SUPPORTED
-+#define PNG_zTXt_SUPPORTED
-+#define PNG_iTXt_SUPPORTED
-+/* end of options */
-+#endif /* PNGLCONF_H */
---- misc/libpng-1.5.1/pngstruct.h	2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngstruct.h	2011-03-02 16:28:53.289801400 +0100
-@@ -24,7 +24,11 @@
-  * in this structure and is required for decompressing the LZ compressed
-  * data in PNG files.
-  */
-+#if defined MACOSX
- #include "zlib.h"
-+#else
-+#include <external/zlib/zlib.h>
-+#endif
-
- struct png_struct_def
- { 
---- misc/libpng-1.5.1/pngtest.c 	2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngtest.c	    2011-03-02 16:30:09.881914600 +0100
-@@ -31,7 +31,12 @@
-  * of files at once by typing "pngtest -m file1.png file2.png ..."
-  */
-
-+#if defined MACOSX
- #include "zlib.h"
-+#else
-+#include <external/zlib/zlib.h>
-+#endif
-+
- #include "png.h"
- /* Copied from pngpriv.h but only used in error messages below. */
- #ifndef PNG_ZBUF_SIZE
---- misc/libpng-1.5.1/pngvalid.c        2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.1/pngvalid.c    2011-03-02 19:15:38.583630100 +0100
-@@ -51,7 +51,11 @@ typedef png_byte *png_const_bytep;
- #define PNG_READ_16BIT_SUPPORTED
- #endif
-
--#include "zlib.h"   /* For crc32 */
-+#if defined MACOSX
-+#include "zlib.h"
-+#else
-+#include <external/zlib/zlib.h>
-+#endif
-
- #include <float.h>  /* For floating point constants */
- #include <stdlib.h> /* For malloc */
- 

libpng/makefile.mk

 TARFILE_NAME=$(PRJNAME)-$(LIBPNGVERSION)
 TARFILE_MD5=220035f111ea045a51e290906025e8b5
 
-PATCH_FILES=libpng.patch
+PATCH_FILES=$(PRJNAME)-$(LIBPNGVERSION).patch
 ADDITIONAL_FILES=makefile.mk pnglibconf.h
 
 #relative to CONFIGURE_DIR
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
-
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.