~olbohlen/oi-userland.git

parent: 4becb3e4 | patch | commit | ignore whitespace

update libmng to 2.0.3 and build with libjpeg8

Tim Mooney

2019-06-03 a03e31f6f75c41ce405d875fa0bc703209a02eb6

update libmng to 2.0.3 and build with libjpeg8

4 files deleted

1 files added

3 files modified

	components/library/libmng/Makefile	29 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/Solaris/libmng-64.pc	10 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/Solaris/libmng.pc	10 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/libmng.p5m	17 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/manifests/sample-manifest.p5m	16 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/patches/01_configure.ac.version.patch	12 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/patches/automake-1.15.patch	10 ●●●●● patch \| view \| raw \| blame \| history
	components/library/libmng/patches/support-lcms2.patch	182 ●●●●● patch \| view \| raw \| blame \| history

 components/library/libmng/Makefile

@@ -11,15 +11,15 @@
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# Copyright 2018 Harry Liebel <hliebel@gmail.com>
# Copyright 2019 Tim Mooney <Timothy.V.Mooney@gmail.com>
#

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        libmng
COMPONENT_VERSION=    1.0.10
COMPONENT_REVISION=    3
COMPONENT_VERSION=    2.0.3
COMPONENT_FMRI=        library/graphics/libmng
COMPONENT_PROJECT_URL=    http://www.libpng.org/pub/mng
COMPONENT_PROJECT_URL=    https://sourceforge.net/projects/libmng/
COMPONENT_SUMMARY=    The Multiple Image Network Graphics Library
COMPONENT_DESCRIPTION=    A PNG-like image format library supporting multiple images, animations and transparent JPEG.
COMPONENT_LICENSE=    MNG License (BSD-like)
@@ -28,7 +28,7 @@
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:03a79dac9b9316d37227057614a248a946f997c4d1a3437fb569e9a63897f911
    sha256:cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa
COMPONENT_ARCHIVE_URL=    http://sourceforge.net/projects/libmng/files/libmng-devel/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_1 =    mng-1.0-20010209-pdg.html
COMPONENT_ARCHIVE_HASH_1 = \
@@ -61,6 +61,11 @@
# because it's unclear that --enable-largefile works properly
CFLAGS += $(CPP_LARGEFILES)

# build with the distribution default libjpeg
CFLAGS            +=    $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
CXXFLAGS          +=    $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
LDFLAGS           +=    $(JPEG_LDFLAGS)

CONFIGURE_OPTIONS += --includedir=/usr/include/libmng
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --with-pic
@@ -75,31 +80,25 @@
CONFIGURE_OPTIONS += --enable-dynamic 
CONFIGURE_OPTIONS += --enable-chunks 
CONFIGURE_OPTIONS += --enable-storechunks 
CONFIGURE_OPTIONS += --with-lcms
CONFIGURE_OPTIONS += --with-lcms2
CONFIGURE_OPTIONS += --with-zlib
CONFIGURE_OPTIONS += --with-jpeg

# distclean target was not run before the tarball was generated
COMPONENT_PREP_ACTION = \
    ( cd $(@D) ; \
        $(CP) makefiles/configure.in makefiles/Makefile.am . ; \
            libtoolize --force --copy ; aclocal ; \
            automake --add-missing --copy ; autoconf )
    ( cd $(@D) ; rm -f config.log config.status libmng.pc ; ./bootstrap.sh )

PKG_PROTO_DIRS += $(USERLAND_ARCHIVES)

$(BUILD_DIR)/libmng-64.pc:    Solaris/libmng-64.pc
    /bin/sed -e "s#MACH64#$(MACH64)#g" <$< >$@

# common targets
build:        $(BUILD_32_and_64)

install:    $(INSTALL_32_and_64) $(BUILD_DIR)/libmng-64.pc
install:    $(INSTALL_32_and_64)

test:    $(NO_TESTS)

