Wed Oct 19 18:38:30 2022 UTC ()
gr-osmosdr: fix building + cleanups


(adam)
diff -r1.41 -r1.42 pkgsrc/ham/gr-osmosdr/Makefile
diff -r1.3 -r1.4 pkgsrc/ham/gr-osmosdr/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/ham/gr-osmosdr/distinfo
diff -r0 -r1.3 pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
cvs diff -r1.41 -r1.42 pkgsrc/ham/gr-osmosdr/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gr-osmosdr/Makefile 2022/09/11 12:51:56 1.41
+++ pkgsrc/ham/gr-osmosdr/Makefile 2022/10/19 18:38:29 1.42
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.41 2022/09/11 12:51:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.42 2022/10/19 18:38:29 adam Exp $
2 2
3DISTNAME= gr-osmosdr-0.2.3.20210128 3DISTNAME= gr-osmosdr-0.2.3.20210128
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= ham 5CATEGORIES= ham
6# main git repo doesn't allow snapshots to be downloaded 6# main git repo doesn't allow snapshots to be downloaded
7#MASTER_SITES= https://git.osmocom.org/gr-osmosdr/snapshot/ 7#MASTER_SITES= https://git.osmocom.org/gr-osmosdr/snapshot/
8MASTER_SITES= ${MASTER_SITE_GITHUB:=osmocom/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=osmocom/}
9GITHUB_TAG= a100eb024c0210b95e4738b6efd836d48225bd03 9GITHUB_TAG= a100eb024c0210b95e4738b6efd836d48225bd03
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://git.osmocom.org/gr-osmosdr 12HOMEPAGE= https://git.osmocom.org/gr-osmosdr
13COMMENT= SDR Hardware support for OsmoSDR and so many more 13COMMENT= SDR Hardware support for OsmoSDR and so many more
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16# for docs/doxygen/update_pydoc.py 16# for docs/doxygen/update_pydoc.py
17BUILD_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 17BUILD_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
18 18
19USE_LANGUAGES= c c++ 19USE_CMAKE= yes
20USE_TOOLS= cmake 20USE_LANGUAGES= c c++11
21USE_CMAKE= yes 21USE_TOOLS= cmake
22 22
23# Suppress warning for developer 23# Suppress warning for developer
24CMAKE_ARGS+= -Wno-dev 24CMAKE_ARGS+= -Wno-dev
25# TODO: make it PKG_OPTION 25# TODO: make it PKG_OPTION
26CMAKE_ARGS+= -DENABLE_DOXYGEN=OFF 26CMAKE_ARGS+= -DENABLE_DOXYGEN=OFF
27CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11 27CMAKE_ARGS+= -Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
28 28
29PLIST_SUBST+= PYSITELIB=${PYSITELIB} 29PLIST_SUBST+= PYSITELIB=${PYSITELIB}
30 30
31PYTHON_VERSIONS_INCOMPATIBLE= 27 31PYTHON_VERSIONS_INCOMPATIBLE= 27
32REPLACE_PYTHON+= apps/osmocom_siggen_base.py 32REPLACE_PYTHON+= apps/osmocom_siggen_base.py
33 33
34.include "../../audio/libsndfile/buildlink3.mk" 34.include "../../audio/libsndfile/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/ham/gr-osmosdr/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/ham/gr-osmosdr/buildlink3.mk 2021/12/11 14:57:52 1.3
+++ pkgsrc/ham/gr-osmosdr/buildlink3.mk 2022/10/19 18:38:29 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.3 2021/12/11 14:57:52 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2022/10/19 18:38:29 adam Exp $
2 2
3BUILDLINK_TREE+= gr-osmosdr 3BUILDLINK_TREE+= gr-osmosdr
4 4
5.if !defined(GR_OSMOSDR_BUILDLINK3_MK) 5.if !defined(GR_OSMOSDR_BUILDLINK3_MK)
6GR_OSMOSDR_BUILDLINK3_MK:= 6GR_OSMOSDR_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gr-osmosdr+= gr-osmosdr>=0.2.2 8BUILDLINK_API_DEPENDS.gr-osmosdr+= gr-osmosdr>=0.2.2
9BUILDLINK_ABI_DEPENDS.gr-osmosdr?= gr-osmosdr>=0.2.3.20210128nb4 9BUILDLINK_ABI_DEPENDS.gr-osmosdr+= gr-osmosdr>=0.2.3.20210128nb4
10BUILDLINK_PKGSRCDIR.gr-osmosdr?= ../../ham/gr-osmosdr 10BUILDLINK_PKGSRCDIR.gr-osmosdr?= ../../ham/gr-osmosdr
11 11
12.include "../../devel/boost-headers/buildlink3.mk" 12.include "../../devel/boost-headers/buildlink3.mk"
13.include "../../ham/gnuradio-core/buildlink3.mk" 13.include "../../ham/gnuradio-core/buildlink3.mk"
14.endif # GR_OSMOSDR_BUILDLINK3_MK 14.endif # GR_OSMOSDR_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -gr-osmosdr 16BUILDLINK_TREE+= -gr-osmosdr
cvs diff -r1.8 -r1.9 pkgsrc/ham/gr-osmosdr/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/gr-osmosdr/distinfo 2021/10/26 10:48:38 1.8
+++ pkgsrc/ham/gr-osmosdr/distinfo 2022/10/19 18:38:29 1.9
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.8 2021/10/26 10:48:38 nia Exp $ 1$NetBSD: distinfo,v 1.9 2022/10/19 18:38:29 adam Exp $
2 2
3BLAKE2s (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = c51b58c1df98f15dac979569b0919ddbeb48da4333777f01b777b2e45b4f2ced 3BLAKE2s (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = c51b58c1df98f15dac979569b0919ddbeb48da4333777f01b777b2e45b4f2ced
4SHA512 (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470 4SHA512 (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470
5Size (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 257938 bytes 5Size (gr-osmosdr-0.2.3.20210128-a100eb024c0210b95e4738b6efd836d48225bd03.tar.gz) = 257938 bytes
 6SHA1 (patch-lib_hackrf_hackrf__sink__c.cc) = fecc8e73b15d2fb052ae9a22dea6404598dfc553
File Added: pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
$NetBSD: patch-lib_hackrf_hackrf__sink__c.cc,v 1.3 2022/10/19 18:38:29 adam Exp $

ISO C++17 does not allow 'register' storage class specifier.

--- lib/hackrf/hackrf_sink_c.cc.orig	2022-10-19 18:33:40.000000000 +0000
+++ lib/hackrf/hackrf_sink_c.cc
@@ -299,7 +299,7 @@ void convert_avx(const float* inbuf, int
 #elif USE_SSE2
 void convert_sse2(const float* inbuf, int8_t* outbuf,const unsigned int count)
 {
-  const register __m128 mulme = _mm_set_ps( 127.0f, 127.0f, 127.0f, 127.0f );
+  const __m128 mulme = _mm_set_ps( 127.0f, 127.0f, 127.0f, 127.0f );
   __m128 itmp1,itmp2,itmp3,itmp4;
   __m128i otmp1,otmp2,otmp3,otmp4;