Update to 3.0.4

8 files changed, 144 insertions, 138 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cde05393dc0c..9906d7316b98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mingw-w64-jasper
 	pkgdesc = A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard (mingw-w64)
-	pkgver = 2.0.33
+	pkgver = 3.0.4
 	pkgrel = 1
-	url = https://www.ece.uvic.ca/~mdadams/jasper/
+	url = https://www.ece.uvic.ca/~frodo/jasper/
 	arch = any
 	license = custom:JasPer2.0
 	makedepends = mingw-w64-cmake
@@ -10,15 +10,13 @@ pkgbase = mingw-w64-jasper
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = https://github.com/jasper-software/jasper/releases/download/version-2.0.33/jasper-2.0.33.tar.gz
-	source = jasper-1.900.1-fix-filename-buffer-overflow.patch
-	source = 001-mingw-cmake.patch
-	source = 004-jasper-exports.patch
-	source = jasper-static-fix.patch
-	sha256sums = 28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a
-	sha256sums = f51377e9b3e4faaa6b17b2d5fcf6f6d94fe2916a65dc9c78b5a99b891f5726dc
-	sha256sums = 2b261c9b40b973d0d11f7b2b6842b36aee45657cbd5e0780fa73cb184f570b65
-	sha256sums = aef39fbaf65c0453a785eb563253f2bb66806ddbebcd836b8bd8dce67c7059eb
-	sha256sums = 3102b4175d714df84a63b8ebf3c0f346fc09a0a784a560917994f6074d6b1697
+	source = mingw-w64-jasper-3.0.4.tar.gz::https://github.com/mdadams/jasper/archive/version-3.0.4.tar.gz
+	source = 0001-Fix-exports.patch
+	source = 0002-Fix-building-for-mingw-w64-target.patch
+	source = 0003-Fix-filename-buffer-overflow.patch
+	sha512sums = 1846d5c5c263ea9f3279a33e9be50350d2e91ea91271af5e6423b3fd87e069abc51290196f0e4ef72e54b0e727171d66562c0b855396afbed06dc9b0bb7bef04
+	sha512sums = 0eb2588a54e154ca93977088a63b7261bed605047e51ae0e9d537b0abbb5846a94f47f3e5df7cfd753d12c80273b922c74a752578938d3ba4da81f3b756b0ffb
+	sha512sums = bd61f586bc910fd698d5f3e66a7892a63ee85eabc6c2802672d607d1b7b3fda6e412973f5bcc7b47db2c80b3c627f679dd45cbe2d13b08f8520314d4d29e2468
+	sha512sums = 31d900b6c160205151cbfac9f36fa0e5243dc87b0b8eab159cfa0b6935d87dd08119a52a0f853e6c2f3f754ca6c0030ec229379deb68ba16befd5f99983112ad
 
 pkgname = mingw-w64-jasper
diff --git a/004-jasper-exports.patch b/0001-Fix-exports.patch
index 2f12ae315708..ac2dfdd62ed8 100644
--- a/004-jasper-exports.patch
+++ b/0001-Fix-exports.patch
@@ -1,7 +1,17 @@
-diff -Naur jasper-version-2.0.22-orig/src/libjasper/jp2/jp2_cod.h jasper-version-2.0.22/src/libjasper/jp2/jp2_cod.h
---- jasper-version-2.0.22-orig/src/libjasper/jp2/jp2_cod.h	2017-09-11 09:36:23.281414800 +0300
-+++ jasper-version-2.0.22/src/libjasper/jp2/jp2_cod.h	2017-09-11 13:16:28.075347800 +0300
-@@ -288,10 +288,10 @@
+From 4f15088f82a2a001f064cee1ef9cfe23d281e957 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Tue, 14 Jun 2022 23:12:32 +0200
+Subject: [PATCH 1/3] Fix exports
+
+---
+ src/libjasper/jp2/jp2_cod.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libjasper/jp2/jp2_cod.h b/src/libjasper/jp2/jp2_cod.h
+index 81d3b7e..4f22fa3 100644
+--- a/src/libjasper/jp2/jp2_cod.h
++++ b/src/libjasper/jp2/jp2_cod.h
+@@ -288,10 +288,10 @@ typedef struct jp2_boxinfo_s {
  * Box class.
  \******************************************************************************/
  
@@ -16,12 +26,14 @@ diff -Naur jasper-version-2.0.22-orig/src/libjasper/jp2/jp2_cod.h jasper-version
  
  JAS_ATTRIBUTE_CONST
  static inline uint_least8_t JP2_DTYPETOBPC(uint_least8_t dtype)
-@@ -309,7 +309,7 @@
+@@ -309,6 +309,6 @@ static inline uint_least8_t JP2_BPCTODTYPE(uint_least8_t bpc)
  #define ICC_CS_YCBCR	0x59436272
  #define ICC_CS_GRAY	0x47524159
  
 -const jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo);
 +JAS_DLLEXPORT const jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo);
  
