25126076 Upgrade openjpeg to 2.1.2
authorSwaroop M S <swaroop.sadare@oracle.com>
Sat, 10 Dec 2016 12:30:59 -0800
changeset 7477 8032dcc67e07
parent 7476 c2f56b2bf427
child 7478 1f0889220ac6
25126076 Upgrade openjpeg to 2.1.2 22561792 problem in LIBRARY/OPENJPEG 24617427 problem in LIBRARY/OPENJPEG 24685414 problem in LIBRARY/OPENJPEG
components/desktop/openjpeg/Makefile
components/desktop/openjpeg/openjpeg.license
--- a/components/desktop/openjpeg/Makefile	Sat Dec 10 10:24:47 2016 -0800
+++ b/components/desktop/openjpeg/Makefile	Sat Dec 10 12:30:59 2016 -0800
@@ -27,16 +27,15 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openjpeg
-COMPONENT_VERSION=	2.1.0
+COMPONENT_VERSION=	2.1.2
 COMPONENT_PROJECT_URL=	http://www.openjpeg.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)-version.2.1
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc
-COMPONENT_ARCHIVE_URL=	https://github.com/uclouvain/$(COMPONENT_NAME)/archive/version.2.1.tar.gz
+    sha256:4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7
+COMPONENT_ARCHIVE_URL=	https://github.com/uclouvain/$(COMPONENT_NAME)/archive/v$(COMPONENT_VERSION).tar.gz
 COMPONENT_BUGDB=	library/openjpeg
 
-TPNO=			18449
+TPNO=			32786
 
 BUILD_STYLE = cmake
 
@@ -45,6 +44,8 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+studio_C99MODE=$(studio_C99_ENABLE)
+
 # Workaround non-standard type usage in big endian builds.
 CFLAGS.studio.sparc += -Du_int16_t=uint16_t
 
--- a/components/desktop/openjpeg/openjpeg.license	Sat Dec 10 10:24:47 2016 -0800
+++ b/components/desktop/openjpeg/openjpeg.license	Sat Dec 10 12:30:59 2016 -0800
@@ -13,7 +13,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France 
  * Copyright (c) 2012, CS Systemes d'Information, France
- * Copyright (c) 2011, Mathieu Malaterre <[email protected]>
+ * Copyright (c) 2006-2014, Mathieu Malaterre <[email protected]>
  * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <[email protected]>
  * Copyright (c) 2006-2007, Parvatha Elangovan
  * Copyright (c) 2010-2011, Kaori Hagihara
@@ -122,6 +122,3 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-
-
-