Packages: libpng: add libpng-1.2.{41,42} and libpng-1.4.2

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

2 files changed, 56 insertions, 34 deletions

diff --git a/packages/graphics/libpng/libpng.kconfig b/packages/graphics/libpng/libpng.kconfig
index bbdee09..912799a 100644
--- a/packages/graphics/libpng/libpng.kconfig
+++ b/packages/graphics/libpng/libpng.kconfig
@@ -1,29 +1,31 @@
 ################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         libpng.kconfig
 # \brief	libpng.kconfig of Embtoolkit
-# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         October 2009
 ################################################################################
 
 config EMBTK_HAVE_LIBPNG
 	bool "Have libpng"
+	select EMBTK_HAVE_ZLIB_TARGET
 	help
 	 libpng is the reference library for use in applications that read,
 	 create, and manipulate PNG (Portable Network Graphics) raster image
@@ -31,16 +33,24 @@ config EMBTK_HAVE_LIBPNG
 
 choice
 	prompt "libpng version you wish"
-	default EMBTK_LIBPNG_VERSION_1_2_40
 	depends on EMBTK_HAVE_LIBPNG
 	help
 	 Here you can choose which version of libpng you want to use.
 
+	config  EMBTK_LIBPNG_VERSION_1_4_2
+		bool "libpng-1.4.2"
+	config  EMBTK_LIBPNG_VERSION_1_2_42
+		bool "libpng-1.2.42"
+	config  EMBTK_LIBPNG_VERSION_1_2_41
+		bool "libpng-1.2.41"
 	config  EMBTK_LIBPNG_VERSION_1_2_40
 		bool "libpng-1.2.40"
 endchoice
 
 config EMBTK_LIBPNG_VERSION_STRING
 	string
+	default "1.4.2"		if EMBTK_LIBPNG_VERSION_1_4_2
+	default "1.2.42"	if EMBTK_LIBPNG_VERSION_1_2_42
+	default "1.2.41"	if EMBTK_LIBPNG_VERSION_1_2_41
 	default "1.2.40"	if EMBTK_LIBPNG_VERSION_1_2_40
 
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index b3881d0..1595e53 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -1,24 +1,25 @@
 ################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
+# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         libpng.mk
 # \brief	libpng.mk of Embtoolkit
-# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \author       Abdoulaye Walsimou GAYE <awg@embtoolkit.org>
 # \date         October 2009
 ################################################################################
 
@@ -61,7 +62,22 @@ $(LIBPNG_BUILD_DIR)/.decompressed:
 
 $(LIBPNG_BUILD_DIR)/.configured:
 	cd $(LIBPNG_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
+	CC=$(TARGETCC_CACHED) \
+	CXX=$(TARGETCXX_CACHED) \
+	AR=$(TARGETAR) \
+	RANLIB=$(TARGETRANLIB) \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(TARGETLD) \
+	NM=$(TARGETNM) \
+	STRIP=$(TARGETSTRIP) \
+	OBJDUMP=$(TARGETOBJDUMP) \
+	OBJCOPY=$(TARGETOBJCOPY) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
+	CPPFLGAS="-I$(SYSROOT)/usr/include" \
+	PKG_CONFIG=$(PKGCONFIG_BIN) \
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
 	--prefix=/usr --enable-static=no --with-libpng-compat=no \
 	--libdir=/usr/$(LIBDIR)
@@ -80,10 +96,6 @@ libpng_clean:
 	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBPNG_BINS)
 	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBPNG_SBINS)
 	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBPNG_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(LIBPNG_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS)
-ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
-	$(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(LIBPNG_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS)
-endif
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBPNG_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS)