fix opencv4

3 files changed, 145 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e10f628e6883..febe4c2085d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sdrangel-git
 	pkgdesc = Qt5/OpenGL SDR and signal analyzer frontend.
-	pkgver = 4.0.3.r0.2670c17f
+	pkgver = 4.4.5.r2.b8ed5a77
 	pkgrel = 1
 	url = https://github.com/f4exb/sdrangel
 	arch = x86_64
@@ -12,20 +12,26 @@ pkgbase = sdrangel-git
 	license = GPL3
 	makedepends = git
 	makedepends = cmake
+	makedepends = ffmpeg
+	makedepends = airspy
+	makedepends = bladerf
+	makedepends = hackrf
+	makedepends = limesuite
+	makedepends = rtl-sdr
+	makedepends = boost
 	depends = pkg-config
-	depends = boost
 	depends = log4cpp
 	depends = opencv
-	depends = qt5-base>=5.9
-	depends = qt5-tools
-	depends = qt5-multimedia
 	depends = fftw
-	depends = lz4
-	depends = nanomsg
-	depends = ffmpeg>=3.1
+	depends = ffmpeg
 	depends = cm256cc
-	depends = dsdcc>=1.8.3
+	depends = dsdcc
 	depends = pulseaudio
+	depends = lz4
+	depends = nanomsg
+	depends = qt5-base
+	depends = qt5-tools
+	depends = qt5-multimedia
 	optdepends = ffmpeg: DATV demodulator
 	optdepends = libmirisdr4: SDRPlay support
 	optdepends = rtl-sdr: RTLSDR support
@@ -37,7 +43,9 @@ pkgbase = sdrangel-git
 	provides = sdrangel
 	conflicts = sdrangel
 	source = git+https://github.com/f4exb/sdrangel
-	sha256sums = SKIP
+	source = sdrangel-opencv4.patch
+	sha512sums = SKIP
+	sha512sums = 8c516f85862fa4d79acfc3c4dd54a9cbdc0b53745d611651a741f5c1239f0ded2ca62121361ca5ccf62146f457bb598e4b7036f6a1decb64d86cdc51b6ec1203
 
 pkgname = sdrangel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 478a5523e28a..ff9f6c4dcb18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,65 @@
 # Maintainer: Filipe Laíns (FFY00) <filipe.lains@gmail.com>
 # Contributor: Michal Krenek (Mikos) <m.krenek@gmail.com>
+
 pkgname=sdrangel-git
 _pkgname=${pkgname%-git}
-pkgver=4.0.3.r0.2670c17f
+pkgver=4.4.5.r2.b8ed5a77
 pkgrel=1
-pkgdesc="Qt5/OpenGL SDR and signal analyzer frontend."
+pkgdesc='Qt5/OpenGL SDR and signal analyzer frontend.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://github.com/f4exb/sdrangel"
+url='https://github.com/f4exb/sdrangel'
 license=('GPL3')
-depends=(
-  'pkg-config' 'boost' 'log4cpp' 'opencv'
-  'qt5-base>=5.9' 'qt5-tools' 'qt5-multimedia' # QT5
-  'fftw' 'lz4' 'nanomsg' 'ffmpeg>=3.1'
-  'cm256cc' 'dsdcc>=1.8.3'
-  'pulseaudio'
-)
-makedepends=('git' 'cmake')
-optdepends=(
-  'ffmpeg: DATV demodulator'
-  'libmirisdr4: SDRPlay support'
-  'rtl-sdr: RTLSDR support'
-  'hackrf: HackRF support'
-  'libad9361-iio: PlutoSDR support'
-  'limesuite: LimeSDR support'
-  'bladerf: BladeRF support'
-  'airspy: AirSPY support'
-)
+depends=('pkg-config' 'log4cpp' 'opencv' 'fftw'  'ffmpeg'
+         'cm256cc' 'dsdcc' 'pulseaudio' 'lz4' 'nanomsg'
+         'qt5-base' 'qt5-tools' 'qt5-multimedia') # QT5
+makedepends=('git' 'cmake' 'ffmpeg' 'airspy' 'bladerf' 'hackrf' 'limesuite' 'rtl-sdr' 'boost')
+optdepends=('ffmpeg: DATV demodulator'
+            'libmirisdr4: SDRPlay support'
+            'rtl-sdr: RTLSDR support'
+            'hackrf: HackRF support'
+            'libad9361-iio: PlutoSDR support'
+            'limesuite: LimeSDR support'
+            'bladerf: BladeRF support'
+            'airspy: AirSPY support')
 provides=("sdrangel")
 conflicts=("sdrangel")
