Merge from bittboy/buildroot@db180c0

package/libmng/0001-jpeg-9a.patch

@@ -0,0 +1,22 @@
+Adaptation from gentoo patch for libmng 2.0.3
+See https://bugs.gentoo.org/show_bug.cgi?id=520906
+
+Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
+
+diff -Nura libmng-2.0.3.orig/libmng_types.h libmng-2.0.3/libmng_types.h
+--- libmng-2.0.3.orig/libmng_types.h	2015-09-24 10:32:05.500984924 -0300
++++ libmng-2.0.3/libmng_types.h	2015-09-24 10:33:11.145254771 -0300
+@@ -200,13 +200,6 @@
+ #undef FAR                             /* possibly defined by zlib or lcms */
+ #endif
+ #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
+-/* There has been a change in jpeg-9 : */
+-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
+-#define HAVE_BOOLEAN
+-#endif
+-#ifndef _WIN32
+-typedef int boolean;
+-#endif
+ /* For jpegsrc.v09a: */
+ #include <stdio.h>
+ #include <jpeglib.h>

package/libmng/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBMNG
+	bool "libmng"
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_ZLIB
+	help
+	  The reference library for reading, displaying, writing and
+	  examining Multiple-Image Network Graphics.
+
+	  http://sourceforge.net/projects/libmng/

package/libmng/libmng.hash

@@ -0,0 +1,6 @@
+# From http://sourceforge.net/projects/libmng/files/libmng-devel/2.0.3/
+md5	e9e899adb1b681b17f14d91e261878c5	libmng-2.0.3.tar.xz
+sha1	0f141482ffcef6f8cd4413f945a59310ac2e49af	libmng-2.0.3.tar.xz
+
+# Hash for license file:
+sha256	ba280734838eb3f22a85b92a7e62de357d4d4c325029dce723b0cb125c417c35	LICENSE

package/libmng/libmng.mk

@@ -0,0 +1,22 @@
+################################################################################
+#
+# libmng
+#
+################################################################################
+
+LIBMNG_VERSION = 2.0.3
+LIBMNG_SITE = http://downloads.sourceforge.net/project/libmng/libmng-devel/$(LIBMNG_VERSION)
+LIBMNG_SOURCE = libmng-$(LIBMNG_VERSION).tar.xz
+LIBMNG_DEPENDENCIES = jpeg zlib
+LIBMNG_CONF_OPTS = --without-lcms
+LIBMNG_INSTALL_STAGING = YES
+LIBMNG_LICENSE = libmng license
+LIBMNG_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+LIBMNG_DEPDENDENCIES += lcms2
+else
+LIBMNG_CONF_OPTS += --without-lcms2
+endif
+
+$(eval $(autotools-package))