Patched to use current openjpeg2.2

4 files changed, 39 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f02a7a6fc335..c8da9e53ba8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Nov 14 00:00:23 UTC 2016
+# Tue Sep  5 22:01:21 UTC 2017
 pkgbase = qsstv
 	pkgdesc = Radio Slow-Scan TV for qt
 	pkgver = 9.2.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://users.telenet.be/on4qz/
 	arch = i686
 	arch = x86_64
@@ -14,8 +14,12 @@ pkgbase = qsstv
 	depends = openjpeg2
 	source = http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.2.4.tar.gz
 	source = qsstv.desktop
+	source = color.cpp.patch
+	source = qsstv.pro.patch
 	sha512sums = a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd
 	sha512sums = 99aa49c0e03c03ec645196354c809016fbcdf6106aea8d79b4ed9e90f0d1127eabbc08a6bd20b3c4f66866aa3ffcc35beaf16cd6a926c9996f3ec431bb8759e8
+	sha512sums = cf2e56b9fb1718a8d3b1f66744e18447f9fa894b56b1d0f1e6456039febb2d0042c6733a032f604cf176155a54c5ddbcbe8da587136e4b790b0a05a57e8231ec
+	sha512sums = 1f577693604853970c56f3ed01df95ad9e84861f67658e5b01c407f81dc53aa38362b63226137c15b0a9aceb08fd1b763594b839452f2e992d10ed15b5a384f3
 
 pkgname = qsstv
 
diff --git a/PKGBUILD b/PKGBUILD
index fc5ce27a0e63..384b1386858a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,27 @@
 
 pkgname=qsstv
 pkgver=9.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Radio Slow-Scan TV for qt"
 url="http://users.telenet.be/on4qz/"
 depends=('qt4' 'hamlib' 'fftw' 'openjpeg2')
 source=(http://users.telenet.be/on4qz/qsstv/downloads/${pkgname}_${pkgver}.tar.gz
-        $pkgname.desktop)
+        $pkgname.desktop
+        color.cpp.patch
+        qsstv.pro.patch)
 arch=('i686' 'x86_64')
 license=('GPL')
 sha512sums=('a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd'
-            '99aa49c0e03c03ec645196354c809016fbcdf6106aea8d79b4ed9e90f0d1127eabbc08a6bd20b3c4f66866aa3ffcc35beaf16cd6a926c9996f3ec431bb8759e8')
+            '99aa49c0e03c03ec645196354c809016fbcdf6106aea8d79b4ed9e90f0d1127eabbc08a6bd20b3c4f66866aa3ffcc35beaf16cd6a926c9996f3ec431bb8759e8'
+            'cf2e56b9fb1718a8d3b1f66744e18447f9fa894b56b1d0f1e6456039febb2d0042c6733a032f604cf176155a54c5ddbcbe8da587136e4b790b0a05a57e8231ec'
+            '1f577693604853970c56f3ed01df95ad9e84861f67658e5b01c407f81dc53aa38362b63226137c15b0a9aceb08fd1b763594b839452f2e992d10ed15b5a384f3')
 
 build() {
   
+  cd $srcdir
+  patch -p0 < color.cpp.patch
+  patch -p0 < qsstv.pro.patch
+
   cd $srcdir/${pkgname}_$pkgver
 
   # trick qmake
diff --git a/color.cpp.patch b/color.cpp.patch
new file mode 100644
index 000000000000..6b4977dbedd7
--- /dev/null
+++ b/color.cpp.patch
@@ -0,0 +1,11 @@
+--- qsstv_9.2.4/qsstv/utils/color.cpp.orig	2016-08-23 21:39:12.000000000 +0200
++++ qsstv_9.2.4/qsstv/utils/color.cpp	2017-09-05 23:15:17.142617536 +0200
+@@ -42,7 +42,7 @@
+ #include <assert.h>
+ 
+ //#include "opj_apps_config.h"
+-#include "openjpeg-2.1/openjpeg.h"
++#include "openjpeg-2.2/openjpeg.h"
+ #include "color.h"
+ 
+ 
diff --git a/qsstv.pro.patch b/qsstv.pro.patch
new file mode 100644
index 000000000000..5c4bd0b98561
--- /dev/null
+++ b/qsstv.pro.patch
@@ -0,0 +1,11 @@
+--- qsstv_9.2.4/qsstv/qsstv.pro.orig	2017-09-05 23:23:34.135918319 +0200
++++ qsstv_9.2.4/qsstv/qsstv.pro	2017-09-05 23:23:49.502583980 +0200
+@@ -15,7 +15,7 @@
+ 
+ TARGET = qsstv
+ TEMPLATE = app
+-INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc  /usr/include/openjpeg-2.1
++INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc  /usr/include/openjpeg-2.2
+ 
+ 
+ SOURCES += main.cpp\