Upgrade to libmng-2.0.2

diff --git a/config/packages-list b/config/packages-list
index 057b3c1..1305517 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -229,7 +229,7 @@ LIBGSF="libgsf-1.14.30"
 LIBID3TAG="libid3tag-0.15.1b"
 LIBJPEG="libjpeg-turbo-1.3.0"
 LIBMAD="libmad-0.15.1b"
-LIBMNG="libmng-1.0.10"
+LIBMNG="libmng-2.0.2"
 LIBNL="libnl-3.2.22"
 LIBNOTIFY="libnotify-0.5.2"
 LIBOGG="libogg-1.3.0"

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index dbb08c9..6999f74 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -140,7 +140,7 @@ ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
 ipkg ${GIFLIB}
-ipkg -m noac ${LIBMNG}
+ipkg -m acnb ${LIBMNG} "--disable-static"
 
 ipkg ${FREETYPE} "--disable-static"
 ipkg ${FONTCONFIG}

diff --git a/stage3/patches/common/libmng-2.0.2-fix-headers.patch b/stage3/patches/common/libmng-2.0.2-fix-headers.patch
new file mode 100644 (file)
index 0000000..99cbe86
--- /dev/null
+++ b/stage3/patches/common/libmng-2.0.2-fix-headers.patch
@@ -0,0 +1,11 @@
+diff -Naur libmng-2.0.2.orig/libmng_types.h libmng-2.0.2.new/libmng_types.h
+--- libmng-2.0.2.orig/libmng_types.h   2013-01-19 22:45:24.000000000 -0500
++++ libmng-2.0.2.new/libmng_types.h    2014-12-23 13:02:47.602116005 -0500
+@@ -204,6 +204,7 @@
+ #define HAVE_BOOLEAN
+ typedef int boolean;
+ #endif
++#include <stdio.h>
+ #include <jpeglib.h>
+ #endif /* MNG_INCLUDE_IJG6B */
+ 

diff --git a/stage3/pkg/libmng b/stage3/pkg/libmng
deleted file mode 100644 (file)
index a904ef4..0000000
--- a/stage3/pkg/libmng
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-hvbuild()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    cp makefiles/makefile.linux Makefile
-
-    case "${HVL_TARGET}" in
-        "x86_64")
-            # -fPIC is required for x86_64
-            sed -i -e "s!^CFLAGS=!CFLAGS=-fPIC !" Makefile
-            ;;
-    esac
-
-    make prefix=/usr install
-
-    # The documentation files are not installed by the installation procedure,
-    # so they are copied manually.
-    install -v -m644 doc/man/*.3 /usr/share/man/man3
-    install -v -m644 doc/man/*.5 /usr/share/man/man5
-    install -v -m755 -d /usr/share/doc/${PACKAGE}
-    install -v -m644 doc/*.{png,txt} /usr/share/doc/${PACKAGE}
-}