pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gr-osmosdr: updated in pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 30 23:38:11 2020 +0200
Changeset:	d345da4a63f10e633e0b232c18495d8b5ab734c6

Modified Files:
	Makefile
Removed Files:
	gr-osmosdr/DESCR
	gr-osmosdr/Makefile
	gr-osmosdr/PLIST
	gr-osmosdr/buildlink3.mk
	gr-osmosdr/distinfo
	gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
	gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
	gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc

Log Message:
gr-osmosdr: updated in pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d345da4a63f10e633e0b232c18495d8b5ab734c6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 -
 gr-osmosdr/DESCR                                   | 19 --------
 gr-osmosdr/Makefile                                | 56 ----------------------
 gr-osmosdr/PLIST                                   | 32 -------------
 gr-osmosdr/buildlink3.mk                           | 15 ------
 gr-osmosdr/distinfo                                |  9 ----
 .../patches/patch-lib_airspy_airspy__source__c.cc  | 12 -----
 .../patches/patch-lib_hackrf_hackrf__source__c.cc  | 26 ----------
 gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc | 12 -----
 9 files changed, 182 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 96a38c204b..724a553a94 100644
--- a/Makefile
+++ b/Makefile
@@ -1239,7 +1239,6 @@ SUBDIR+=	gqrx
 SUBDIR+=	gr-fcdproplus
 SUBDIR+=	gr-fcdproplus-git
 SUBDIR+=	gr-gsm
-SUBDIR+=	gr-osmosdr
 SUBDIR+=	gr-osmosdr-git
 SUBDIR+=	grabtitle-git
 SUBDIR+=	grafana
