From 1f2f19dc9512f156e27be38f68a8c56d77d2f06d Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Sun, 17 Jan 2021 19:18:45 -0600
Subject: [PATCH 1/9] Mainly changes to use the https://github.com/osmocom
 mirrors

---
 gnuradio.lwr    | 2 +-
 gr-fosphor.lwr  | 3 ++-
 gr-iqbal.lwr    | 3 ++-
 gr-op25.lwr     | 3 ++-
 gr-osmosdr.lwr  | 4 +++-
 libosmo-dsp.lwr | 3 ++-
 libosmocore.lwr | 3 ++-
 osmo-fl2k.lwr   | 3 ++-
 osmo-sdr.lwr    | 4 +++-
 osmo-tetra.lwr  | 3 ++-
 rtl-sdr.lwr     | 3 ++-
 11 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/gnuradio.lwr b/gnuradio.lwr
index 2285823..598147d 100644
--- a/gnuradio.lwr
+++ b/gnuradio.lwr
@@ -56,7 +56,7 @@ source: git+https://github.com/gnuradio/gnuradio.git
 gitbranch: maint-3.8
 gitargs: --recursive
 vars: # We explicitly enable some subcomponents to make sure the build fails if they're not working:
-  config_opt: " -DENABLE_DOXYGEN=$builddocs -DENABLE_GR_AUDIO=ON -DENABLE_GR_BLOCKS=ON -DENABLE_GR_DIGITAL=ON -DENABLE_GR_FEC=ON -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER=ON -DENABLE_GR_QTGUI=ON -DENABLE_GR_UHD=ON -DENABLE_PYTHON=ON -DENABLE_VOLK=ON -DENABLE_GRC=ON "
+  config_opt: " -DENABLE_CTRLPORT_THRIFT=OFF -DENABLE_DOXYGEN=$builddocs -DENABLE_GR_AUDIO=ON -DENABLE_GR_BLOCKS=ON -DENABLE_GR_DIGITAL=ON -DENABLE_GR_FEC=ON -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER=ON -DENABLE_GR_QTGUI=ON -DENABLE_GR_UHD=ON -DENABLE_PYTHON=ON -DENABLE_VOLK=ON -DENABLE_GRC=ON "
 inherit: cmake
 configure_static: cmake .. -DCMAKE_BUILD_TYPE=$cmakebuildtype -DCMAKE_INSTALL_PREFIX=$prefix -DENABLE_STATIC_LIBS=True $config_opt
 install: |
diff --git a/gr-fosphor.lwr b/gr-fosphor.lwr
index 0d108bf..6a6fcb4 100644
--- a/gr-fosphor.lwr
+++ b/gr-fosphor.lwr
@@ -26,4 +26,5 @@ gitbranch: master
 inherit: cmake
 satisfy:
   port: gr-fosphor
-source: git+https://git.osmocom.org/gr-fosphor
+#source: git+https://git.osmocom.org/gr-fosphor
+source: git+https://github.com/osmocom/gr-fosphor
diff --git a/gr-iqbal.lwr b/gr-iqbal.lwr
index 05f19ff..7f886e2 100644
--- a/gr-iqbal.lwr
+++ b/gr-iqbal.lwr
@@ -25,4 +25,5 @@ description: Gnuradio I/Q balancing
 gitbranch: master
 inherit: cmake
 # Let's always build this from source, not binaries
-source: git+https://git.osmocom.org/gr-iqbal
+#source: git+https://git.osmocom.org/gr-iqbal
+source: git+https://github.com/osmocom/gr-iqbal
diff --git a/gr-op25.lwr b/gr-op25.lwr
index bfd722d..ced88ea 100644
--- a/gr-op25.lwr
+++ b/gr-op25.lwr
@@ -27,4 +27,5 @@ depends:
 description: Implementation of the APCO Project 25 digital radio standard
 gitbranch: master
 inherit: cmake
-source: git+https://git.osmocom.org/op25
+#source: git+https://git.osmocom.org/op25
+source: git+https://github.com/osmocom/op25
diff --git a/gr-osmosdr.lwr b/gr-osmosdr.lwr
index f40f1f9..ba9c510 100644
--- a/gr-osmosdr.lwr
+++ b/gr-osmosdr.lwr
@@ -34,6 +34,8 @@ description: Interface API independent of the underlying radio hardware
 gitbranch: master
 inherit: cmake
 # Let's always build this from source, not binaries
