From f873689d316f9221b647ace15d5b69df30a71153 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aur=C3=A9lien=20Larcher?= <aurelien.larcher@gmail.com>
Date: Wed, 14 Sep 2016 01:13:03 +0200
Subject: [PATCH] Bump openjpeg to 2.1.1

---
 components/openjpeg/Makefile     | 18 +++++++++---------
 components/openjpeg/openjpeg.p5m |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/openjpeg/Makefile b/components/openjpeg/Makefile
index b33cbe589..1792416da 100644
--- a/components/openjpeg/Makefile
+++ b/components/openjpeg/Makefile
@@ -18,21 +18,20 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Aurelien Larcher. All rights reserved.
+# Copyright (c) 2013-2016, Aurelien Larcher. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openjpeg
-COMPONENT_VERSION=	2.1.0
-COMPONENT_REVISION=	2
+COMPONENT_VERSION=	2.1.1
 COMPONENT_FMRI=     	image/library/openjpeg
 COMPONENT_CLASSIFICATION=System/Libraries
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.openjpeg.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/openjpeg.mirror/files/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
+	sha256:82c27f47fc7219e2ed5537ac69545bf15ed8c6ba8e6e1e529f89f7356506dbaa
+COMPONENT_ARCHIVE_URL=	https://github.com/uclouvain/openjpeg/archive/v$(COMPONENT_VERSION).tar.gz
 COMPONENT_LICENSE=      BSD
 COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license
 COMPONENT_SUMMARY=      OpenJPEG library : Open source JPEG 2000 codecs
@@ -41,6 +40,9 @@ include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/cmake.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+CFLAGS+= -std=c99 -D_XOPEN_SOURCE=600
+CFLAGS+= $(CPP_LARGEFILES)
+
 CMAKE_OPTIONS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket"
 # Openjpeg does not use CMake's internal variables.
 CMAKE_OPTIONS+=	-DOPENJPEG_INSTALL_BIN_DIR=$(CMAKE_BINDIR.$(BITS))
@@ -63,7 +65,5 @@ install: $(INSTALL_32_and_64)
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =    $(BUILD_TOOLS)
-
-include $(WS_MAKE_RULES)/depend.mk
-
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
diff --git a/components/openjpeg/openjpeg.p5m b/components/openjpeg/openjpeg.p5m
index 4e7d7d058..dd5177625 100644
--- a/components/openjpeg/openjpeg.p5m
+++ b/components/openjpeg/openjpeg.p5m
@@ -1,10 +1,11 @@
 #
 # This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"). You may
-# only use this file in accordance with the terms of the CDDL.
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
 #
 # A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
+# source.  A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
 
-- 
2.11.4.GIT