fix build for jasper 2.0.33

3 files changed, 21 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecf01526e8fa..a199d13cc06a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Mar 25 20:52:41 UTC 2017
 pkgbase = xv
 	pkgdesc = A nice image viewer
 	pkgver = 3.10a
-	pkgrel = 22
+	pkgrel = 23
 	url = http://www.trilon.com/xv/
 	arch = i686
 	arch = x86_64
@@ -19,11 +17,12 @@ pkgbase = xv
 	source = http://www.sonic.net/~roelofs/code/xv-3.10a-enhancements.20070520-20081216.diff
 	source = license.txt
 	source = xv-3.10a-libpng15.patch
+	source = xv-3.10a-jasper.patch
 	sha1sums = 092f8eb100f16d6b91c88b126c2b2b998eb09b99
 	sha1sums = d00308c1687d9d803d26ef40c73d19a0f593c626
 	sha1sums = 40bfb0889b820e0f9d3bd7d771144ec3458acc66
 	sha1sums = 4561344e8f2c30eee9c55b14a14f062d89d6e7b7
 	sha1sums = 3d19aa0c6ecc8b554081906babe0b4f9a6946da3
+	sha1sums = 1728efbe534bd0a6e7937037d735a0e3ce592196
 
 pkgname = xv
-
diff --git a/PKGBUILD b/PKGBUILD
index 856ec2825bb6..a11a49901dba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xv
 pkgver=3.10a
-pkgrel=22
+pkgrel=23
 pkgdesc="A nice image viewer"
 arch=('i686' 'x86_64')
 url="http://www.trilon.com/xv/"
@@ -15,12 +15,13 @@ options=('!emptydirs')
 source=(ftp://ftp.trilon.com/pub/xv/${pkgname}-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz \
         http://www.sonic.net/~roelofs/code/xv-3.10a-enhancements.20070520-20081216.diff \
-        license.txt xv-3.10a-libpng15.patch)
+        license.txt xv-3.10a-libpng15.patch xv-3.10a-jasper.patch)
 sha1sums=('092f8eb100f16d6b91c88b126c2b2b998eb09b99'
           'd00308c1687d9d803d26ef40c73d19a0f593c626'
           '40bfb0889b820e0f9d3bd7d771144ec3458acc66'
           '4561344e8f2c30eee9c55b14a14f062d89d6e7b7'
-          '3d19aa0c6ecc8b554081906babe0b4f9a6946da3')
+          '3d19aa0c6ecc8b554081906babe0b4f9a6946da3'
+          '1728efbe534bd0a6e7937037d735a0e3ce592196')
 
 prepare() {
   tar -cJf xv-${pkgver}-source.tar.xz xv-${pkgver}
@@ -28,6 +29,7 @@ prepare() {
   patch -p1 -i "${srcdir}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt"
   patch -p1 -i "${srcdir}/xv-3.10a-enhancements.20070520-20081216.diff"
   patch -p0 -i "${srcdir}/xv-3.10a-libpng15.patch"
+  patch -p0 -i "${srcdir}/xv-3.10a-jasper.patch"
 }
 
 build() {
diff --git a/xv-3.10a-jasper.patch b/xv-3.10a-jasper.patch
new file mode 100644
index 000000000000..f2da8a7146dd
--- /dev/null
+++ b/xv-3.10a-jasper.patch
@@ -0,0 +1,13 @@
+--- xvjp2k.c
++++ xvjp2k.c
+@@ -76,8 +76,8 @@
+ */
+ int jas_getdbglevel(void) {return 0;}
+ int jas_setdbglevel(int n) {return 0;}
+-int jas_memdump(FILE *fp,void *data,size_t len) {return 0;}
+-
++int jas_memdump(FILE *fp,const void *data,size_t len) {return 0;}
++void jas_deprecated(const char *s) {return;}
+ int jas_eprintf(const char *fmt,...)         /* Handle JasPer Library message */
+ {
+     static char error[] = "error: ", warning[]= "warning: ";