-source: git+https://git.osmocom.org/gr-osmosdr
+#source: git+https://git.osmocom.org/gr-osmosdr
+#source: git+https://github.com/xtrx-sdr/gr-osmosdr
+source: git+https://github.com/osmocom/gr-osmosdr
 vars:
   config_opt: ' -DENABLE_NONFREE=TRUE '
diff --git a/libosmo-dsp.lwr b/libosmo-dsp.lwr
index e8e3595..c2d79a1 100644
--- a/libosmo-dsp.lwr
+++ b/libosmo-dsp.lwr
@@ -29,5 +29,6 @@ gitbranch: master
 inherit: autoconf
 satisfy:
   port: libosmo-dsp
-source: git+https://git.osmocom.org/libosmo-dsp
+#source: git+https://git.osmocom.org/libosmo-dsp
+source: git+https://github.com/osmocom/libosmo-dsp
 installdir: .
diff --git a/libosmocore.lwr b/libosmocore.lwr
index 3818d6a..75e6478 100644
--- a/libosmocore.lwr
+++ b/libosmocore.lwr
@@ -32,6 +32,7 @@ depends:
 description: A library with generic ulitity functions developed by Osmocom project
 gitbranch: master
 inherit: autoconf
-source: git+https://git.osmocom.org/libosmocore
+#source: git+https://git.osmocom.org/libosmocore
+source: git+https://github.com/osmocom/libosmocore
 vars:
   config_opt: ' --disable-libsctp '
diff --git a/osmo-fl2k.lwr b/osmo-fl2k.lwr
index b366719..bb5c698 100644
--- a/osmo-fl2k.lwr
+++ b/osmo-fl2k.lwr
@@ -23,4 +23,5 @@ depends:
 description: Turns FL2000-based USB 3.0 to VGA adapters into low cost DACs
 gitbranch: master
 inherit: cmake
-source: git+https://git.osmocom.org/osmo-fl2k
+#source: git+https://git.osmocom.org/osmo-fl2k
+source: git+https://github.com/osmocom/osmo-fl2k
diff --git a/osmo-sdr.lwr b/osmo-sdr.lwr
index d925930..587f856 100644
--- a/osmo-sdr.lwr
+++ b/osmo-sdr.lwr
@@ -29,4 +29,6 @@ makedir: software/libosmosdr/build
 satisfy:
   deb: osmo-sdr && libosmosdr-dev
   pacman: gnuradio-osmosdr
-source: git+https://git.osmocom.org/osmo-sdr
+#source: git+https://git.osmocom.org/osmo-sdr
+#source: git+https://github.com/osmocom/osmo-sdr
+source: git+https://github.com/curtcorum/osmo-sdr
diff --git a/osmo-tetra.lwr b/osmo-tetra.lwr
index 70bc469..edadbb6 100644
--- a/osmo-tetra.lwr
+++ b/osmo-tetra.lwr
@@ -40,7 +40,8 @@ make: 'cd ../src
   make
 
   '
-source: git+https://git.osmocom.org/osmo-tetra
+#source: git+https://git.osmocom.org/osmo-tetra
+source: git+https://github.com/osmocom/osmo-tetra
 uninstall: 'rm $prefix/lib/libosmo-tetra-mac.a
 
   rm $prefix/lib/libosmo-tetra-phy.a
diff --git a/rtl-sdr.lwr b/rtl-sdr.lwr
index 27301cc..4003c12 100644
--- a/rtl-sdr.lwr
+++ b/rtl-sdr.lwr
@@ -29,6 +29,7 @@ satisfy:
   portage: net-wireless/rtl-sdr
   pacman: rtl-sdr
   rpm: rtl-sdr
-source: git+https://git.osmocom.org/rtl-sdr
+#source: git+https://git.osmocom.org/rtl-sdr
+source: git+https://github.com/osmocom/rtl-sdr
 vars:
   config_opt: ' -DDETACH_KERNEL_DRIVER=ON '

