Date: Saturday, May 18, 2019 @ 21:12:03
Author: ffy00
Revision: 467897
archrelease: copy trunk to community-x86_64
Added:
sdrangel/repos/community-x86_64/PKGBUILD
(from rev 467896, sdrangel/trunk/PKGBUILD)
sdrangel/repos/community-x86_64/sdrangel-opencv4.patch
(from rev 467896, sdrangel/trunk/sdrangel-opencv4.patch)
sdrangel/repos/community-x86_64/sdrangel.install
(from rev 467896, sdrangel/trunk/sdrangel.install)
Deleted:
sdrangel/repos/community-x86_64/PKGBUILD
sdrangel/repos/community-x86_64/sdrangel-opencv4.patch
------------------------+
PKGBUILD | 112 +++++++++++++++---------------
sdrangel-opencv4.patch | 174 +++++++++++++++++++++++------------------------
sdrangel.install | 4 +
3 files changed, 149 insertions(+), 141 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-18 21:11:47 UTC (rev 467896)
+++ PKGBUILD 2019-05-18 21:12:03 UTC (rev 467897)
@@ -1,54 +0,0 @@
-# Maintainer: Filipe Laíns (FFY00) <filipe.la...@gmail.com>
-# Contributor: Michal Krenek (Mikos) <m.kre...@gmail.com>
-
-pkgname=sdrangel
-pkgver=4.8.0
-pkgrel=1
-pkgdesc='Qt5/OpenGL SDR and signal analyzer frontend'
-arch=('x86_64')
-url='https://github.com/f4exb/sdrangel'
-license=('GPL3')
-depends=('pkg-config' 'log4cpp' 'opencv' 'fftw' 'ffmpeg'
- 'cm256cc' 'dsdcc' 'pulseaudio' 'lz4' 'nanomsg'
- 'qt5-base' 'qt5-tools' 'qt5-multimedia') # QT5
-makedepends=('cmake' 'ffmpeg' 'airspy' 'bladerf' 'hackrf' 'limesuite'
'rtl-sdr' 'boost' 'codec2')
-optdepends=('ffmpeg: DATV demodulator'
- 'rtl-sdr: RTLSDR support'
- 'hackrf: HackRF support'
- 'limesuite: LimeSDR support'
- 'bladerf: BladeRF support'
- 'airspy: AirSPY support'
- 'codec2: Coded2 speech codec support')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
sdrangel-opencv4.patch)
-sha512sums=('d560a415e050044cede2f553aba7fe33ac0dcd1f201a50782b8ef6656190221ea14a643face3746b3c1308b6c923bc6d0be9ac6e8442c8af7ac0dfed9b0b2ce3'
-
'bc9519a0f08cc6372b3290ed475e3a70b71d4a29f2cedefd349f9ba220a9d446c05c02ca648f068ee298612b85faeda96d45d186120555382b2df99596576e7e')
-
-prepare() {
- sed -i 's|sdrangel_icon.xpm|sdrangel.xpm|'
$pkgname-$pkgver/desktop/sdrangel.desktop
- cd $pkgname-$pkgver
- patch -p1 -i ../sdrangel-opencv4.patch # Fix build with openCV 4
-}
-
-build() {
- mkdir -p $pkgname-$pkgver/build
- cd $pkgname-$pkgver/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBDSDCC_INCLUDE_DIR=/usr/include/dsdcc \
- -DCM256CC_INCLUDE_DIR=/usr/include/cm256cc
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver/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
-}
-
Copied: sdrangel/repos/community-x86_64/PKGBUILD (from rev 467896,
sdrangel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-18 21:12:03 UTC (rev 467897)
@@ -0,0 +1,58 @@
+# Maintainer: Filipe Laíns (FFY00) <filipe.la...@gmail.com>
+# Contributor: Michal Krenek (Mikos) <m.kre...@gmail.com>
+
+pkgname=sdrangel
+pkgver=4.8.0
+pkgrel=2
+pkgdesc='Qt5/OpenGL SDR and signal analyzer frontend'
+arch=('x86_64')
+url='https://github.com/f4exb/sdrangel'
+license=('GPL3')
+depends=('pkg-config' 'log4cpp' 'opencv' 'fftw' 'ffmpeg'
+ 'cm256cc' 'dsdcc' 'pulseaudio' 'lz4' 'nanomsg'
+ 'qt5-base' 'qt5-tools' 'qt5-multimedia') # QT5
+makedepends=('cmake' 'ffmpeg' 'airspy' 'bladerf' 'hackrf' 'limesuite'
'rtl-sdr' 'boost' 'codec2')
+optdepends=('ffmpeg: DATV demodulator'
+ 'rtl-sdr: RTLSDR support'
+ 'hackrf: HackRF support'
+ 'limesuite: LimeSDR support'
+ 'bladerf: BladeRF support'
+ 'airspy: AirSPY support'
+ 'codec2: Coded2 speech codec support')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+ 'sdrangel-opencv4.patch')
+sha512sums=('d560a415e050044cede2f553aba7fe33ac0dcd1f201a50782b8ef6656190221ea14a643face3746b3c1308b6c923bc6d0be9ac6e8442c8af7ac0dfed9b0b2ce3'
+
'bc9519a0f08cc6372b3290ed475e3a70b71d4a29f2cedefd349f9ba220a9d446c05c02ca648f068ee298612b85faeda96d45d186120555382b2df99596576e7e')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ sed -i 's|sdrangel_icon.xpm|sdrangel.xpm|' desktop/sdrangel.desktop
+ patch -p1 -i ../sdrangel-opencv4.patch # Fix build with openCV 4
+}
+
+build() {
+ mkdir -p $pkgname-$pkgver/build
+ cd $pkgname-$pkgver/build
+
+ cmake .. \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBDSDCC_INCLUDE_DIR=/usr/include/dsdcc \
+ -DCM256CC_INCLUDE_DIR=/usr/include/cm256cc \
+ -DENABLE_DISTRIBUTION=ON
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/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/sdrangel.desktop
+}
+
Deleted: sdrangel-opencv4.patch
===================================================================
--- sdrangel-opencv4.patch 2019-05-18 21:11:47 UTC (rev 467896)
+++ sdrangel-opencv4.patch 2019-05-18 21:12:03 UTC (rev 467897)
@@ -1,87 +0,0 @@
---- 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)
-
Copied: sdrangel/repos/community-x86_64/sdrangel-opencv4.patch (from rev
467896, sdrangel/trunk/sdrangel-opencv4.patch)
===================================================================
--- sdrangel-opencv4.patch (rev 0)
+++ sdrangel-opencv4.patch 2019-05-18 21:12:03 UTC (rev 467897)
@@ -0,0 +1,87 @@
+--- 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)
+
Copied: sdrangel/repos/community-x86_64/sdrangel.install (from rev 467896,
sdrangel/trunk/sdrangel.install)
===================================================================
--- sdrangel.install (rev 0)
+++ sdrangel.install 2019-05-18 21:12:03 UTC (rev 467897)
@@ -0,0 +1,4 @@
+post_install(){
+ echo "The binaries in the package have limited SIMD support."
+ echo "Please consider using sdrangel-simd from the AUR if you are using
sdrangel from any kind of DSP application or anything else that might be
benefit from SIMD extensions."
+}
