CVS commit: pkgsrc/ham/gr-osmosdr

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Oct 19 18:38:30 UTC 2022

Modified Files:
        pkgsrc/ham/gr-osmosdr: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/ham/gr-osmosdr/patches: patch-lib_hackrf_hackrf__sink__c.cc

Log Message:
gr-osmosdr: fix building + cleanups


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/gr-osmosdr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/ham/gr-osmosdr/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/gr-osmosdr/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc

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

Modified files:

Index: pkgsrc/ham/gr-osmosdr/Makefile
diff -u pkgsrc/ham/gr-osmosdr/Makefile:1.41 pkgsrc/ham/gr-osmosdr/Makefile:1.42
--- pkgsrc/ham/gr-osmosdr/Makefile:1.41 Sun Sep 11 12:51:56 2022
+++ pkgsrc/ham/gr-osmosdr/Makefile      Wed Oct 19 18:38:29 2022
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.41 2022/09/11 12:51:56 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2022/10/19 18:38:29 adam Exp $
 
-DISTNAME=              gr-osmosdr-0.2.3.20210128
-PKGREVISION=           8
-CATEGORIES=            ham
+DISTNAME=      gr-osmosdr-0.2.3.20210128
+PKGREVISION=   8
+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=            a100eb024c0210b95e4738b6efd836d48225bd03
-
-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
+#MASTER_SITES= https://git.osmocom.org/gr-osmosdr/snapshot/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=osmocom/}
+GITHUB_TAG=    a100eb024c0210b95e4738b6efd836d48225bd03
+
+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
 
 # for docs/doxygen/update_pydoc.py
 BUILD_DEPENDS+=                ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-USE_LANGUAGES=         c c++
-USE_TOOLS=             cmake
-USE_CMAKE=             yes
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++11
+USE_TOOLS=     cmake
 
 # Suppress warning for developer
 CMAKE_ARGS+=   -Wno-dev

Index: pkgsrc/ham/gr-osmosdr/buildlink3.mk
diff -u pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.3 pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.4
--- pkgsrc/ham/gr-osmosdr/buildlink3.mk:1.3     Sat Dec 11 14:57:52 2021
+++ pkgsrc/ham/gr-osmosdr/buildlink3.mk Wed Oct 19 18:38:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2021/12/11 14:57:52 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/10/19 18:38:29 adam Exp $
 
 BUILDLINK_TREE+=       gr-osmosdr
 
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=      gr-osmosdr
 GR_OSMOSDR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gr-osmosdr+=     gr-osmosdr>=0.2.2
-BUILDLINK_ABI_DEPENDS.gr-osmosdr?=     gr-osmosdr>=0.2.3.20210128nb4
+BUILDLINK_ABI_DEPENDS.gr-osmosdr+=     gr-osmosdr>=0.2.3.20210128nb4
 BUILDLINK_PKGSRCDIR.gr-osmosdr?=       ../../ham/gr-osmosdr
 
-.include       "../../devel/boost-headers/buildlink3.mk"
-.include       "../../ham/gnuradio-core/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
 .endif # GR_OSMOSDR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -gr-osmosdr

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

Added files:

Index: pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc
diff -u /dev/null pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc:1.3
--- /dev/null   Wed Oct 19 18:38:30 2022
+++ pkgsrc/ham/gr-osmosdr/patches/patch-lib_hackrf_hackrf__sink__c.cc   Wed Oct 19 18:38:29 2022
@@ -0,0 +1,15 @@
+$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;
+