-source=("git+$url")
-sha256sums=('SKIP')
+source=("git+$url"
+        'sdrangel-opencv4.patch')
+sha512sums=('SKIP'
+            '8c516f85862fa4d79acfc3c4dd54a9cbdc0b53745d611651a741f5c1239f0ded2ca62121361ca5ccf62146f457bb598e4b7036f6a1decb64d86cdc51b6ec1203')
 
 pkgver() {
-  cd "$srcdir"/$_pkgname
+  cd $_pkgname
   git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g;s/\.rc./rc/g'
 }
 
+prepare() {
+  cd $_pkgname
+
+  sed -i 's|sdrangel_icon.xpm|sdrangel.xpm|' desktop/sdrangel.desktop
+  patch -p1 < ../sdrangel-opencv4.patch # Fix build with openCV 4
+}
+
 build() {
-  mkdir -p "$srcdir"/$_pkgname/build
-  cd "$srcdir"/$_pkgname/build
+  mkdir -p $_pkgname/build
+  cd $_pkgname/build
 
   cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIBDSDCC_INCLUDE_DIR=/usr/include/dsdcc \
-    -DCM256CC_INCLUDE_DIR=/usr/include/cm256cc
+  	-DCMAKE_BUILD_TYPE=Release \
+  	-DCMAKE_INSTALL_PREFIX=/usr \
+  	-DLIBDSDCC_INCLUDE_DIR=/usr/include/dsdcc \
+  	-DCM256CC_INCLUDE_DIR=/usr/include/cm256cc
 
   make
 }
 
 package() {
-  cd "$srcdir"/$_pkgname/build
+  cd $_pkgname/build
 
   make DESTDIR="$pkgdir" install
+
+  # Install .desktop file
+  install -Dm 644 ../desktop/sdrangel_icon.xpm "$pkgdir"/usr/share/pixmaps/sdrangel.xpm
+  install -Dm 644 ../desktop/sdrangel.desktop "$pkgdir"/usr/share/applications/adrangel.desktop
 }
 
