diff --git a/testing/sdrangel/APKBUILD b/testing/sdrangel/APKBUILD index d1d19d8567f..80f8a2cafe4 100644 --- a/testing/sdrangel/APKBUILD +++ b/testing/sdrangel/APKBUILD @@ -1,18 +1,13 @@ # Contributor: Maya # Maintainer: Maya pkgname=sdrangel -pkgver=7.22.9 +pkgver=7.23.0 pkgrel=0 pkgdesc="SDR Rx/Tx software and analyzer for various hardware" url="https://github.com/f4exb/sdrangel" license="GPL-3.0-or-later" # cm256cc arch="aarch64 x86_64" -depends=" - qt5-qtquickcontrols - qt5-qtquickcontrols2 - qt5-qtgraphicaleffects - " makedepends=" aptdec-dev boost-dev @@ -27,16 +22,17 @@ makedepends=" libusb-dev opencv-dev opus-dev - qt5-qtbase-dev - qt5-qtcharts-dev - qt5-qtgamepad-dev - qt5-qtlocation-dev - qt5-qtmultimedia-dev - qt5-qtserialport-dev - qt5-qtspeech-dev - qt5-qtsvg-dev - qt5-qtwebengine-dev - qt5-qtwebsockets-dev + qt6-qtbase-dev + qt6-qtbase-private-dev + qt6-qtcharts-dev + qt6-qtlocation-dev + qt6-qtmultimedia-dev + qt6-qtscxml-dev + qt6-qtserialport-dev + qt6-qtspeech-dev + qt6-qtsvg-dev + qt6-qtwebengine-dev + qt6-qtwebsockets-dev samurai serialdv-dev soapy-sdr-dev @@ -44,7 +40,9 @@ makedepends=" " source="$pkgname-$pkgver.tar.gz::https://github.com/f4exb/sdrangel/archive/refs/tags/v$pkgver.tar.gz no-march-magic.patch + gles.patch " +options="!check" # no tests build() { CFLAGS="$CFLAGS -O2 -flto=auto" \ @@ -53,6 +51,7 @@ build() { -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDEBUG_OUTPUT=ON \ + -DENABLE_QT6=ON \ -DENABLE_AIRSPY=OFF \ -DENABLE_AIRSPYHF=OFF \ -DENABLE_BLADERF=OFF \ @@ -72,8 +71,7 @@ build() { } check() { - cd build - ctest + ctest --test-dir build } package() { @@ -81,6 +79,7 @@ package() { } sha512sums=" -c7fd8cb3a056cc82bf766d87b8b0e2d8a6fc190264c4d9f1d5f3f066114917bbd05342511dcfc6eef9c121037ee78550b6d16f9014648bb105a2feeb1234e98e sdrangel-7.22.9.tar.gz +36c9bbae627c952a2672ce4f0d5e0716c0e8b3dfee461da3cc429cf3d3a6597f279549239cc887b3702de4505aba3b79a93ded0c20d0d6035ad2fdcc15d13b61 sdrangel-7.23.0.tar.gz 8779ed53c83505df3dac7a0b0a485c939f439a01f5aed203e25652cdb7d17c10ee629fab75b22b1ac9de882bfefbddcf2af5a3a8da75c5fdefc007a8fb9480f8 no-march-magic.patch +70edb741e72ae991ef72f409d046905e9db2f4e8297abe100bc16d4d521c7f1fbcc584e498e51b8f7d29140a63209961e883ca7527a41f40c784acb6a8fb5ca4 gles.patch " diff --git a/testing/sdrangel/gles.patch b/testing/sdrangel/gles.patch new file mode 100644 index 00000000000..cbfea9d6ad2 --- /dev/null +++ b/testing/sdrangel/gles.patch @@ -0,0 +1,22 @@ +--- a/sdrgui/gui/glshaderspectrogram.cpp ++++ b/sdrgui/gui/glshaderspectrogram.cpp +@@ -18,7 +18,7 @@ + + #include + #include +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__aarch64__) + #include + #else + #include +--- a/sdrgui/gui/glshadertvarray.h ++++ b/sdrgui/gui/glshadertvarray.h +@@ -24,7 +24,7 @@ + + #include + #include +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__aarch64__) + #include + #else + #include