From 8326487350d908ffd188e8be1c62be81478bfa1d Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Fri, 29 May 2020 23:44:47 +0200
Subject: [PATCH] Fix Flatpak build

---
 flatpak/org.sdrangel.SDRangel.json       | 12 +++++------
 flatpak/sdrangel-set-serialdv-path.patch | 26 ------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 flatpak/sdrangel-set-serialdv-path.patch

diff --git a/flatpak/org.sdrangel.SDRangel.json b/flatpak/org.sdrangel.SDRangel.json
index e55aa7712..523b7c3bb 100644
--- a/flatpak/org.sdrangel.SDRangel.json
+++ b/flatpak/org.sdrangel.SDRangel.json
@@ -354,9 +354,9 @@
       ],
       "sources": [
         {
-          "type": "git",
-          "url": "https://github.com/myriadrf/LimeSuite.git",
-          "commit": "025ffa1a"
+          "type": "archive",
+          "url": "https://github.com/myriadrf/LimeSuite/archive/v20.01.0.tar.gz",
+          "sha256": "3c1d898185419074ada669b6cb93f409f4c97a29df8778284f30f93b7879754d"
         }
       ]
     },
@@ -498,7 +498,7 @@
       "config-opts": [
         "-Wno-dev",
         "-DDEBUG_OUTPUT=ON",
-        "-DBUILD_TYPE=RELEASE",
+        "-DCMAKE_BUILD_TYPE=RELEASE",
         "-DRX_SAMPLE_24BIT=ON"
       ],
       "sources": [
@@ -507,8 +507,8 @@
           "path": ".."
         },
         {
-          "type": "patch",
-          "path": "sdrangel-set-serialdv-path.patch"
+          "type": "shell",
+          "commands": ["sed -e 's|/usr/|/app/|g' -i cmake/Modules/FindSerialDV.cmake"]
         },
         {
           "type": "file",
diff --git a/flatpak/sdrangel-set-serialdv-path.patch b/flatpak/sdrangel-set-serialdv-path.patch
deleted file mode 100644
index e14aff821..000000000
--- a/flatpak/sdrangel-set-serialdv-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/cmake/Modules/FindSerialDV.cmake b/cmake/Modules/FindSerialDV.cmake
-index e4c40b00a..07470e628 100644
---- a/cmake/Modules/FindSerialDV.cmake
-+++ b/cmake/Modules/FindSerialDV.cmake
-@@ -3,8 +3,8 @@
- find_path(LIBSERIALDV_INCLUDE_DIR
-   NAMES dvcontroller.h
-   HINTS ${SERIALDV_DIR}/include/serialdv
--  PATHS /usr/include/serialdv
--        /usr/local/include/serialdv
-+  PATHS /app/include/serialdv
-+        /app/local/include/serialdv
- )
- 
- set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)
-@@ -12,8 +12,8 @@ set(LIBSERIAL_NAMES ${LIBSERIAL_NAMES} serialdv libserialdv)
- find_library(LIBSERIALDV_LIBRARY
-   NAMES serialdv
-   HINTS ${SERIALDV_DIR}/lib
--  PATHS /usr/lib
--        /usr/local/lib
-+  PATHS /app/lib
-+        /app/local/lib
- )
- 
- if (LIBSERIALDV_INCLUDE_DIR AND LIBSERIALDV_LIBRARY)