[Libreoffice-commits] .: cairo/prj config_host.mk.in configure.in libpng/configs libpng/libpng-1.5.10.patch libpng/Makefile libpng/makefile.mk libpng/Module_libpng.mk libpng/Package_libpng.mk libpng/prj libpng/StaticLibrary_png.mk libpng/UnpackedTarball_png.mk Makefile.top ooo.lst.in RepositoryExternal.mk RepositoryModule_ooo.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 8 15:51:51 PDT 2012
Makefile.top | 2
RepositoryExternal.mk | 4
RepositoryModule_ooo.mk | 1
cairo/prj/build.lst | 2
config_host.mk.in | 1
configure.in | 3
libpng/Makefile | 7 +
libpng/Module_libpng.mk | 22 +++
libpng/Package_libpng.mk | 21 +++
libpng/StaticLibrary_png.mk | 34 +++++
libpng/UnpackedTarball_png.mk | 18 ++
libpng/configs/pnglibconf.h | 178 +++++++++++++++++++++++++++
libpng/libpng-1.5.10.patch | 268 ------------------------------------------
libpng/makefile.mk | 63 ---------
libpng/prj/d.lst | 11 -
ooo.lst.in | 2
16 files changed, 289 insertions(+), 348 deletions(-)
New commits:
commit f96d58bd53d8068f6056b3f9e45a2b14be5dd4a9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Sep 8 18:13:20 2012 +0200
libpng: convert to gbuild
Change-Id: I68d8eb5ee481c893ca1ddecf891db66bef5b03f2
diff --git a/Makefile.top b/Makefile.top
index 132e035..e653a28 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -89,6 +89,7 @@ l10ntools\
libcdr\
libcmis\
libmspub\
+libpng\
libvisio\
libwpd\
libwpg\
@@ -215,7 +216,6 @@ libexttextcat\
libgsf\
liblangtag\
liborcus\
-libpng\
librsvg\
libxml2\
libxmlsec\
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b61de4b..420332a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1325,12 +1325,12 @@ endef
else # !SYSTEM_LIBPNG
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
png \
))
define gb_LinkTarget__use_png
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
png \
)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index e110653..6f2e86c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
libcdr \
libcmis \
libmspub \
+ libpng \
libvisio \
libwpd \
libwpg \
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index b107635..5827e76 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL
+lcairo cairo : ZLIB:zlib libpng soltools NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL
diff --git a/config_host.mk.in b/config_host.mk.in
index 21dc375..d7e0440 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -434,6 +434,7 @@ export PERL=@PERL@
export PKGFORMAT=@PKGFORMAT@
export PKGMK=@PKGMK@
export PKG_CONFIG=@PKG_CONFIG@
+export PNG_TARBALL=@PNG_TARBALL@
export POPPLER_CFLAGS=@POPPLER_CFLAGS@
export POPPLER_LIBS=@POPPLER_LIBS@
export POSTGRESQL_INC=@POSTGRESQL_INC@
diff --git a/configure.in b/configure.in
index 8d27fa9..b900cd5 100644
--- a/configure.in
+++ b/configure.in
@@ -11422,10 +11422,11 @@ if test "$with_system_libpng" = yes; then
AC_MSG_RESULT([yes])
else
SYSTEM_LIBPNG=NO
- BUILD_TYPE="$BUILD_TYPE LIBPNG"
+ PNG_TARBALL=9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
AC_MSG_RESULT([no])
fi
AC_SUBST(SYSTEM_LIBPNG)
+AC_SUBST(PNG_TARBALL)
dnl ===================================================================
dnl Check for runtime JVM search path
diff --git a/libpng/Makefile b/libpng/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libpng/Makefile
@@ -0,0 +1,7 @@
+# -*- 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:
diff --git a/libpng/Module_libpng.mk b/libpng/Module_libpng.mk
new file mode 100644
index 0000000..a3ecb7b
--- /dev/null
+++ b/libpng/Module_libpng.mk
@@ -0,0 +1,22 @@
+# -*- 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,libpng))
+
+ifeq ($(SYSTEM_LIBPNG),NO)
+
+$(eval $(call gb_Module_add_targets,libpng,\
+ Package_libpng \
+ StaticLibrary_png \
+ UnpackedTarball_png \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libpng/Package_libpng.mk b/libpng/Package_libpng.mk
new file mode 100644
index 0000000..0bda07d
--- /dev/null
+++ b/libpng/Package_libpng.mk
@@ -0,0 +1,21 @@
+# -*- 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_Package_Package,libpng_inc,$(call gb_UnpackedTarball_get_dir,png)))
+
+$(eval $(call gb_Package_use_unpacked,libpng_inc,png))
+
+$(eval $(call gb_Package_add_files,libpng_inc,inc/external/libpng,\
+ png.h \
+ pngconf.h \
+ pnglibconf.h \
+ pngstruct.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libpng/StaticLibrary_png.mk b/libpng/StaticLibrary_png.mk
new file mode 100644
index 0000000..0ed42ef
--- /dev/null
+++ b/libpng/StaticLibrary_png.mk
@@ -0,0 +1,34 @@
+# -*- 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,png))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,png,png))
+
+$(eval $(call gb_StaticLibrary_use_package,png,libpng_inc))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,png,\
+ UnpackedTarball/png/pngerror \
+ UnpackedTarball/png/pngget \
+ UnpackedTarball/png/pngmem \
+ UnpackedTarball/png/pngpread \
+ UnpackedTarball/png/pngread \
+ UnpackedTarball/png/pngrio \
+ UnpackedTarball/png/pngrtran \
+ UnpackedTarball/png/pngrutil \
+ UnpackedTarball/png/pngset \
+ UnpackedTarball/png/pngtest \
+ UnpackedTarball/png/pngtrans \
+ UnpackedTarball/png/pngwio \
+ UnpackedTarball/png/pngwrite \
+ UnpackedTarball/png/pngwtran \
+ UnpackedTarball/png/pngwutil \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libpng/UnpackedTarball_png.mk b/libpng/UnpackedTarball_png.mk
new file mode 100644
index 0000000..d2ac838
--- /dev/null
+++ b/libpng/UnpackedTarball_png.mk
@@ -0,0 +1,18 @@
+# -*- 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,png))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,png,$(PNG_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_files,png,.,\
+ libpng/configs/pnglibconf.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libpng/configs/pnglibconf.h b/libpng/configs/pnglibconf.h
new file mode 100644
index 0000000..650098e
--- /dev/null
+++ b/libpng/configs/pnglibconf.h
@@ -0,0 +1,178 @@
+/* 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
+#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
+#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
+#define PNG_READ_STRIP_16_TO_8_SUPPORTED
+/* end of options */
+#endif /* PNGLCONF_H */
diff --git a/libpng/libpng-1.5.10.patch b/libpng/libpng-1.5.10.patch
deleted file mode 100644
index 956f265..0000000
--- a/libpng/libpng-1.5.10.patch
+++ /dev/null
@@ -1,268 +0,0 @@
---- misc/libpng-1.5.10/makefile.mk 2011-03-24 21:49:50.911397154 +0100
-+++ misc/build/libpng-1.5.10/makefile.mk 2011-03-24 21:47:23.379397048 +0100
-@@ -1 +1,48 @@
--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)$/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.10/pnglibconf.h 2011-03-24 21:49:50.913397154 +0100
-+++ misc/build/libpng-1.5.10/pnglibconf.h 2011-03-24 21:47:23.380397048 +0100
-@@ -1 +1,179 @@
--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
-+#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-+#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-+#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-+/* end of options */
-+#endif /* PNGLCONF_H */
---- misc/libpng-1.5.10/pngstruct.h 2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.10/pngstruct.h 2011-03-24 21:47:23.380397048 +0100
-@@ -24,7 +24,15 @@
- * in this structure and is required for decompressing the LZ compressed
- * data in PNG files.
- */
-+/* WTF, surely this should depend explicitly on whether using the system or
-+ * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which
-+ * we use a system zlib but internal libpng, at least by default.
-+ */
-+#if defined MACOSX || defined IOS || defined ANDROID || defined LINUX
- #include "zlib.h"
-+#else
-+#include <external/zlib/zlib.h>
-+#endif
-
- struct png_struct_def
- {
---- misc/libpng-1.5.10/pngtest.c 2011-02-03 05:58:17.000000000 +0100
-+++ misc/build/libpng-1.5.10/pngtest.c 2011-03-24 21:47:23.380397048 +0100
-@@ -33,7 +33,12 @@
-
- #define _POSIX_SOURCE 1
-
-+#if defined MACOSX || defined IOS || defined ANDROID || defined LINUX
- #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
diff --git a/libpng/makefile.mk b/libpng/makefile.mk
deleted file mode 100644
index 100b9bb..0000000
--- a/libpng/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# 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=libpng
-TARGET=libpng
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_LIBPNG)" == "YES"
-all:
- @echo "An already available installation of libpng should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-LIBPNGVERSION=1.5.10
-
-TARFILE_NAME=$(PRJNAME)-$(LIBPNGVERSION)
-TARFILE_MD5=9e5d864bce8f06751bbd99962ecf4aad
-
-PATCH_FILES=$(PRJNAME)-$(LIBPNGVERSION).patch
-ADDITIONAL_FILES=makefile.mk pnglibconf.h
-
-#relative to CONFIGURE_DIR
-
-BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-
-OUT2INC=png.h pnglibconf.h pngconf.h pngstruct.h
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libpng/prj/d.lst b/libpng/prj/d.lst
index 6f59c22..e69de29 100644
--- a/libpng/prj/d.lst
+++ b/libpng/prj/d.lst
@@ -1,11 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\libpng
-
-..\%__SRC%\slb\libpng.lib %_DEST%\lib\libpng.lib
-..\%__SRC%\lib\libpng.a %_DEST%\lib\libpng.a
-
-..\%__SRC%\inc\png.h %_DEST%\inc\external\libpng\png.h
-..\%__SRC%\inc\pnglibconf.h %_DEST%\inc\external\libpng\pnglibconf.h
-..\%__SRC%\inc\pngconf.h %_DEST%\inc\external\libpng\pngconf.h
-..\%__SRC%\inc\pngstruct.h %_DEST%\inc\external\libpng\pngstruct.h
-
diff --git a/libpng/prj/dmake b/libpng/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 16b5149..af48708 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -72,7 +72,7 @@ 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
-9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
+ at PNG_TARBALL@
a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
More information about the Libreoffice-commits
mailing list