diff mbox

libmng: new package

Message ID 1443105404-30913-1-git-send-email-gustavo.zacarias@free-electrons.com
State Accepted
Commit 0ce9b533e300c71bfa4d7cd77d33e5c07b0a2c7f
Headers show

Commit Message

gustavo.zacarias@free-electrons.com Sept. 24, 2015, 2:36 p.m. UTC 
From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>

Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
---
 package/Config.in                 |  1 +
 package/libmng/0001-jpeg-9a.patch | 22 ++++++++++++++++++++++
 package/libmng/Config.in          |  9 +++++++++
 package/libmng/libmng.hash        |  3 +++
 package/libmng/libmng.mk          | 22 ++++++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 package/libmng/0001-jpeg-9a.patch
 create mode 100644 package/libmng/Config.in
 create mode 100644 package/libmng/libmng.hash
 create mode 100644 package/libmng/libmng.mk

Comments

Vicente Olivert Riera Sept. 24, 2015, 4:22 p.m. UTC | #1 
Dear Gustavo Zacarias,

On 09/24/2015 03:36 PM, gustavo.zacarias@free-electrons.com wrote:
> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
> 
> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Build test for MIPS architecture:

$ file output/target/usr/lib/libmng.so.2.0.2
output/target/usr/lib/libmng.so.2.0.2: ELF 64-bit LSB shared object,
MIPS, MIPS64 rel2 version 1 (SYSV), dynamically linked, with unknown
capability 0x756e670000000f41 = 0x104000000070100, stripped

One nit-pick comment below; please scroll down.

[snip]

> diff --git a/package/libmng/Config.in b/package/libmng/Config.in
> new file mode 100644
> index 0000000..a0bd59c
> --- /dev/null
> +++ b/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.

"examining" could be in the first line as it wouldn't exceed the 72
characters limit.

Regards,

Vincent.

[snip]
Peter Korsgaard Sept. 24, 2015, 9:54 p.m. UTC | #2 
>>>>> "gustavo" == gustavo zacarias <gustavo.zacarias@free-electrons.com> writes:

 > From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
 > Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>

Committed, thanks.
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 1eacae5..4b03abf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -826,6 +826,7 @@  menu "Graphics"
 	source "package/libglu/Config.in"
 	source "package/libgtk2/Config.in"
 	source "package/libgtk3/Config.in"
+	source "package/libmng/Config.in"
 	source "package/libpng/Config.in"
 	source "package/libqrencode/Config.in"
 	source "package/libraw/Config.in"
diff --git a/package/libmng/0001-jpeg-9a.patch b/package/libmng/0001-jpeg-9a.patch
new file mode 100644
index 0000000..2b643d6
--- /dev/null
+++ b/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>
diff --git a/package/libmng/Config.in b/package/libmng/Config.in
new file mode 100644
index 0000000..a0bd59c
--- /dev/null
+++ b/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/
diff --git a/package/libmng/libmng.hash b/package/libmng/libmng.hash
new file mode 100644
index 0000000..a695cc3
--- /dev/null
+++ b/package/libmng/libmng.hash
@@ -0,0 +1,3 @@ 
+# 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
diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk
new file mode 100644
index 0000000..090fe18
--- /dev/null
+++ b/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))