Fix patch file, update PKGBUILD

3 files changed, 34 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index febe4c2085d7..15d91a1ce91a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sdrangel-git
 	pkgdesc = Qt5/OpenGL SDR and signal analyzer frontend.
-	pkgver = 4.4.5.r2.b8ed5a77
+	pkgver = 4.13.0.r0.583a144c6
 	pkgrel = 1
 	url = https://github.com/f4exb/sdrangel
 	arch = x86_64
@@ -12,11 +12,9 @@ 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
@@ -29,9 +27,11 @@ pkgbase = sdrangel-git
 	depends = pulseaudio
 	depends = lz4
 	depends = nanomsg
+	depends = limesuite
 	depends = qt5-base
 	depends = qt5-tools
 	depends = qt5-multimedia
+	depends = qt5-websockets
 	optdepends = ffmpeg: DATV demodulator
 	optdepends = libmirisdr4: SDRPlay support
 	optdepends = rtl-sdr: RTLSDR support
@@ -45,7 +45,7 @@ pkgbase = sdrangel-git
 	source = git+https://github.com/f4exb/sdrangel
 	source = sdrangel-opencv4.patch
 	sha512sums = SKIP
-	sha512sums = 8c516f85862fa4d79acfc3c4dd54a9cbdc0b53745d611651a741f5c1239f0ded2ca62121361ca5ccf62146f457bb598e4b7036f6a1decb64d86cdc51b6ec1203
+	sha512sums = e27b43c8565cc03b8ec66e17e5429c29add8b9e1f1bdaebbbd75442fe08721fc6c89dbb478f8642146f2293962c639a36efdb6aa0276e54930f0745106ae8dda
 
 pkgname = sdrangel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ff9f6c4dcb18..e7ffddd24437 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,17 @@
 
 pkgname=sdrangel-git
 _pkgname=${pkgname%-git}
-pkgver=4.4.5.r2.b8ed5a77
+pkgver=4.13.0.r0.583a144c6
 pkgrel=1
 pkgdesc='Qt5/OpenGL SDR and signal analyzer frontend.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://github.com/f4exb/sdrangel'
 license=('GPL3')
-depends=('pkg-config' 'log4cpp' 'opencv' 'fftw'  'ffmpeg'
+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')
+         'limesuite'
+         'qt5-base' 'qt5-tools' 'qt5-multimedia' 'qt5-websockets') # QT5
+makedepends=('git' 'cmake' 'airspy' 'bladerf' 'hackrf' 'rtl-sdr' 'boost')
 optdepends=('ffmpeg: DATV demodulator'
             'libmirisdr4: SDRPlay support'
             'rtl-sdr: RTLSDR support'
@@ -26,7 +27,7 @@ conflicts=("sdrangel")
 source=("git+$url"
         'sdrangel-opencv4.patch')
 sha512sums=('SKIP'
-            '8c516f85862fa4d79acfc3c4dd54a9cbdc0b53745d611651a741f5c1239f0ded2ca62121361ca5ccf62146f457bb598e4b7036f6a1decb64d86cdc51b6ec1203')
+            'e27b43c8565cc03b8ec66e17e5429c29add8b9e1f1bdaebbbd75442fe08721fc6c89dbb478f8642146f2293962c639a36efdb6aa0276e54930f0745106ae8dda')
 
 pkgver() {
   cd $_pkgname
@@ -36,7 +37,6 @@ pkgver() {
 prepare() {
   cd $_pkgname
 
-  sed -i 's|sdrangel_icon.xpm|sdrangel.xpm|' desktop/sdrangel.desktop
   patch -p1 < ../sdrangel-opencv4.patch # Fix build with openCV 4
 }
 
@@ -44,6 +44,8 @@ build() {
   mkdir -p $_pkgname/build
   cd $_pkgname/build
 
+  # https://bugs.gentoo.org/704322
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
   cmake .. \
   	-DCMAKE_BUILD_TYPE=Release \
   	-DCMAKE_INSTALL_PREFIX=/usr \
@@ -57,9 +59,5 @@ package() {
   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
index bd32d37bede3..a9ea245b5419 100644
--- a/sdrangel-opencv4.patch
+++ b/sdrangel-opencv4.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/plugins/channeltx/modatv/atvmodsource.cpp	2019-11-21 15:15:21.481489827 -0800
++++ b/plugins/channeltx/modatv/atvmodsource.cpp	2019-11-21 15:21:01.449347861 -0800
+@@ -321,7 +321,7 @@
              		        mixImageAndText(colorFrame);
              		    }
  
@@ -9,7 +9,7 @@
              		    resizeVideo();
              		}
              	}
-@@ -451,7 +451,7 @@
+@@ -448,7 +448,7 @@
                          mixImageAndText(colorFrame);
                      }
  
@@ -18,28 +18,19 @@
                      resizeCamera();
                  }
  
-@@ -561,7 +561,7 @@
+@@ -653,7 +653,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)
+ void ATVModSource::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 @@
+@@ -683,11 +683,11 @@
      if (m_videoOK)
      {
-         m_videoFileName = fileName;
+         m_settings.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);
@@ -52,8 +43,8 @@
 +        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 @@
+         qDebug("ATVModSource::openVideo: %s FPS: %f size: %d x %d #frames: %d codec: %s",
+@@ -781,7 +781,7 @@
      if ((m_videoOK) && m_video.isOpened())
      {
          int seekPoint = ((m_videoLength * seekPercentage) / 100);
@@ -62,7 +53,7 @@
          m_videoFPSCount = m_videoFPSq;
          m_videoPrevFPSCount = 0;
          m_videoEOF = false;
-@@ -939,9 +939,9 @@
+@@ -799,9 +799,9 @@
  
  		if (m_cameras.back().m_camera.isOpened())
  		{
@@ -75,7 +66,7 @@
  
  			//m_cameras.back().m_videoFPS = m_cameras.back().m_videoFPS < 0 ? 16.3f : m_cameras.back().m_videoFPS;
  
-@@ -1012,7 +1012,7 @@
+@@ -872,7 +872,7 @@
      // position the text in the top left corner
      cv::Point textOrg(6, textSize.height+10);
      // then put the text itself
@@ -83,6 +74,13 @@
 +    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)
-
-
+ void ATVModSource::applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force)
+@@ -1028,7 +1028,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;
+     }