diff options
| author | Angelo Compagnucci <angelo.compagnucci@gmail.com> | 2016-04-25 23:44:31 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-10 00:36:33 +0200 |
| commit | 1d5bc00df279b52167dabba407c4cb9de7ca35c3 (patch) | |
| tree | 05d7bf9af8cdde655923664af4f99219d6ab45b5 | |
| parent | 678db6ba60a3dc6665d99383e4e6ba2efd2ca2b7 (diff) | |
| download | buildroot-1d5bc00df279b52167dabba407c4cb9de7ca35c3.tar.gz buildroot-1d5bc00df279b52167dabba407c4cb9de7ca35c3.zip | |
package/openjpeg: bump to version 2.1
This patch:
* bumps openjpeg to version 2.1
* changes download location to github
* converts the package to use cmake
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/openjpeg/openjpeg.hash | 2 | ||||
| -rw-r--r-- | package/openjpeg/openjpeg.mk | 34 |
2 files changed, 8 insertions, 28 deletions
diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index a8695c102c..35d4fbd535 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 openjpeg-1.5.2.tar.gz +sha256 4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc openjpeg-2.1.tar.gz diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index c613ba817e..bf125261a7 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,35 +4,15 @@ # ################################################################################ -OPENJPEG_VERSION = 1.5.2 -OPENJPEG_SITE = http://downloads.sourceforge.net/project/openjpeg.mirror/$(OPENJPEG_VERSION) +OPENJPEG_VERSION = 2.1 +OPENJPEG_SITE = $(call github,uclouvain,openjpeg,version.$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2c OPENJPEG_LICENSE_FILES = LICENSE -# tarball does not contain the generated files -OPENJPEG_AUTORECONF = YES OPENJPEG_INSTALL_STAGING = YES -OPENJPEG_DEPENDENCIES = host-pkgconf -OPENJPEG_CONF_OPTS = --disable-lcms1 -ifeq ($(BR2_PACKAGE_LIBPNG),y) -OPENJPEG_DEPENDENCIES += libpng -OPENJPEG_CONF_OPTS += --enable-png -else -OPENJPEG_CONF_OPTS += --disable-png -endif +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) +OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2) -ifeq ($(BR2_PACKAGE_TIFF),y) -OPENJPEG_DEPENDENCIES += tiff -OPENJPEG_CONF_OPTS += --enable-tiff -else -OPENJPEG_CONF_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -OPENJPEG_DEPENDENCIES += lcms2 -OPENJPEG_CONF_OPTS += --enable-lcms2 -else -OPENJPEG_CONF_OPTS += --disable-lcms2 -endif - -$(eval $(autotools-package)) +$(eval $(cmake-package)) |
