gnuradio-video-sdl: catch up w/ gnuradio-core

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 11:45:22 2020 +0200
Changeset:	7415f6f9e3dc94e2e6a48b054953df229d1a5e49

Modified Files:
	gnuradio-video-sdl/Makefile
	gnuradio-video-sdl/PLIST
	gnuradio-video-sdl/buildlink3.mk

Log Message:
gnuradio-video-sdl: catch up w/ gnuradio-core

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

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

diffstat:
 gnuradio-video-sdl/Makefile      |  8 +++++---
 gnuradio-video-sdl/PLIST         | 10 +++++++---
 gnuradio-video-sdl/buildlink3.mk |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diffs:
diff --git a/gnuradio-video-sdl/Makefile b/gnuradio-video-sdl/Makefile
index 59676bad33..8a29fc2934 100644
--- a/gnuradio-video-sdl/Makefile
+++ b/gnuradio-video-sdl/Makefile
@@ -1,15 +1,17 @@
 # $NetBSD: Makefile,v 1.32 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-video-sdl-${VERSION}
-PKGREVISION=	2
 COMMENT=	SDL (Simple DirectMedia Layer) bindings for GNU Radio
 
-.include	"../../ham/gnuradio-core/Makefile.common"
-.include	"../../ham/gnuradio-core/Nocore.mk"
+.include	"../../wip/gnuradio-core/Makefile.common"
+.include	"../../wip/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_VIDEO_SDL=True
 CMAKE_ARGS+=	-DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
+CMAKE_ARGS+=    -DENABLE_GRC=True
+
+PLIST_MINUS+=	companion
 
 .include	"../../devel/SDL/buildlink3.mk"
 
diff --git a/gnuradio-video-sdl/PLIST b/gnuradio-video-sdl/PLIST
index 8c66e129b2..291c1fc170 100644
--- a/gnuradio-video-sdl/PLIST
+++ b/gnuradio-video-sdl/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2015/09/01 04:14:55 mef Exp $
+@comment $NetBSD$
 include/gnuradio/swig/video_sdl_swig.i
 include/gnuradio/swig/video_sdl_swig_doc.i
 include/gnuradio/video_sdl/api.h
 include/gnuradio/video_sdl/sink_s.h
 include/gnuradio/video_sdl/sink_uc.h
+lib/cmake/gnuradio/gnuradio-video-sdlConfig.cmake
+lib/cmake/gnuradio/gnuradio-video-sdlTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-video-sdlTargets.cmake
 lib/libgnuradio-video-sdl.so
+lib/libgnuradio-video-sdl.so.3.8.1
 lib/libgnuradio-video-sdl.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-video-sdl.pc
 ${PYSITELIB}/gnuradio/video_sdl/__init__.py
@@ -14,5 +18,5 @@ ${PYSITELIB}/gnuradio/video_sdl/_video_sdl_swig.so
 ${PYSITELIB}/gnuradio/video_sdl/video_sdl_swig.py
 ${PYSITELIB}/gnuradio/video_sdl/video_sdl_swig.pyc
 ${PYSITELIB}/gnuradio/video_sdl/video_sdl_swig.pyo
-share/gnuradio/grc/blocks/video_block_tree.xml
-share/gnuradio/grc/blocks/video_sdl_sink.xml
+share/gnuradio/grc/blocks/video.tree.yml
+share/gnuradio/grc/blocks/video_sdl_sink.block.yml
diff --git a/gnuradio-video-sdl/buildlink3.mk b/gnuradio-video-sdl/buildlink3.mk
index 4d49e6da82..f37e84e527 100644
--- a/gnuradio-video-sdl/buildlink3.mk
+++ b/gnuradio-video-sdl/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-video-sdl
 .if !defined(GNURADIO_VIDEO_SDL_BUILDLINK3_MK)
 GNURADIO_VIDEO_SDL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-video-sdl?=	../../ham/gnuradio-video-sdl
+BUILDLINK_API_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-video-sdl+=	gnuradio-video-sdl>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-video-sdl?=	../../wip/gnuradio-video-sdl
 .endif # GNURADIO_VIDEO_SDL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-video-sdl