# Auto-generated dependencies
REQUIRED_PACKAGES += image/library/libjpeg6
REQUIRED_PACKAGES += image/library/libjpeg6-ijg
REQUIRED_PACKAGES += image/library/$(JPEG_IMPLEM)
REQUIRED_PACKAGES += library/lcms2
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library

 components/library/libmng/Solaris/libmng-64.pc

File was deleted

 components/library/libmng/Solaris/libmng.pc

File was deleted

 components/library/libmng/libmng.p5m

@@ -12,6 +12,7 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright 2018 Harry Liebel <hliebel@gmail.com>
# Copyright 2019 Tim Mooney
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,8 +25,6 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file Solaris/libmng.pc path=usr/lib/pkgconfig/libmng.pc
file libmng-64.pc path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
file doc/Plan1.png path=usr/share/doc/libmng/html/Plan1.png
file doc/Plan2.png path=usr/share/doc/libmng/html/Plan2.png
file index.html path=usr/share/doc/libmng/html/index.html
@@ -37,12 +36,14 @@
file path=usr/include/libmng/libmng.h
file path=usr/include/libmng/libmng_conf.h
file path=usr/include/libmng/libmng_types.h
link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0
link path=usr/lib/$(MACH64)/libmng.so.1 target=libmng.so.1.0.0
file path=usr/lib/$(MACH64)/libmng.so.1.0.0
link path=usr/lib/libmng.so target=libmng.so.1.0.0
link path=usr/lib/libmng.so.1 target=libmng.so.1.0.0
file path=usr/lib/libmng.so.1.0.0
link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.2.0.3
link path=usr/lib/$(MACH64)/libmng.so.2 target=libmng.so.2.0.3
file path=usr/lib/$(MACH64)/libmng.so.2.0.3
file path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
link path=usr/lib/libmng.so target=libmng.so.2.0.3
link path=usr/lib/libmng.so.2 target=libmng.so.2.0.3
file path=usr/lib/libmng.so.2.0.3
file path=usr/lib/pkgconfig/libmng.pc
file path=usr/share/man/man3/libmng.3
file path=usr/share/man/man5/jng.5
file path=usr/share/man/man5/mng.5

 components/library/libmng/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2016 <contributor>
# Copyright 2018 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -25,12 +25,14 @@
file path=usr/include/libmng/libmng.h
file path=usr/include/libmng/libmng_conf.h
file path=usr/include/libmng/libmng_types.h
link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0
link path=usr/lib/$(MACH64)/libmng.so.1 target=libmng.so.1.0.0
file path=usr/lib/$(MACH64)/libmng.so.1.0.0
link path=usr/lib/libmng.so target=libmng.so.1.0.0
link path=usr/lib/libmng.so.1 target=libmng.so.1.0.0
file path=usr/lib/libmng.so.1.0.0
link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.2.0.2
link path=usr/lib/$(MACH64)/libmng.so.2 target=libmng.so.2.0.2
file path=usr/lib/$(MACH64)/libmng.so.2.0.2
file path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
link path=usr/lib/libmng.so target=libmng.so.2.0.2
link path=usr/lib/libmng.so.2 target=libmng.so.2.0.2
file path=usr/lib/libmng.so.2.0.2
file path=usr/lib/pkgconfig/libmng.pc
file path=usr/share/man/man3/libmng.3
file path=usr/share/man/man5/jng.5
file path=usr/share/man/man5/mng.5

 components/library/libmng/patches/01_configure.ac.version.patch

New file
@@ -0,0 +1,12 @@
diff -ur libmng-2.0.3.orig/configure.ac libmng-2.0.3/configure.ac
--- libmng-2.0.3.orig/configure.ac    2013-03-05 05:59:27.000000000 +0000
+++ libmng-2.0.3/configure.ac    2019-05-30 16:48:07.511714702 +0000
@@ -3,7 +3,7 @@
 #
 define([MAJ_NR],[2])
 define([MIN_NR],[0])
