Updated build to find available openjpeg2 version

5 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8da9e53ba8b..bc38f815417a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep  5 22:01:21 UTC 2017
+# Sun Oct 22 08:49:41 UTC 2017
 pkgbase = qsstv
 	pkgdesc = Radio Slow-Scan TV for qt
 	pkgver = 9.2.4
-	pkgrel = 2
+	pkgrel = 3
 	url = http://users.telenet.be/on4qz/
 	arch = i686
 	arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = qsstv
 	source = qsstv.pro.patch
 	sha512sums = a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd
 	sha512sums = 99aa49c0e03c03ec645196354c809016fbcdf6106aea8d79b4ed9e90f0d1127eabbc08a6bd20b3c4f66866aa3ffcc35beaf16cd6a926c9996f3ec431bb8759e8
-	sha512sums = cf2e56b9fb1718a8d3b1f66744e18447f9fa894b56b1d0f1e6456039febb2d0042c6733a032f604cf176155a54c5ddbcbe8da587136e4b790b0a05a57e8231ec
-	sha512sums = 1f577693604853970c56f3ed01df95ad9e84861f67658e5b01c407f81dc53aa38362b63226137c15b0a9aceb08fd1b763594b839452f2e992d10ed15b5a384f3
+	sha512sums = 124259bc3c4cf7f7c954658ceea87810e0d45ab8ec48e7602642dea569dd7322adb26355620630d12a5fbe1d2f368954fa6745c9854d5aa1277ee559bdba52d3
+	sha512sums = 6d246262a3ac5eed5466189649d846e1cdf64ff519667fae6d65b14d598c2b05a7a8bb2499a5ec1e90bb667104c3195cfbd18d28a806094ec300e348cf631568
 
 pkgname = qsstv
 
diff --git a/PKGBUILD b/PKGBUILD
index 384b1386858a..dcbd1bbc27d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=qsstv
 pkgver=9.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Radio Slow-Scan TV for qt"
 url="http://users.telenet.be/on4qz/"
 depends=('qt4' 'hamlib' 'fftw' 'openjpeg2')
@@ -15,8 +15,8 @@ arch=('i686' 'x86_64')
 license=('GPL')
 sha512sums=('a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd'
             '99aa49c0e03c03ec645196354c809016fbcdf6106aea8d79b4ed9e90f0d1127eabbc08a6bd20b3c4f66866aa3ffcc35beaf16cd6a926c9996f3ec431bb8759e8'
-            'cf2e56b9fb1718a8d3b1f66744e18447f9fa894b56b1d0f1e6456039febb2d0042c6733a032f604cf176155a54c5ddbcbe8da587136e4b790b0a05a57e8231ec'
-            '1f577693604853970c56f3ed01df95ad9e84861f67658e5b01c407f81dc53aa38362b63226137c15b0a9aceb08fd1b763594b839452f2e992d10ed15b5a384f3')
+            '124259bc3c4cf7f7c954658ceea87810e0d45ab8ec48e7602642dea569dd7322adb26355620630d12a5fbe1d2f368954fa6745c9854d5aa1277ee559bdba52d3'
+            '6d246262a3ac5eed5466189649d846e1cdf64ff519667fae6d65b14d598c2b05a7a8bb2499a5ec1e90bb667104c3195cfbd18d28a806094ec300e348cf631568')
 
 build() {
   
diff --git a/color.cpp.patch b/color.cpp.patch
index 6b4977dbedd7..feba96fa414d 100644
--- a/color.cpp.patch
+++ b/color.cpp.patch
@@ -5,7 +5,7 @@
  
  //#include "opj_apps_config.h"
 -#include "openjpeg-2.1/openjpeg.h"
-+#include "openjpeg-2.2/openjpeg.h"
++#include "openjpeg.h"
  #include "color.h"
  
  
diff --git a/qsstv-9.1.8-1.src.tar.gz b/qsstv-9.1.8-1.src.tar.gz
deleted file mode 120000
index ae8d38d22ce1..000000000000
--- a/qsstv-9.1.8-1.src.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/home/andi/Installer/AUR/srcpkg/qsstv-9.1.8-1.src.tar.gz
\ No newline at end of file
diff --git a/qsstv.pro.patch b/qsstv.pro.patch
index 5c4bd0b98561..84de0e4f7ad0 100644
--- a/qsstv.pro.patch
+++ b/qsstv.pro.patch
@@ -1,11 +1,13 @@
 --- 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 @@
+@@ -15,7 +15,9 @@
  
  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
++INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc
++CONFIG += link_pkgconfig
++PKGCONFIG += libopenjp2 
  
  
  SOURCES += main.cpp\