diff --git a/sdrangel-opencv4.patch b/sdrangel-opencv4.patch
new file mode 100644
index 000000000000..bd32d37bede3
--- /dev/null
+++ b/sdrangel-opencv4.patch
@@ -0,0 +1,88 @@
+--- sdrangel-4.1.0/plugins/channeltx/modatv/atvmod.cpp.orig	2018-11-20 21:07:19.060496490 +0000
++++ sdrangel-4.1.0/plugins/channeltx/modatv/atvmod.cpp	2018-11-20 21:09:08.127437459 +0000
+@@ -331,7 +331,7 @@
+             		        mixImageAndText(colorFrame);
+             		    }
+ 
+-            		    cv::cvtColor(colorFrame, m_videoframeOriginal, CV_BGR2GRAY);
++            		    cv::cvtColor(colorFrame, m_videoframeOriginal, cv::COLOR_BGR2GRAY);
+             		    resizeVideo();
+             		}
+             	}
+@@ -451,7 +451,7 @@
+                         mixImageAndText(colorFrame);
+                     }
+ 
+-                    cv::cvtColor(colorFrame, camera.m_videoframeOriginal, CV_BGR2GRAY);
++                    cv::cvtColor(colorFrame, camera.m_videoframeOriginal, cv::COLOR_BGR2GRAY);
+                     resizeCamera();
+                 }
+ 
+@@ -561,7 +561,7 @@
+ 
+         if (m_videoOK && m_video.isOpened())
+         {
+-            framesCount = m_video.get(CV_CAP_PROP_POS_FRAMES);;
++            framesCount = m_video.get(cv::CAP_PROP_POS_FRAMES);;
+         } else {
+             framesCount = 0;
+         }
+@@ -792,7 +792,7 @@
+ 
+ void ATVMod::openImage(const QString& fileName)
+ {
+-    m_imageFromFile = cv::imread(qPrintable(fileName), CV_LOAD_IMAGE_GRAYSCALE);
++    m_imageFromFile = cv::imread(qPrintable(fileName), cv::IMREAD_GRAYSCALE);
+ 	m_imageOK = m_imageFromFile.data != 0;
+ 
+ 	if (m_imageOK)
+@@ -822,11 +822,11 @@
+     if (m_videoOK)
+     {
+         m_videoFileName = fileName;
+-        m_videoFPS = m_video.get(CV_CAP_PROP_FPS);
+-        m_videoWidth = (int) m_video.get(CV_CAP_PROP_FRAME_WIDTH);
+-        m_videoHeight = (int) m_video.get(CV_CAP_PROP_FRAME_HEIGHT);
+-        m_videoLength = (int) m_video.get(CV_CAP_PROP_FRAME_COUNT);
+-        int ex = static_cast<int>(m_video.get(CV_CAP_PROP_FOURCC));
++        m_videoFPS = m_video.get(cv::CAP_PROP_FPS);
++        m_videoWidth = (int) m_video.get(cv::CAP_PROP_FRAME_WIDTH);
++        m_videoHeight = (int) m_video.get(cv::CAP_PROP_FRAME_HEIGHT);
++        m_videoLength = (int) m_video.get(cv::CAP_PROP_FRAME_COUNT);
++        int ex = static_cast<int>(m_video.get(cv::CAP_PROP_FOURCC));
+         char ext[] = {(char)(ex & 0XFF),(char)((ex & 0XFF00) >> 8),(char)((ex & 0XFF0000) >> 16),(char)((ex & 0XFF000000) >> 24),0};
+ 
+         qDebug("ATVMod::openVideo: %s FPS: %f size: %d x %d #frames: %d codec: %s",
+@@ -921,7 +921,7 @@
+     if ((m_videoOK) && m_video.isOpened())
+     {
+         int seekPoint = ((m_videoLength * seekPercentage) / 100);
+-        m_video.set(CV_CAP_PROP_POS_FRAMES, seekPoint);
++        m_video.set(cv::CAP_PROP_POS_FRAMES, seekPoint);
+         m_videoFPSCount = m_videoFPSq;
+         m_videoPrevFPSCount = 0;
+         m_videoEOF = false;
+@@ -939,9 +939,9 @@
+ 
+ 		if (m_cameras.back().m_camera.isOpened())
+ 		{
+-			m_cameras.back().m_videoFPS = m_cameras.back().m_camera.get(CV_CAP_PROP_FPS);
+-			m_cameras.back().m_videoWidth = (int) m_cameras.back().m_camera.get(CV_CAP_PROP_FRAME_WIDTH);
+-			m_cameras.back().m_videoHeight = (int) m_cameras.back().m_camera.get(CV_CAP_PROP_FRAME_HEIGHT);
++			m_cameras.back().m_videoFPS = m_cameras.back().m_camera.get(cv::CAP_PROP_FPS);
++			m_cameras.back().m_videoWidth = (int) m_cameras.back().m_camera.get(cv::CAP_PROP_FRAME_WIDTH);
++			m_cameras.back().m_videoHeight = (int) m_cameras.back().m_camera.get(cv::CAP_PROP_FRAME_HEIGHT);
+ 
+ 			//m_cameras.back().m_videoFPS = m_cameras.back().m_videoFPS < 0 ? 16.3f : m_cameras.back().m_videoFPS;
+ 
+@@ -1012,7 +1012,7 @@
+     // position the text in the top left corner
+     cv::Point textOrg(6, textSize.height+10);
+     // then put the text itself
+-    cv::putText(image, m_settings.m_overlayText.toStdString(), textOrg, fontFace, fontScale, cv::Scalar::all(255*m_settings.m_uniformLevel), thickness, CV_AA);
++    cv::putText(image, m_settings.m_overlayText.toStdString(), textOrg, fontFace, fontScale, cv::Scalar::all(255*m_settings.m_uniformLevel), thickness, cv::LINE_AA);
+ }
+ 
+ void ATVMod::applyChannelSettings(int outputSampleRate, int inputFrequencyOffset, bool force)
+
+