-define([REL_NR],[2])
+define([REL_NR],[3])
 #
 #AC_INIT (PACKAGE, VERSION, [BUG-REPORT], [TARNAME], [URL])
 AC_INIT( [libmng],[MAJ_NR.MIN_NR.REL_NR],

 components/library/libmng/patches/automake-1.15.patch

File was deleted

 components/library/libmng/patches/support-lcms2.patch

File was deleted

			@@ -11,15 +11,15 @@
			#
			# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
			# Copyright 2018 Harry Liebel <hliebel@gmail.com>
			# Copyright 2019 Tim Mooney <Timothy.V.Mooney@gmail.com>
			#

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= libmng
			COMPONENT_VERSION= 1.0.10
			COMPONENT_REVISION= 3
			COMPONENT_VERSION= 2.0.3
			COMPONENT_FMRI= library/graphics/libmng
			COMPONENT_PROJECT_URL= http://www.libpng.org/pub/mng
			COMPONENT_PROJECT_URL= https://sourceforge.net/projects/libmng/
			COMPONENT_SUMMARY= The Multiple Image Network Graphics Library
			COMPONENT_DESCRIPTION= A PNG-like image format library supporting multiple images, animations and transparent JPEG.
			COMPONENT_LICENSE= MNG License (BSD-like)
			@@ -28,7 +28,7 @@
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:03a79dac9b9316d37227057614a248a946f997c4d1a3437fb569e9a63897f911
			sha256:cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa
			COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/libmng/files/libmng-devel/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
			COMPONENT_ARCHIVE_1 = mng-1.0-20010209-pdg.html
			COMPONENT_ARCHIVE_HASH_1 = \
			@@ -61,6 +61,11 @@
			# because it's unclear that --enable-largefile works properly
			CFLAGS += $(CPP_LARGEFILES)

			# build with the distribution default libjpeg
			CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
			CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
			LDFLAGS += $(JPEG_LDFLAGS)

			CONFIGURE_OPTIONS += --includedir=/usr/include/libmng
			CONFIGURE_OPTIONS += --disable-static
			CONFIGURE_OPTIONS += --with-pic
			@@ -75,31 +80,25 @@
			CONFIGURE_OPTIONS += --enable-dynamic
			CONFIGURE_OPTIONS += --enable-chunks
			CONFIGURE_OPTIONS += --enable-storechunks
			CONFIGURE_OPTIONS += --with-lcms
			CONFIGURE_OPTIONS += --with-lcms2
			CONFIGURE_OPTIONS += --with-zlib
			CONFIGURE_OPTIONS += --with-jpeg

			# distclean target was not run before the tarball was generated
			COMPONENT_PREP_ACTION = \
			( cd $(@D) ; \
			$(CP) makefiles/configure.in makefiles/Makefile.am . ; \
			libtoolize --force --copy ; aclocal ; \
			automake --add-missing --copy ; autoconf )
			( cd $(@D) ; rm -f config.log config.status libmng.pc ; ./bootstrap.sh )

			PKG_PROTO_DIRS += $(USERLAND_ARCHIVES)

			$(BUILD_DIR)/libmng-64.pc: Solaris/libmng-64.pc
			/bin/sed -e "s#MACH64#$(MACH64)#g" <$< >$@

			# common targets
			build: $(BUILD_32_and_64)

			install: $(INSTALL_32_and_64) $(BUILD_DIR)/libmng-64.pc
			install: $(INSTALL_32_and_64)

			test: $(NO_TESTS)

			# Auto-generated dependencies
			REQUIRED_PACKAGES += image/library/libjpeg6
			REQUIRED_PACKAGES += image/library/libjpeg6-ijg
			REQUIRED_PACKAGES += image/library/$(JPEG_IMPLEM)
			REQUIRED_PACKAGES += library/lcms2
			REQUIRED_PACKAGES += library/zlib
			REQUIRED_PACKAGES += system/library

			@@ -12,6 +12,7 @@
			#
			# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
			# Copyright 2018 Harry Liebel <hliebel@gmail.com>
			# Copyright 2019 Tim Mooney
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -24,8 +25,6 @@

			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file Solaris/libmng.pc path=usr/lib/pkgconfig/libmng.pc
			file libmng-64.pc path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
			file doc/Plan1.png path=usr/share/doc/libmng/html/Plan1.png
			file doc/Plan2.png path=usr/share/doc/libmng/html/Plan2.png
			file index.html path=usr/share/doc/libmng/html/index.html
			@@ -37,12 +36,14 @@
			file path=usr/include/libmng/libmng.h
			file path=usr/include/libmng/libmng_conf.h
			file path=usr/include/libmng/libmng_types.h
			link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0
			link path=usr/lib/$(MACH64)/libmng.so.1 target=libmng.so.1.0.0
			file path=usr/lib/$(MACH64)/libmng.so.1.0.0
			link path=usr/lib/libmng.so target=libmng.so.1.0.0
			link path=usr/lib/libmng.so.1 target=libmng.so.1.0.0
			file path=usr/lib/libmng.so.1.0.0
			link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.2.0.3
			link path=usr/lib/$(MACH64)/libmng.so.2 target=libmng.so.2.0.3
			file path=usr/lib/$(MACH64)/libmng.so.2.0.3
			file path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
			link path=usr/lib/libmng.so target=libmng.so.2.0.3
			link path=usr/lib/libmng.so.2 target=libmng.so.2.0.3
			file path=usr/lib/libmng.so.2.0.3
			file path=usr/lib/pkgconfig/libmng.pc
			file path=usr/share/man/man3/libmng.3
			file path=usr/share/man/man5/jng.5
			file path=usr/share/man/man5/mng.5

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2016 <contributor>
			# Copyright 2018 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -25,12 +25,14 @@
			file path=usr/include/libmng/libmng.h
			file path=usr/include/libmng/libmng_conf.h
			file path=usr/include/libmng/libmng_types.h
			link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0
			link path=usr/lib/$(MACH64)/libmng.so.1 target=libmng.so.1.0.0
			file path=usr/lib/$(MACH64)/libmng.so.1.0.0
			link path=usr/lib/libmng.so target=libmng.so.1.0.0
			link path=usr/lib/libmng.so.1 target=libmng.so.1.0.0
			file path=usr/lib/libmng.so.1.0.0
			link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.2.0.2
			link path=usr/lib/$(MACH64)/libmng.so.2 target=libmng.so.2.0.2
			file path=usr/lib/$(MACH64)/libmng.so.2.0.2
			file path=usr/lib/$(MACH64)/pkgconfig/libmng.pc
			link path=usr/lib/libmng.so target=libmng.so.2.0.2
			link path=usr/lib/libmng.so.2 target=libmng.so.2.0.2
			file path=usr/lib/libmng.so.2.0.2
			file path=usr/lib/pkgconfig/libmng.pc
			file path=usr/share/man/man3/libmng.3
			file path=usr/share/man/man5/jng.5
			file path=usr/share/man/man5/mng.5

New file
			@@ -0,0 +1,12 @@
			diff -ur libmng-2.0.3.orig/configure.ac libmng-2.0.3/configure.ac
			--- libmng-2.0.3.orig/configure.ac 2013-03-05 05:59:27.000000000 +0000
			+++ libmng-2.0.3/configure.ac 2019-05-30 16:48:07.511714702 +0000
			@@ -3,7 +3,7 @@
			#
			define([MAJ_NR],[2])
			define([MIN_NR],[0])
			-define([REL_NR],[2])
			+define([REL_NR],[3])
			#
			#AC_INIT (PACKAGE, VERSION, [BUG-REPORT], [TARNAME], [URL])
			AC_INIT( [libmng],[MAJ_NR.MIN_NR.REL_NR],