From 77df64c67957b5d58bebaa8ad9efb2a688ed3ac3 Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Sun, 17 Jan 2021 19:30:29 -0600
Subject: [PATCH 2/9] removing trimmed fork for osmo-sdr fast download

---
 osmo-sdr.lwr | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osmo-sdr.lwr b/osmo-sdr.lwr
index 587f856..79a3209 100644
--- a/osmo-sdr.lwr
+++ b/osmo-sdr.lwr
@@ -30,5 +30,4 @@ satisfy:
   deb: osmo-sdr && libosmosdr-dev
   pacman: gnuradio-osmosdr
 #source: git+https://git.osmocom.org/osmo-sdr
-#source: git+https://github.com/osmocom/osmo-sdr
-source: git+https://github.com/curtcorum/osmo-sdr
+source: git+https://github.com/osmocom/osmo-sdr

From 9248146f1b8a6fd62f3391bc28852855bff291dc Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Sun, 17 Jan 2021 19:34:22 -0600
Subject: [PATCH 3/9]  removed config_opt -DENABLE_CTRLPORT_THRIFT=OFF

---
 gnuradio.lwr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnuradio.lwr b/gnuradio.lwr
index 598147d..2285823 100644
--- a/gnuradio.lwr
+++ b/gnuradio.lwr
@@ -56,7 +56,7 @@ source: git+https://github.com/gnuradio/gnuradio.git
 gitbranch: maint-3.8
 gitargs: --recursive
 vars: # We explicitly enable some subcomponents to make sure the build fails if they're not working:
-  config_opt: " -DENABLE_CTRLPORT_THRIFT=OFF -DENABLE_DOXYGEN=$builddocs -DENABLE_GR_AUDIO=ON -DENABLE_GR_BLOCKS=ON -DENABLE_GR_DIGITAL=ON -DENABLE_GR_FEC=ON -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER=ON -DENABLE_GR_QTGUI=ON -DENABLE_GR_UHD=ON -DENABLE_PYTHON=ON -DENABLE_VOLK=ON -DENABLE_GRC=ON "
+  config_opt: " -DENABLE_DOXYGEN=$builddocs -DENABLE_GR_AUDIO=ON -DENABLE_GR_BLOCKS=ON -DENABLE_GR_DIGITAL=ON -DENABLE_GR_FEC=ON -DENABLE_GR_FFT=ON -DENABLE_GR_FILTER=ON -DENABLE_GR_QTGUI=ON -DENABLE_GR_UHD=ON -DENABLE_PYTHON=ON -DENABLE_VOLK=ON -DENABLE_GRC=ON "
 inherit: cmake
 configure_static: cmake .. -DCMAKE_BUILD_TYPE=$cmakebuildtype -DCMAKE_INSTALL_PREFIX=$prefix -DENABLE_STATIC_LIBS=True $config_opt
 install: |

From f1e13853e8fc1b013f943ebc2a983c04a0bdfcc0 Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 18:38:50 -0600
Subject: [PATCH 4/9] changes for python2 build using gnuradio-stable

---
 gnuradio-stable.lwr | 4 +++-
 libvolk.lwr         | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnuradio-stable.lwr b/gnuradio-stable.lwr
index 0373c7e..6602ec3 100644
--- a/gnuradio-stable.lwr
+++ b/gnuradio-stable.lwr
@@ -19,6 +19,7 @@
 
 inherit: prefix
 depends:
+	- cheetah
         - gnuradio
 config:
   packages:
@@ -34,4 +35,5 @@ config:
       gitbranch: UHD-3.15.LTS
     gqrx:
       forcebuild: True
-
+    libvolk:
+      gitbranch: maint
diff --git a/libvolk.lwr b/libvolk.lwr
index 3852e08..14c9720 100644
--- a/libvolk.lwr
+++ b/libvolk.lwr
@@ -23,7 +23,6 @@ depends:
 description: Vector Optimized Library of Kernels
 satisfy:
   deb: libvolk2-dev
-gitbranch: master
 gitargs: --recursive
 inherit: cmake
 source: git+https://github.com/gnuradio/volk.git