- 
  #endif
+-- 
+2.36.1
+
diff --git a/0002-Fix-building-for-mingw-w64-target.patch b/0002-Fix-building-for-mingw-w64-target.patch
new file mode 100644
index 000000000000..8bbfc9721150
--- /dev/null
+++ b/0002-Fix-building-for-mingw-w64-target.patch
@@ -0,0 +1,49 @@
+From f783c72a35b0cbf8d04b9d9472e267c72c52e1ff Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Tue, 14 Jun 2022 23:13:06 +0200
+Subject: [PATCH 2/3] Fix building for mingw-w64 target
+
+---
+ CMakeLists.txt               | 2 ++
+ src/libjasper/CMakeLists.txt | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 52ad5a8..72257ec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -723,10 +723,12 @@ message("JAS_INCLUDE_HEIC_CODEC: ${JAS_INCLUDE_HEIC_CODEC}")
+ # Check for the Math library.
+ ################################################################################
+ 
++if(NOT WIN32)
+ find_library(MATH_LIBRARY m)
+ if(NOT MATH_LIBRARY)
+ 	set(MATH_LIBRARY "")
+ endif()
++endif()
+ 
+ ################################################################################
+ # Perform shared library setup.
+diff --git a/src/libjasper/CMakeLists.txt b/src/libjasper/CMakeLists.txt
+index c0b19b3..9fab05f 100644
+--- a/src/libjasper/CMakeLists.txt
++++ b/src/libjasper/CMakeLists.txt
+@@ -182,6 +182,14 @@ target_include_directories(libjasper BEFORE PRIVATE
+ set_target_properties(libjasper PROPERTIES
+   OUTPUT_NAME jasper LINKER_LANGUAGE C)
+ 
++if (MINGW)
++    set_target_properties(libjasper
++                          PROPERTIES
++                          OUTPUT_NAME jasper
++                          RUNTIME_OUTPUT_NAME jasper-${JAS_SO_VERSION}
++                          ARCHIVE_OUTPUT_NAME jasper)
++endif()
++
+ if(MSVC)
+ 	target_compile_definitions(libjasper PRIVATE _CRT_SECURE_NO_WARNINGS)
+ 	target_compile_definitions(libjasper PRIVATE _CRT_SECURE_NO_DEPRECATE)
+-- 
+2.36.1
+
diff --git a/0003-Fix-filename-buffer-overflow.patch b/0003-Fix-filename-buffer-overflow.patch
new file mode 100644
index 000000000000..60c8ddd14ad5
--- /dev/null
+++ b/0003-Fix-filename-buffer-overflow.patch
@@ -0,0 +1,46 @@
+From 5e697686ff137496f5ede4b1ee21d67ea682186a Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Tue, 14 Jun 2022 23:14:10 +0200
+Subject: [PATCH 3/3] Fix filename buffer overflow
+
+---
+ src/libjasper/include/jasper/jas_stream.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/libjasper/include/jasper/jas_stream.h b/src/libjasper/include/jasper/jas_stream.h
+index d8938d1..61a6e66 100644
+--- a/src/libjasper/include/jasper/jas_stream.h
++++ b/src/libjasper/include/jasper/jas_stream.h
+@@ -77,6 +77,7 @@
+ #include <jasper/jas_config.h> /* IWYU pragma: export */
+ 
+ #include <stdio.h>
++#include <limits.h>
+ #if defined(JAS_HAVE_FCNTL_H)
+ #include <fcntl.h>
+ #endif
+@@ -100,6 +101,12 @@ extern "C" {
+ #define O_BINARY	0
+ #endif
+ 
++#ifdef PATH_MAX
++#define JAS_PATH_MAX PATH_MAX
++#else
++#define JAS_PATH_MAX 4096
++#endif
++
+ /*
+  * Stream open flags.
+  */
+@@ -258,7 +265,7 @@ typedef struct {
+ typedef struct {
+ 	int fd;
+ 	int flags;
+-	char pathname[L_tmpnam + 1];
++	char pathname[JAS_PATH_MAX + 1];
+ } jas_stream_fileobj_t;
+ 
+ /* Delete underlying file object upon stream close. */
+-- 
+2.36.1
+
diff --git a/001-mingw-cmake.patch b/001-mingw-cmake.patch
deleted file mode 100644
index e306d743c3de..000000000000
--- a/001-mingw-cmake.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur jasper-version-2.0.10-orig/CMakeLists.txt jasper-version-2.0.10/CMakeLists.txt
---- jasper-version-2.0.10-orig/CMakeLists.txt	2016-12-30 19:40:24.000000000 +0300
-+++ jasper-version-2.0.10/CMakeLists.txt	2017-02-22 13:25:53.443469100 +0300
-@@ -319,11 +319,12 @@
- # Check for the Math library.
- ################################################################################
- 
--find_library(MATH_LIBRARY m)
--if (NOT MATH_LIBRARY)
--	set(MATH_LIBRARY "")
-+if(NOT WIN32)
-+    find_library(MATH_LIBRARY m)
-+    if (NOT MATH_LIBRARY)
-+        set(MATH_LIBRARY "")
-+    endif()
- endif()
--
- ################################################################################
- #
- ################################################################################
-diff -Naur jasper-version-2.0.10-orig/src/libjasper/CMakeLists.txt jasper-version-2.0.10/src/libjasper/CMakeLists.txt
---- jasper-version-2.0.10-orig/src/libjasper/CMakeLists.txt	2016-12-30 19:40:24.000000000 +0300
-+++ jasper-version-2.0.10/src/libjasper/CMakeLists.txt	2017-02-22 13:28:15.983985500 +0300
-@@ -145,6 +145,14 @@
- )
- 
- set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper)
-+
-+if (MINGW)
-+    set_target_properties(libjasper
-+                          PROPERTIES
-+                          OUTPUT_NAME jasper
-+                          RUNTIME_OUTPUT_NAME jasper-${JAS_SO_VERSION}
-+                          ARCHIVE_OUTPUT_NAME jasper)
-+endif()
- set_target_properties(libjasper PROPERTIES LINKER_LANGUAGE C)
- 
- if (UNIX)
diff --git a/PKGBUILD b/PKGBUILD
index 3f46112bed6a..adf0e996118c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,36 @@
-# Maintainer: drakkan <nicola.murino at gmail dot com>
+# Maintainer: Martchus <martchus@gmx.net>
+# Contributor: drakkan <nicola.murino at gmail dot com>
+
 pkgname=mingw-w64-jasper
-pkgver=2.0.33
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard (mingw-w64)"
 arch=(any)
-url='https://www.ece.uvic.ca/~mdadams/jasper/'
+url='https://www.ece.uvic.ca/~frodo/jasper/'
 license=("custom:JasPer2.0")
 makedepends=('mingw-w64-cmake')
 depends=('mingw-w64-libjpeg-turbo')
 options=(staticlibs !strip !buildflags)
-source=("https://github.com/jasper-software/jasper/releases/download/version-${pkgver}/jasper-${pkgver}.tar.gz"
-        "jasper-1.900.1-fix-filename-buffer-overflow.patch"
-        "001-mingw-cmake.patch"
-        "004-jasper-exports.patch"
-        "jasper-static-fix.patch")
-
-sha256sums=('28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a'
-            'f51377e9b3e4faaa6b17b2d5fcf6f6d94fe2916a65dc9c78b5a99b891f5726dc'
-            '2b261c9b40b973d0d11f7b2b6842b36aee45657cbd5e0780fa73cb184f570b65'
-            'aef39fbaf65c0453a785eb563253f2bb66806ddbebcd836b8bd8dce67c7059eb'
-            '3102b4175d714df84a63b8ebf3c0f346fc09a0a784a560917994f6074d6b1697')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mdadams/jasper/archive/version-${pkgver}.tar.gz
+        0001-Fix-exports.patch
+        0002-Fix-building-for-mingw-w64-target.patch
+        0003-Fix-filename-buffer-overflow.patch)
+sha512sums=('1846d5c5c263ea9f3279a33e9be50350d2e91ea91271af5e6423b3fd87e069abc51290196f0e4ef72e54b0e727171d66562c0b855396afbed06dc9b0bb7bef04'
+            '0eb2588a54e154ca93977088a63b7261bed605047e51ae0e9d537b0abbb5846a94f47f3e5df7cfd753d12c80273b922c74a752578938d3ba4da81f3b756b0ffb'
+            'bd61f586bc910fd698d5f3e66a7892a63ee85eabc6c2802672d607d1b7b3fda6e412973f5bcc7b47db2c80b3c627f679dd45cbe2d13b08f8520314d4d29e2468'
+            '31d900b6c160205151cbfac9f36fa0e5243dc87b0b8eab159cfa0b6935d87dd08119a52a0f853e6c2f3f754ca6c0030ec229379deb68ba16befd5f99983112ad')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "$srcdir/jasper-$pkgver"
-  patch -p1 -i "${srcdir}"/jasper-1.900.1-fix-filename-buffer-overflow.patch
-  patch -p1 -i "${srcdir}"/001-mingw-cmake.patch
-  patch -p1 -i "${srcdir}"/004-jasper-exports.patch
-  patch -p1 -i "${srcdir}"/jasper-static-fix.patch
+  cd "$srcdir/jasper-version-$pkgver"
+  patch -p1 -i "${srcdir}"/0001-Fix-exports.patch
+  patch -p1 -i "${srcdir}"/0002-Fix-building-for-mingw-w64-target.patch
+  patch -p1 -i "${srcdir}"/0003-Fix-filename-buffer-overflow.patch
 }
 
 build() {
-  cd "$srcdir/jasper-$pkgver"
+  cd "$srcdir/jasper-version-$pkgver"
   local options=(
     -DCMAKE_INSTALL_LIBDIR=lib
     -DCMAKE_BUILD_TYPE=Release
@@ -41,6 +39,7 @@ build() {
     -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
     -DCMAKE_SKIP_RPATH=ON
     -DJAS_ENABLE_DOC=OFF
+    -DJAS_STDC_VERSION=201112L
   )
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch}-static && pushd build-${_arch}-static
@@ -56,9 +55,9 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/jasper-${pkgver}/build-${_arch}-static"
+    cd "${srcdir}/jasper-version-${pkgver}/build-${_arch}-static"
     make DESTDIR="$pkgdir" install
-    cd "${srcdir}/jasper-${pkgver}/build-${_arch}"
+    cd "${srcdir}/jasper-version-${pkgver}/build-${_arch}"
     make DESTDIR="$pkgdir" install
     rm -r "$pkgdir/usr/${_arch}/share"
     ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
diff --git a/jasper-1.900.1-fix-filename-buffer-overflow.patch b/jasper-1.900.1-fix-filename-buffer-overflow.patch
deleted file mode 100644
index e95ed9cf23ba..000000000000
--- a/jasper-1.900.1-fix-filename-buffer-overflow.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Filename buffer overflow fix
- This patch fixes a security hole by a bad buffer size handling.
-Author: Roland Stigge <stigge@antcom.de>
-Bug-Debian: http://bugs.debian.org/645118
-
---- a/src/libjasper/include/jasper/jas_stream.h
-+++ b/src/libjasper/include/jasper/jas_stream.h
-@@ -77,6 +77,7 @@
- #include <jasper/jas_config.h>
- 
- #include <stdio.h>
-+#include <limits.h>
- #if defined(JAS_HAVE_FCNTL_H)
- #include <fcntl.h>
- #endif
-@@ -99,6 +100,12 @@ extern "C" {
- #define O_BINARY	0
- #endif
- 
-+#ifdef PATH_MAX
-+#define JAS_PATH_MAX PATH_MAX
-+#else
-+#define JAS_PATH_MAX 4096
-+#endif
-+
- /*
-  * Stream open flags.
-  */
-@@ -251,7 +258,7 @@ typedef struct {
- typedef struct {
- 	int fd;
- 	int flags;
--	char pathname[L_tmpnam + 1];
-+	char pathname[JAS_PATH_MAX + 1];
- } jas_stream_fileobj_t;
- 
- #define	JAS_STREAM_FILEOBJ_DELONCLOSE	0x01
diff --git a/jasper-static-fix.patch b/jasper-static-fix.patch
deleted file mode 100644
index f0216ef549a7..000000000000
--- a/jasper-static-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/libjasper/include/jasper/jas_config.h.in
-+++ b/src/libjasper/include/jasper/jas_config.h.in
-@@ -0,6 +0,8 @@
- #ifndef JAS_CONFIG_H
- #define JAS_CONFIG_H
- 
-+#ifndef JAS_DLL
- #cmakedefine JAS_DLL 1
-+#endif
- 
- #include <jasper/jas_dll.h>
- 
---- a/src/libjasper/include/jasper/jas_dll.h
-+++ b/src/libjasper/include/jasper/jas_dll.h
-@@ -0,7 +0,7 @@
- #ifndef JAS_DLL_H
- #define JAS_DLL_H
- 
--#if defined(JAS_DLL)
-+#if JAS_DLL
- 	#if defined(_WIN32)
- 		#if defined(JAS_BUILDING_DLL)
- 			#define JAS_DLLEXPORT __declspec(dllexport)