diff --git a/gr-osmosdr/DESCR b/gr-osmosdr/DESCR
deleted file mode 100644
index 974a78f3f6..0000000000
--- a/gr-osmosdr/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-While primarily being developed for the OsmoSDR hardware, this block
-as well supports:
-
- * FUNcube Dongle through libgnuradio-fcd
- * FUNcube Dongle Pro+ through gr-fcdproplus
- * sysmocom OsmoSDR Devices through libosmosdr
- * RTL2832U based DVB-T dongles through librtlsdr
- * RTL-TCP spectrum server (see librtlsdr project)
- * MSi2500 based DVB-T dongles through libmirisdr
- * gnuradio .cfile input through libgnuradio-blocks
- * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option)
- * AirSpy Wideband Receiver through libairspy
- * Great Scott Gadgets HackRF through libhackrf
- * Nuand LLC bladeRF through libbladeRF library
- * Ettus USRP Devices through Ettus UHD library
- * Fairwaves UmTRX through Fairwaves' fork of UHD
-
-By using the OsmoSDR block you can take advantage of a common software api in
-your application(s) independent of the underlying radio hardware.
diff --git a/gr-osmosdr/Makefile b/gr-osmosdr/Makefile
deleted file mode 100644
index f72470ad0f..0000000000
--- a/gr-osmosdr/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2020/05/06 14:04:43 adam Exp $
-
-DISTNAME=		gr-osmosdr-0.2.0
-CATEGORIES=		ham
-# main git repo doesn't allow snapshots to be downloaded
-#MASTER_SITES=		https://git.osmocom.org/gr-osmosdr/snapshot/
-MASTER_SITES=		${MASTER_SITE_GITHUB:=osmocom/}
-GITHUB_TAG=		v${PKGVERSION_NOREV}
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		https://git.osmocom.org/gr-osmosdr
-COMMENT=		SDR Hardware support for OsmoSDR and so many more
-LICENSE=		gnu-gpl-v2
-
-USE_LANGUAGES=		c c++
-USE_TOOLS=		cmake
-USE_CMAKE=		yes
-
-# Suppress warning for developer
-CMAKE_ARGS+=	-Wno-dev
-# --   * Ettus USRP Devices
-CMAKE_ARGS+=	-DGNURADIO_UHD_INCLUDE_DIRS=${PREFIX}/include/uhd
-CMAKE_ARGS+=	-DGNURADIO_BLOCKS_INCLUDE_DIRS=${PREFIX}/include
-# TODO: make it PKG_OPTION
-CMAKE_ARGS+=	-DENABLE_DOXYGEN=OFF
-
-PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
-
-PYTHON_VERSIONS_ACCEPTED=	37
-REPLACE_PYTHON+=		apps/osmocom_siggen_base.py
-
-.include	"../../devel/boost-headers/buildlink3.mk"
-.include	"../../devel/boost-libs/buildlink3.mk"
-.include	"../../devel/libusb1/buildlink3.mk"
-.include	"../../devel/orc/buildlink3.mk"
-
-# \todo Clearly threre is some ordering scheme.  Explain it.
-
-.include	"../../ham/uhd/buildlink3.mk"
-.include	"../../lang/python/application.mk"
-#.include	"../../lang/python/extension.mk"
-
-.include	"../../ham/rtl-sdr/buildlink3.mk"
-.include	"../../ham/libmirisdr/buildlink3.mk"
-.include	"../../ham/osmo-sdr/buildlink3.mk"
-# \todo Re-enable gr-fcdproplus when it works, or optionize it.
-# gr-fcdproplus does not build at the moment
-#.include	"../../ham/gr-fcdproplus/buildlink3.mk"
-.include	"../../ham/hackrf/buildlink3.mk"
-.include	"../../ham/soapy-sdr/buildlink3.mk"
-
-BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.8
-.include	"../../wip/gnuradio-core/buildlink3.mk"
-.include	"../../wip/gnuradio-uhd/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/gr-osmosdr/PLIST b/gr-osmosdr/PLIST
deleted file mode 100644
index 36b08cc853..0000000000
--- a/gr-osmosdr/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD$
-bin/osmocom_fft
-bin/osmocom_siggen_nogui
-bin/osmocom_spectrum_sense
-include/osmosdr/api.h
-include/osmosdr/device.h
-include/osmosdr/pimpl.h
-include/osmosdr/ranges.h
-include/osmosdr/sink.h
-include/osmosdr/source.h
-include/osmosdr/swig/osmosdr_swig.i
-include/osmosdr/swig/osmosdr_swig_doc.i
-include/osmosdr/time_spec.h
-lib/cmake/osmosdr/gnuradio-osmosdrConfig.cmake
-lib/cmake/osmosdr/gnuradio-osmosdrTargets-release.cmake
-lib/cmake/osmosdr/gnuradio-osmosdrTargets.cmake
-lib/libgnuradio-osmosdr.so
-lib/libgnuradio-osmosdr.so.${PKGVERSION}
-lib/libgnuradio-osmosdr.so.${PKGVERSION}.0
-${PYSITELIB}/osmosdr/__init__.py
-${PYSITELIB}/osmosdr/__init__.pyc
-${PYSITELIB}/osmosdr/__init__.pyo
-${PYSITELIB}/osmosdr/_osmosdr_swig.so
-${PYSITELIB}/osmosdr/osmocom_siggen_base.py
-${PYSITELIB}/osmosdr/osmocom_siggen_base.pyc
-${PYSITELIB}/osmosdr/osmocom_siggen_base.pyo
-${PYSITELIB}/osmosdr/osmosdr_swig.py
-${PYSITELIB}/osmosdr/osmosdr_swig.pyc
-${PYSITELIB}/osmosdr/osmosdr_swig.pyo
-share/gnuradio/grc/blocks/osmosdr_sink.block.yml
-share/gnuradio/grc/blocks/osmosdr_source.block.yml
-share/gnuradio/grc/blocks/rtlsdr_source.block.yml
diff --git a/gr-osmosdr/buildlink3.mk b/gr-osmosdr/buildlink3.mk
deleted file mode 100644
index b98a341881..0000000000
--- a/gr-osmosdr/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/07/25 00:10:43 gdt Exp $
-
-BUILDLINK_TREE+=	gr-osmosdr
-
-.if !defined(GR_OSMOSDR_BUILDLINK3_MK)
-GR_OSMOSDR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gr-osmosdr+=	gr-osmosdr>=0.1.4nb2
-BUILDLINK_PKGSRCDIR.gr-osmosdr?=	../../wip/gr-osmosdr
-
-.include	"../../devel/boost-headers/buildlink3.mk"
-.include	"../../wip/gnuradio-core/buildlink3.mk"
-.endif	# GR_OSMOSDR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-gr-osmosdr
diff --git a/gr-osmosdr/distinfo b/gr-osmosdr/distinfo
deleted file mode 100644
index 8b06600cb1..0000000000
--- a/gr-osmosdr/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2020/05/14 19:21:34 joerg Exp $
-
-SHA1 (gr-osmosdr-0.2.0.tar.gz) = 299df78837446a53562fcd64ca99f28b763bdeb8
-RMD160 (gr-osmosdr-0.2.0.tar.gz) = e4f67b972d81b155419eef383712d53767289bb7
-SHA512 (gr-osmosdr-0.2.0.tar.gz) = 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
-Size (gr-osmosdr-0.2.0.tar.gz) = 251163 bytes
-SHA1 (patch-lib_airspy_airspy__source__c.cc) = 40e6aedace7fb1754c9dd0096d463c8c8a2799da
-SHA1 (patch-lib_hackrf_hackrf__source__c.cc) = f37b11c5ad7c25a5a04be1373fecafc5d25041cd
-SHA1 (patch-lib_rtl_rtl__source__c.cc) = 900aa235c4a21de40f53928408e11968afbad650
diff --git a/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc b/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
deleted file mode 100644
index 26450cef88..0000000000
--- a/gr-osmosdr/patches/patch-lib_airspy_airspy__source__c.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$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/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc b/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
deleted file mode 100644
index 03d7c4b45f..0000000000
--- a/gr-osmosdr/patches/patch-lib_hackrf_hackrf__source__c.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$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-02-16 08:52:00.000000000 +0000
-+++ lib/hackrf/hackrf_source_c.cc
-@@ -31,7 +31,7 @@
- #include <stdexcept>
- #include <iostream>
- 
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
- 
- #include <gnuradio/io_signature.h>
- 
-@@ -90,10 +90,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(int8_t(i & 0xff))) * (1.0f/128.0f),
-                                 (float(int8_t(i >> 8))) * (1.0f/128.0f) ) );
--#else // BOOST_BIG_ENDIAN
-+#else // BOOST_ENDIAN_BIG_BYTE
-     _lut.push_back( gr_complex( (float(int8_t(i >> 8))) * (1.0f/128.0f),
-                                 (float(int8_t(i & 0xff))) * (1.0f/128.0f) ) );
- #endif
diff --git a/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc b/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc
deleted file mode 100644
index 17076a1fcd..0000000000
--- a/gr-osmosdr/patches/patch-lib_rtl_rtl__source__c.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$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-02-16 08:52:00.000000000 +0000
-+++ lib/rtl/rtl_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 <stdexcept>


Home | Main Index | Thread Index | Old Index