(ham/gnuradio-core) convert path pkgsrc/ham -> pkgsrc/wip

[Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (CF-SX3) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Mon Sep 16 17:43:13 2019 +0900
Changeset:	8681c44aa79472b9baee0afdd3c8150c8a064a62

Modified Files:
	gnuradio-core/Makefile
	gnuradio-core/Makefile.common
	gnuradio-core/Makefile.version
	gnuradio-core/Nocore.mk
	gnuradio-core/distinfo
	gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h

Log Message:
(ham/gnuradio-core) convert path pkgsrc/ham -> pkgsrc/wip

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

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

diffstat:
 gnuradio-core/Makefile                                  |  1 -
 gnuradio-core/Makefile.common                           | 12 ++++++------
 gnuradio-core/Makefile.version                          |  2 +-
 gnuradio-core/Nocore.mk                                 |  4 ++--
 gnuradio-core/distinfo                                  | 17 +++++++----------
 .../patches/patch-gr-audio_lib_alsa_alsa__impl_h        | 12 ++++++------
 6 files changed, 22 insertions(+), 26 deletions(-)

diffs:
diff --git a/gnuradio-core/Makefile b/gnuradio-core/Makefile
index 66b6b5d5cf..b87e496388 100644
--- a/gnuradio-core/Makefile
+++ b/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.69 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
-PKGREVISION=	3
 COMMENT=	Core part of GNU Radio, all others need this
 
 PLIST_MINUS=	# empty
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index 1688719f68..30a22ca7ef 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2019/09/02 13:19:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2019/04/26 13:14:02 maya Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -29,7 +29,7 @@
 # used by ham/gnuradio-wxgui/Makefile
 # used by ham/gnuradio-zeromq/Makefile
 
-.include	"../../ham/gnuradio-core/Makefile.version"
+.include	"../../wip/gnuradio-core/Makefile.version"
 
 DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
@@ -50,10 +50,10 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # gr_filter_design in gnuradio-core ask for:
 DEPENDS+=	${PYPKGPREFIX}-qwt-qt4-[0-9]*:../../x11/py-qwt-qt4
 
-DISTINFO_FILE=		${.CURDIR}/../../ham/gnuradio-core/distinfo
-PATCHDIR=		${.CURDIR}/../../ham/gnuradio-core/patches
+DISTINFO_FILE=		${.CURDIR}/../../wip/gnuradio-core/distinfo
+PATCHDIR=		${.CURDIR}/../../wip/gnuradio-core/patches
 
-PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 3.3.0
+PYTHON_VERSIONS_INCOMPATIBLE=    36 37 # not yet ported as of 3.3.0
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PY_PATCHPLIST=	yes
@@ -123,7 +123,7 @@ SUBST_VARS.pyvers+=	PYVERSSUFFIX
 SUBST_STAGE.pyvers=	pre-configure
 
 # REPLACE_PYTHON is some 600 files
-.include	"../../ham/gnuradio-core/files/REPLACE_PYTHON"
+.include	"../../wip/gnuradio-core/files/REPLACE_PYTHON"
 
 pre-configure:
 	(${MKDIR} ${WRKSRC}/build;)
diff --git a/gnuradio-core/Makefile.version b/gnuradio-core/Makefile.version
index 1d4163897c..ba9b5418f9 100644
--- a/gnuradio-core/Makefile.version
+++ b/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
 # $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
 
-VERSION=        3.7.13.5
+VERSION=        3.8.0.0
diff --git a/gnuradio-core/Nocore.mk b/gnuradio-core/Nocore.mk
index e84507d01a..b90e8c469c 100644
--- a/gnuradio-core/Nocore.mk
+++ b/gnuradio-core/Nocore.mk
@@ -1,6 +1,6 @@
 # $NetBSD: Nocore.mk,v 1.9 2016/07/12 11:36:46 mef Exp $
 
-DEPENDS+=	gnuradio-core-[0-9]*:../../ham/gnuradio-core
+DEPENDS+=	gnuradio-core-[0-9]*:../../wip/gnuradio-core
 
 # Default list for reducing PLIST
 # gnuradio-* names to be common (to get the list to reduce)
@@ -15,7 +15,7 @@ post-install:
 #			    ${DESTDIR}${PREFIX}/${EGDIR}/
 	for i in ${PLIST_MINUS} ; do				\
 	  for p in PLIST PLIST.oss PLIST.${OPSYS} ; do		\
-	    f="${PKGDIR}/../../ham/gnuradio-$${i}/$${p}";	\
+	    f="${PKGDIR}/../../wip/gnuradio-$${i}/$${p}";	\
 	    if [ -f "$${f}" ]; then				\
 	      ${SED} -e 's,$${PYSITELIB},${PYSITELIB},'		\
 	       -e 's,$${PKGVERSION},${PKGVERSION_NOREV},'	\
diff --git a/gnuradio-core/distinfo b/gnuradio-core/distinfo
index 2c1c0369bd..c9457f7292 100644
--- a/gnuradio-core/distinfo
+++ b/gnuradio-core/distinfo
@@ -1,14 +1,11 @@
 $NetBSD: distinfo,v 1.33 2019/07/08 17:50:55 ryoon Exp $
 
-SHA1 (gnuradio-3.7.13.5.tar.gz) = c81a9cb1ec5e9455d885c804ba8fb656c4573b53
-RMD160 (gnuradio-3.7.13.5.tar.gz) = 87786c5f333069c15316c6a45dbce11f329ddac6
-SHA512 (gnuradio-3.7.13.5.tar.gz) = 35fad30ccbc8a82e03d44815bb958dc3718089bce628795ded53f554dff68a4acb1a0f1110b97446f5dc0182c0313855c0f1624b5e9caea26ae6189be81453bf
-Size (gnuradio-3.7.13.5.tar.gz) = 4548612 bytes
+SHA1 (gnuradio-3.8.0.0.tar.gz) = 1f68b90073fc075de741d67c7569f2f2395e4cc2
+RMD160 (gnuradio-3.8.0.0.tar.gz) = 9f7c41faa72ab6801abd6decfdb98edc710775f6
+SHA512 (gnuradio-3.8.0.0.tar.gz) = 1a3be19f26183d0e953ad1b484de68eb8d452a80a58a76a3982191f6a7964f6f1ea7d37b0c7e309317965432c0b239ab5c3f4d1db60cdc26e8d65aec119cc7bc
+Size (gnuradio-3.8.0.0.tar.gz) = 3557884 bytes
+SHA1 (patch-CMakeLists.txt) = 1e59a7475bc814dc4768e7a9c77894c6351a5726
 SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
+SHA1 (patch-gnuradio-runtime_lib_thread_thread__cc) = 58f0efaa9c9d401a45d8d5300aba8b6b1c4bb0a2
 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
-SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5
-SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7
-SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
-SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 96a0f5c17fdea993531846ef011767c999d17d36
-SHA1 (patch-gr-blocks_lib_tcp__connection.cc) = ef932b7a4d87d7fd2ed6dcff5ab2d75b25095acc
-SHA1 (patch-gr-blocks_lib_tcp__connection.h) = ef6e19424a07f4cf16dbac834bdb48f3f639ebf5
+SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = 565b4ada865395f19228511659bfc489a5a9583f
diff --git a/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h b/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
index 2817e39be0..8eb747fb98 100644
--- a/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
+++ b/gnuradio-core/patches/patch-gr-audio_lib_alsa_alsa__impl_h
@@ -4,16 +4,16 @@ gnuradio-3.7.2.1/gr-audio/lib/alsa/alsa_source.cc:477:23: error: 'ESTRPIPE' was
 See also
 https://mail-index.netbsd.org/pkgsrc-wip-discuss/2013/10/27/msg002529.html
 
---- gr-audio/lib/alsa/alsa_impl.h.orig	2014-09-06 18:07:27.000000000 +0900
-+++ gr-audio/lib/alsa/alsa_impl.h	2014-09-06 18:07:55.000000000 +0900
+--- gr-audio/lib/alsa/alsa_impl.h.orig	2019-08-10 06:40:34.000000000 +0900
++++ gr-audio/lib/alsa/alsa_impl.h	2019-09-10 21:21:40.475233198 +0900
 @@ -26,6 +26,10 @@
- #include <stdio.h>
  #include <alsa/asoundlib.h>
+ #include <stdio.h>
  
 +#ifndef ESTRPIPE
 +#define ESTRPIPE EPIPE
 +#endif
 +
- void
- gri_alsa_dump_hw_params (snd_pcm_t *pcm,
- 			 snd_pcm_hw_params_t *hwparams,
+ void gri_alsa_dump_hw_params(snd_pcm_t* pcm, snd_pcm_hw_params_t* hwparams, FILE* fp);
+ 
+ bool gri_alsa_pick_acceptable_format(snd_pcm_t* pcm,