diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-09-30 22:01:49 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-09-30 22:01:49 (GMT) |
| commit | 104095662ad12c8fec932dd8c757ca572f057c1d (patch) | |
| tree | 517ee4b77d8b4568ffd1bd3eb869400a930e123f | |
| parent | 6aeba291610be679e39473dba55462f7cef9432d (diff) | |
| download | mxe-104095662ad12c8fec932dd8c757ca572f057c1d.zip mxe-104095662ad12c8fec932dd8c757ca572f057c1d.tar.gz mxe-104095662ad12c8fec932dd8c757ca572f057c1d.tar.bz2 | |
update: jasper
| -rw-r--r-- | src/jasper-1-fixes.patch | 34 | ||||
| -rw-r--r-- | src/jasper.mk | 4 |
2 files changed, 2 insertions, 36 deletions
diff --git a/src/jasper-1-fixes.patch b/src/jasper-1-fixes.patch deleted file mode 100644 index 13065ed..0000000 --- a/src/jasper-1-fixes.patch +++ /dev/null @@ -1,34 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Thu, 20 Jul 2017 12:28:06 +1000 -Subject: [PATCH] add option to disable programs - -taken from: https://github.com/mdadams/jasper/pull/144 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,6 +91,7 @@ option(JAS_ENABLE_STRICT "Enable pedantic error checking" false) - option(JAS_ENABLE_AUTOMATIC_DEPENDENCIES "Enable automatic dependencies" true) - option(JAS_LOCAL "Enable local hacks for developers (do not enable)" false) - option(JAS_ENABLE_DOC "Enable building of the documentation" true) -+option(JAS_ENABLE_PROGRAMS "Enable building of the programs" true) - - ################################################################################ - # -@@ -368,7 +369,9 @@ endif() - ################################################################################ - - add_subdirectory(src/libjasper) --add_subdirectory(src/appl) -+if (JAS_ENABLE_PROGRAMS) -+ add_subdirectory(src/appl) -+endif () - if (JAS_ENABLE_DOC) - add_subdirectory(doc) - endif () diff --git a/src/jasper.mk b/src/jasper.mk index 05d94ec..71c4d8b 100644 --- a/src/jasper.mk +++ b/src/jasper.mk @@ -4,8 +4,8 @@ PKG := jasper $(PKG)_WEBSITE := https://www.ece.uvic.ca/~mdadams/jasper/ $(PKG)_DESCR := JasPer $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.13 -$(PKG)_CHECKSUM := b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24 +$(PKG)_VERSION := 2.0.14 +$(PKG)_CHECKSUM := 85266eea728f8b14365db9eaf1edc7be4c348704e562bb05095b9a077cf1a97b $(PKG)_GH_CONF := mdadams/jasper, version- $(PKG)_DEPS := gcc jpeg |