From 26b2ef6228a8fc920727ae64326cdcb5de196efc Mon Sep 17 00:00:00 2001
From: digger vermont <digger@jodig.net>
Date: Sat, 9 Jul 2016 19:03:34 -0400
Subject: [PATCH] Add hamlib and socket for pulseaudio.

Also add modiules for SoapyRTLSDR, and SoapySDRPlay. Both are disabled until dependencies are met.
---
 flatpak/org.gnome.cubicSDR.json | 71 ++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/flatpak/org.gnome.cubicSDR.json b/flatpak/org.gnome.cubicSDR.json
index 65c3aca..175d6fa 100644
--- a/flatpak/org.gnome.cubicSDR.json
+++ b/flatpak/org.gnome.cubicSDR.json
@@ -12,20 +12,6 @@
         "--socket=pulseaudio"
     ],
     "modules": [
-        {
-            "name": "SoapySDR",
-            "cmake": true,
-            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
-            "make-args": ["-j4"],
-            "sources": [ {"type": "git", "url": "https://github.com/pothosware/SoapySDR.git" } ]
-        },
-        {
-            "name": "SoapyAudio",
-            "cmake": true,
-            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
-            "make-args": ["-j4"],
-            "sources": [ { "type": "git", "url": "https://github.com/pothosware/SoapyAudio.git" } ]
-        },
         {
             "name": "liquid-dsp",
             "config-opts": ["--enable-fftoverride"],
@@ -41,12 +27,69 @@
             "make-args": ["-j4"],
             "sources": [ {  "type": "archive", "path": "../SOURCES/glu-9.0.0.tar.gz" } ]
         },
+        {
+            "name": "SoapySDR",
+            "cmake": true,
+            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
+            "make-args": ["-j4"],
+            "sources": [ {"type": "git", "url": "https://github.com/pothosware/SoapySDR.git" } ]
+        },
+        {
+            "name": "SoapyRTLSDR",
+            "disabled": true,
+            "cmake": true,
+            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
+            "make-args": ["-j4"],
+            "sources": [ {"type": "git", "url": "https://github.com/pothosware/SoapyRTLSDR.git" } ],
+            "modules": [
+            {
+                "name": "libudev",
+                "config-opts": [""],
+                "make-args": [""],
+                "sources": [ {"type": "git", "url": "" } ]
+            },
+            {
+                "name": "libusb",
+                "config-opts": [""],
+                "make-args": [""],
+                "sources": [ {"type": "git", "url": "https://github.com/libusb/libusb.git" } ]
+            },
+            {
+                "name": "librtlsdr",
+                "cmake": true,
+                "config-opts": [""],
+                "make-args": [""],
+                "sources": [ {"type": "git", "url": "git://git.osmocom.org/rtl-sdr.git" } ]
+            }
+            ]
+        },
+        {
+            "name": "SoapySDRPlay",
+            "disabled": true,
+            "cmake": true,
+            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
+            "make-args": ["-j4"],
+            "sources": [ {"type": "git", "url": "https://github.com/pothosware/SoapySDRPlay.git" } ]
+        },
+        {
+            "name": "SoapyAudio",
+            "cmake": true,
+            "config-opts": ["-DCMAKE_BUILD_TYPE=Release"],
+            "make-args": ["-j4"],
+            "sources": [ { "type": "git", "url": "https://github.com/pothosware/SoapyAudio.git" } ]
+        },
         {
             "name": "wxWidgets",
             "config-opts": ["--with-opengl", "--with-libjpeg", "--disable-shared", "--enable-monolithic", "--with-libtiff", "--with-libpng", "--with-zlib", "--disable-sdltest", "--enable-unicode", "--enable-display", "--enable-propgrid", "--disable-webkit", "--disable-webview", "--disable-webviewwebkit", "--with-libiconv=/usr" ],
             "cxxflags": [ "-std=c++0x" ],
             "make-args": ["-j4"],
             "sources": [ {  "type": "archive", "path": "../SOURCES/wxWidgets-3.1.0.tar.bz2" } ]
+        },{
+            "name": "hamlib",
+            "config-opts": ["" ],
+            "cxxflags": [ "" ],
+            "make-args": ["-j4"],
+            "sources": [ {  "type": "archive", "path": "../SOURCES/hamlib-3.0.1.tar.gz" } ]
         },
         {
             "name": "CubicSDR",