From acb344645b47dd1e9fb71c5b8bfa4d88d19b4f72 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 26 Aug 2017 01:17:17 +0200 Subject: [PATCH] update: libjpeg-turbo, openjpeg --- src/libjpeg-turbo.mk | 4 ++-- src/openjpeg-1-dllfix.patch | 15 --------------- src/openjpeg-1.patch | 25 +++++++++++++++++++++++++ src/openjpeg-2-dllmacro.patch | 15 --------------- src/openjpeg.mk | 18 +++++++++--------- 5 files changed, 36 insertions(+), 41 deletions(-) delete mode 100644 src/openjpeg-1-dllfix.patch create mode 100644 src/openjpeg-1.patch delete mode 100644 src/openjpeg-2-dllmacro.patch diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index c473365a..0b5c1a81 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -3,8 +3,8 @@ PKG := libjpeg-turbo $(PKG)_WEBSITE := http://libjpeg-turbo.virtualgl.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.1 -$(PKG)_CHECKSUM := 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c +$(PKG)_VERSION := 1.5.2 +$(PKG)_CHECKSUM := 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/openjpeg-1-dllfix.patch b/src/openjpeg-1-dllfix.patch deleted file mode 100644 index d9ee235b..00000000 --- a/src/openjpeg-1-dllfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. -#Author: Julien Michel - -diff -bur openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.c openjpeg-2.0.1/src/lib/openjp2/openjpeg.c ---- openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.c 2014-10-15 10:56:09.435396565 +0530 -+++ openjpeg-2.0.1/src/lib/openjp2/openjpeg.c 2014-10-15 10:57:18.038964950 +0530 -@@ -132,7 +132,7 @@ - #ifdef _WIN32 - #ifndef OPJ_STATIC - BOOL APIENTRY --DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { -+DllMain(HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { - - OPJ_ARG_NOT_USED(lpReserved); - OPJ_ARG_NOT_USED(hModule); diff --git a/src/openjpeg-1.patch b/src/openjpeg-1.patch new file mode 100644 index 00000000..1cbfc636 --- /dev/null +++ b/src/openjpeg-1.patch @@ -0,0 +1,25 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +From 2e44887c114a4c6fb92a65f5505c8cf4cc452b8c Mon Sep 17 00:00:00 2001 +From: Julien Michel +Date: Sat, 26 Aug 2017 01:13:50 +0200 +Subject: [PATCH] dllmacro + + +diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h +index d571c516..d12f1c36 100644 +--- a/src/lib/openjp2/openjpeg.h ++++ b/src/lib/openjp2/openjpeg.h +@@ -76,7 +76,8 @@ Most compilers implement their own version of this keyword ... + #define OPJ_DEPRECATED(func) func + #endif + +-#if defined(OPJ_STATIC) || !defined(_WIN32) ++ ++#if defined(OPJ_STATIC) || defined(__MINGW32__) || !defined(_WIN32) + /* http://gcc.gnu.org/wiki/Visibility */ + # if __GNUC__ >= 4 + # if defined(OPJ_STATIC) /* static library uses "hidden" */ +-- +2.11.0 + diff --git a/src/openjpeg-2-dllmacro.patch b/src/openjpeg-2-dllmacro.patch deleted file mode 100644 index 68a144f2..00000000 --- a/src/openjpeg-2-dllmacro.patch +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. -#Author: Julien Michel -diff -bur openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.h openjpeg-2.0.1.diff/src/lib/openjp2/openjpeg.h ---- openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.h 2014-04-22 13:24:20.000000000 +0530 -+++ openjpeg-2.0.1.diff/src/lib/openjp2/openjpeg.h 2014-10-07 04:12:01.325229155 +0530 -@@ -76,7 +76,8 @@ - #define OPJ_DEPRECATED(func) func - #endif - --#if defined(OPJ_STATIC) || !defined(_WIN32) -+ -+#if defined(OPJ_STATIC) || defined(__MINGW32__) || !defined(_WIN32) - /* http://gcc.gnu.org/wiki/Visibility */ - #if __GNUC__ >= 4 - #define OPJ_API __attribute__ ((visibility ("default"))) diff --git a/src/openjpeg.mk b/src/openjpeg.mk index bac08280..73a2c9a1 100644 --- a/src/openjpeg.mk +++ b/src/openjpeg.mk @@ -5,18 +5,18 @@ PKG := openjpeg $(PKG)_WEBSITE := http://www.openjpeg.org/ $(PKG)_DESCR := OpenJPEG $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.0 -$(PKG)_CHECKSUM := 1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03 -$(PKG)_SUBDIR := openjpeg-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_URL := https://sourceforge.net/projects/openjpeg.mirror/files/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 2.2.0 +$(PKG)_CHECKSUM := 6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/uclouvain/openjpeg/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc lcms libpng tiff zlib -#git commit 3d95bcf define $(PKG)_UPDATE - $(WGET) -q -O- 'https://sourceforge.net/projects/openjpeg.mirror/files/' | \ - $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ - head -1 + $(WGET) -q -O- 'https://api.github.com/repos/uclouvain/openjpeg/git/refs/tags/' | \ + $(SED) -n 's#.*"ref": "refs/tags/v\([0-9,.]*\).*#\1#p' | \ + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD