From 22d60fac555baff49f1e84c2dd81724edf91f8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 25 Feb 2021 07:45:16 +0700
Subject: [PATCH] jasper: update to 2.0.25.

CVE-2021-26927
---
 srcpkgs/jasper/patches/CVE-2018-9055.patch | 61 ----------------------
 srcpkgs/jasper/template                    |  5 +-
 2 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/jasper/patches/CVE-2018-9055.patch

diff --git a/srcpkgs/jasper/patches/CVE-2018-9055.patch b/srcpkgs/jasper/patches/CVE-2018-9055.patch
deleted file mode 100644
index 34a06d98279..00000000000
--- a/srcpkgs/jasper/patches/CVE-2018-9055.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a7cfb760db46d2405dd180bc7c302f6311e605a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Thu, 29 Mar 2018 16:33:15 +0200
-Subject: [PATCH] CVE-2018-9055
-
----
- src/libjasper/jpc/jpc_math.c | 4 ++--
- src/libjasper/jpc/jpc_math.h | 5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/libjasper/jpc/jpc_math.c b/src/libjasper/jpc/jpc_math.c
-index 2b70844..1b18880 100644
---- a/src/libjasper/jpc/jpc_math.c
-+++ b/src/libjasper/jpc/jpc_math.c
-@@ -86,7 +86,7 @@
- 
- /* Calculate the integer quantity floor(log2(x)), where x is a positive
-   integer. */
--int jpc_floorlog2(int x)
-+int jpc_floorlog2(int_fast32_t x)
- {
- 	int y;
- 
-@@ -105,7 +105,7 @@ int jpc_floorlog2(int x)
-   integer. */
- /* This function is the basically the same as ceillog2(x), except that the
-   allowable range for x is slightly different. */
--int jpc_firstone(int x)
-+int jpc_firstone(int_fast32_t x)
- {
- 	int n;
- 
-diff --git a/src/libjasper/jpc/jpc_math.h b/src/libjasper/jpc/jpc_math.h
-index e8e0978..0b75f4f 100644
---- a/src/libjasper/jpc/jpc_math.h
-+++ b/src/libjasper/jpc/jpc_math.h
-@@ -67,6 +67,7 @@
- \******************************************************************************/
- 
- #include	<assert.h>
-+#include	<stdint.h>
- 
- /******************************************************************************\
- * Macros
-@@ -90,10 +91,10 @@
- 
- /* Calculate the bit position of the first leading one in a nonnegative
-   integer. */
--int jpc_firstone(int x);
-+int jpc_firstone(int_fast32_t x);
- 
- /* Calculate the integer quantity floor(log2(x)), where x is a positive
-   integer. */
--int jpc_floorlog2(int x);
-+int jpc_floorlog2(int_fast32_t x);
- 
- #endif
--- 
-2.16.2
-
-
diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template
index f04ea185819..ae02985e45d 100644
--- a/srcpkgs/jasper/template
+++ b/srcpkgs/jasper/template
@@ -1,16 +1,17 @@
 # Template file for 'jasper'
 pkgname=jasper
-version=2.0.16
+version=2.0.25
 revision=1
 wrksrc="${pkgname}-version-${version}"
 build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None"
 makedepends="libjpeg-turbo-devel"
 short_desc="Software-based reference implementation of the JPEG-2000 codec"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="JasPer-2.0"
 homepage="http://www.ece.uvic.ca/~mdadams/jasper"
 distfiles="https://github.com/mdadams/jasper/archive/version-${version}.tar.gz"
-checksum=f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1
+checksum=f5bc48e2884bcabd2aca1737baff4ca962ec665b6eb673966ced1f7adea07edb
 patch_args="-Np1"
 
 post_install() {