From 8d7720f6d1934e3ee5604804ebbfe2704d41e4ea Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 19:17:21 -0600
Subject: [PATCH 5/9] for python3_env build

---
 gnuradio-stable.lwr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnuradio-stable.lwr b/gnuradio-stable.lwr
index 6602ec3..ce9cc88 100644
--- a/gnuradio-stable.lwr
+++ b/gnuradio-stable.lwr
@@ -19,7 +19,8 @@
 
 inherit: prefix
 depends:
-	- cheetah
+        - mako
+        - cheetah
         - gnuradio
 config:
   packages:

From 85993d5ac0262855ebce0714175bb5f52696a0ca Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 19:27:37 -0600
Subject: [PATCH 6/9] more messing with gnuradio-stable and libvolk for build
 under python2_env and python3_env

---
 gnuradio-stable.lwr | 4 +---
 libvolk.lwr         | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnuradio-stable.lwr b/gnuradio-stable.lwr
index ce9cc88..36058ce 100644
--- a/gnuradio-stable.lwr
+++ b/gnuradio-stable.lwr
@@ -19,9 +19,7 @@
 
 inherit: prefix
 depends:
-        - mako
-        - cheetah
-        - gnuradio
+        - gnuradio37
 config:
   packages:
     apache-thrift:
diff --git a/libvolk.lwr b/libvolk.lwr
index 14c9720..ded2ab6 100644
--- a/libvolk.lwr
+++ b/libvolk.lwr
@@ -19,6 +19,7 @@
 
 category: common
 depends:
+- cheetah
 - mako
 description: Vector Optimized Library of Kernels
 satisfy:

From 87e20fccbcb326ace359ac3f8169b276a57110cb Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:27:19 -0600
Subject: [PATCH 7/9] more 3.7 and 3.8 modifications

---
 gnuradio-default.lwr | 2 ++
 gnuradio-stable.lwr  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gnuradio-default.lwr b/gnuradio-default.lwr
index 8d1b2cd..aea57f4 100644
--- a/gnuradio-default.lwr
+++ b/gnuradio-default.lwr
@@ -36,3 +36,5 @@ config:
       gitbranch: maint-3.8
     gr-lfast:
       gitbranch: maint-3.8
+    gr-iqbal:
+      gitbranch: gr3.8
diff --git a/gnuradio-stable.lwr b/gnuradio-stable.lwr
index 36058ce..7a1463b 100644
--- a/gnuradio-stable.lwr
+++ b/gnuradio-stable.lwr
@@ -36,3 +36,5 @@ config:
       forcebuild: True
     libvolk:
       gitbranch: maint
+    gr-iqbal:
+      gitbranch: gr3.7

From 83f0a37352219bf22f3ed7bf66efd8cdefe24e16 Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 22:08:43 -0600
Subject: [PATCH 8/9] doh, dont use gnuradio37 as a repository...only a recipe

---
 gnuradio-stable.lwr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnuradio-stable.lwr b/gnuradio-stable.lwr
index 7a1463b..e5bd35e 100644
--- a/gnuradio-stable.lwr
+++ b/gnuradio-stable.lwr
@@ -19,7 +19,7 @@
 
 inherit: prefix
 depends:
-        - gnuradio37
+        - gnuradio
 config:
   packages:
     apache-thrift:

From ff59a3212dcdae318df3787ecac3e45567bd3ec9 Mon Sep 17 00:00:00 2001
From: curtcorum <1796102+curtcorum@users.noreply.github.com>
Date: Tue, 19 Jan 2021 22:13:09 -0600
Subject: [PATCH 9/9] commented out gitbranch, get from gnuradio recipe

---
 gr-iqbal.lwr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gr-iqbal.lwr b/gr-iqbal.lwr
index 7f886e2..dbd0073 100644
--- a/gr-iqbal.lwr
+++ b/gr-iqbal.lwr
@@ -22,7 +22,7 @@ depends:
 - gnuradio
 - libosmo-dsp
 description: Gnuradio I/Q balancing
-gitbranch: master
+#gitbranch: master
 inherit: cmake
 # Let's always build this from source, not binaries
 #source: git+https://git.osmocom.org/gr-iqbal