Fix boost endian fallout

5 files changed, 81 insertions, 1 deletions

diff --git a/ham/gr-osmosdr/distinfo b/ham/gr-osmosdr/distinfo
index e6be1d121e3..7c098371a49 100644
--- a/ham/gr-osmosdr/distinfo
+++ b/ham/gr-osmosdr/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.3 2015/11/02 23:57:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/05/14 19:21:34 joerg Exp $
 
 SHA1 (gr-osmosdr-0.1.4.tar.gz) = 672041a6ffa767d39ffad2432e2a13c11e3ec984
 RMD160 (gr-osmosdr-0.1.4.tar.gz) = 30f97d10655e5a88fdf2bf43a323ea9d9aba0479
 SHA512 (gr-osmosdr-0.1.4.tar.gz) = b364f95c140ba61ab1fc51c49fd01cf4d0db4ce3c3a7680f34ea13bc646820d9b2b860bc0438df83df942249fa959cb90f83c5d117737cd0818db35c27253e65
 Size (gr-osmosdr-0.1.4.tar.gz) = 222961 bytes
+SHA1 (patch-lib_airspy_airspy__source__c.cc) = 40e6aedace7fb1754c9dd0096d463c8c8a2799da
+SHA1 (patch-lib_hackrf_hackrf__sink__c.cc) = 659d8a5746babf23f8b08504c4584375ef38d5e4
+SHA1 (patch-lib_hackrf_hackrf__source__c.cc) = f67d6e4ff2de59e2131d39415a337e19f836135d
+SHA1 (patch-lib_rtl_rtl__source__c.cc) = 927868f6320a94cc94a7134d20913644acfc356d
diff --git a/ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc b/ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
new file mode 100644
index 00000000000..26450cef88a
--- /dev/null
+++ b/ham/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_airspy_airspy__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
+
+--- lib/airspy/airspy_source_c.cc.orig	2020-05-10 20:51:56.395303506 +0000
++++ lib/airspy/airspy_source_c.cc
+@@ -32,7 +32,6 @@
+ 
+ #include <boost/assign.hpp>
+ #include <boost/format.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/thread/thread.hpp>
+ 
diff --git a/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc b/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
new file mode 100644
index 00000000000..69e3a8c1983
--- /dev/null
+++ b/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_hackrf_hackrf__sink__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
+
+--- lib/hackrf/hackrf_sink_c.cc.orig	2020-05-10 20:51:58.688391524 +0000
++++ lib/hackrf/hackrf_sink_c.cc
+@@ -39,7 +39,6 @@
+ 
+ #include <boost/assign.hpp>
+ #include <boost/format.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/thread/thread.hpp>
+ 
diff --git a/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc b/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
new file mode 100644
index 00000000000..d3ce22257fe
--- /dev/null
+++ b/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
@@ -0,0 +1,26 @@
+$NetBSD: patch-lib_hackrf_hackrf__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
+
+--- lib/hackrf/hackrf_source_c.cc.orig	2020-05-10 20:52:00.651452193 +0000
++++ lib/hackrf/hackrf_source_c.cc
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/assign.hpp>
+ #include <boost/format.hpp>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/thread/thread.hpp>
+ 
+@@ -119,10 +119,10 @@ hackrf_source_c::hackrf_source_c (const 
+ 
+   // create a lookup table for gr_complex values
+   for (unsigned int i = 0; i <= 0xffff; i++) {
+-#ifdef BOOST_LITTLE_ENDIAN
++#if BOOST_ENDIAN_BIG_BYTE
+     _lut.push_back( gr_complex( (float(char(i & 0xff))) * (1.0f/128.0f),
+                                 (float(char(i >> 8))) * (1.0f/128.0f) ) );
+-#else // BOOST_BIG_ENDIAN
++#else // BOOST_ENDIAN_BIG_BYTE
+     _lut.push_back( gr_complex( (float(char(i >> 8))) * (1.0f/128.0f),
+                                 (float(char(i & 0xff))) * (1.0f/128.0f) ) );
+ #endif
diff --git a/ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc b/ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc
new file mode 100644
index 00000000000..ad36b5cd8af
--- /dev/null
+++ b/ham/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc
@@ -0,0 +1,26 @@
+$NetBSD: patch-lib_rtl_rtl__source__c.cc,v 1.1 2020/05/14 19:21:34 joerg Exp $
+
+--- lib/rtl/rtl_source_c.cc.orig	2020-05-10 20:52:02.745101595 +0000
++++ lib/rtl/rtl_source_c.cc
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/assign.hpp>
+ #include <boost/format.hpp>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+ #include <boost/algorithm/string.hpp>
+ 
+ #include <stdexcept>
+@@ -173,10 +173,10 @@ rtl_source_c::rtl_source_c (const std::s
+ 
+   // create a lookup table for gr_complex values
+   for (unsigned int i = 0; i <= 0xffff; i++) {
+-#ifdef BOOST_LITTLE_ENDIAN
++#if BOOST_ENDIAN_LITTLE_BYTE
+     _lut.push_back( gr_complex( (float(i & 0xff) - 127.4f) * (1.0f/128.0f),
+                                 (float(i >> 8) - 127.4f) * (1.0f/128.0f) ) );
+-#else // BOOST_BIG_ENDIAN
++#else // BOOST_ENDIAN_BIG_BYTE
+     _lut.push_back( gr_complex( (float(i >> 8) - 127.4f) * (1.0f/128.0f),
+                                 (float(i & 0xff) - 127.4f) * (1.0f/128.0f) ) );
+ #endif