Attachment 218513 Details for Bug 249591 – Unready patch to comms/uhd 4.0.0.0

[patch] Unready patch to comms/uhd 4.0.0.0

patch-comms_uhd_3.14.1.1-4.0.0.0.diff (text/plain), 4.79 KB, created by Rainer Hurling on 2020-10-04 13:13:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2020-10-04 13:13:16 UTC

Size: 4.79 KB

patch

obsolete

>diff -urN comms/uhd.orig/Makefile comms/uhd/Makefile
>--- comms/uhd.orig/Makefile	2020-01-05 16:35:18.488510000 +0100
>+++ comms/uhd/Makefile	2020-10-04 14:38:10.478000000 +0200
>@@ -1,18 +1,14 @@
> # $FreeBSD: head/comms/uhd/Makefile 522067 2020-01-04 23:34:22Z pkubaj $
> 
> PORTNAME=	uhd
>-PORTVERSION=	3.14.1.1
>-PORTREVISION=	1
>-#PORTREVISION=	1
>+PORTVERSION=	4.0.0.0
> CATEGORIES=	comms hamradio
>-#MASTER_SITES=	http://files.ettus.com/binaries/images/
>-#DISTFILES=	${IMAGE_FILE}
> DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	mr@FreeBSD.org
> COMMENT=	Ettus Research UHD driver framework
> 
>-# See https://www.ettus.com/sdr-software/detail/licenses.  Dual license
>+# See https://www.ettus.com/sdr-software/licenses/.  Dual license
> # under GPLv3 and and "Alternate License" whose terms are not documented
> # on the web site (contact info@ettus.com).  Mark as GPLv3 for now
> # until terms of the "Alternate License" are made clear.  When that
>@@ -21,19 +17,21 @@
> 
> LIB_DEPENDS=	${PY_BOOST} \
> 		libboost_system.so:devel/boost-libs
>-BUILD_DEPENDS=	cheetah-analyze:devel/py-cheetah@${PY_FLAVOR} \
>-		rst2html:textproc/py-docutils \
>-		orcc:devel/orc \
>-		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
>+### py37-cheetah-2.4.4_1 Unknown flavor 'py37', possible flavors: py27.
>+#   https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=249630
>+BUILD_DEPENDS=	orcc:devel/orc \
>+		${PYTHON_PKGNAMEPREFIX}cheetah-analyze>=0:devel/py-cheetah@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}rst2html>=0:textproc/py-docutils@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0:devel/py-ruamel.yaml@${PY_FLAVOR}
> 
> USES=		compiler:c++14-lang cmake ncurses pkgconfig \
>-		dos2unix python:2.7 shebangfix
>-USE_GITHUB=     yes
>-GH_ACCOUNT=     EttusResearch
>-GH_TAGNAME=     0347a6d81fd64800422ef1ed4dc634d8c480746f
>+		dos2unix python:3.6+ shebangfix
>+USE_LDCONFIG=		yes
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	EttusResearch
>+GH_TAGNAME=	90ce6062b6b5df2eddeee723777be85108e4e7c7
> 
>-CONFLICTS=	usrp-[0-9]*
>-
> BROKEN_FreeBSD_12_aarch64=	fails to configure: Could not find standard set_new_handler function
> BROKEN_FreeBSD_12_armv6=	fails to configure: Could not find standard set_new_handler function
> BROKEN_FreeBSD_12_armv7=	fails to configure: Could not find standard set_new_handler function
>@@ -41,7 +39,8 @@
> BROKEN_FreeBSD_13_armv6=	fails to configure: Could not find standard set_new_handler function
> BROKEN_FreeBSD_13_armv7=	fails to configure: Could not find standard set_new_handler function
> 
>-USE_LDCONFIG=		yes
>+CONFLICTS=	usrp-[0-9]*
>+
> CMAKE_SOURCE_PATH=	${WRKSRC}/host
> #CXXFLAGS_amd64=	-msse2 -std=c++11
> #CXXFLAGS_i386=	-msse2 -std=c++11
>@@ -54,13 +53,11 @@
> # for excruciating debug use this -db
> #CMAKE_ARGS+=	--debug-output --trace
> 
>-IMAGE_FILE=	uhd-images_3.14.0.0-rc1.zip
>+OPTIONS_DEFINE=	DOCS DOXYGEN
>+OPTIONS_DEFAULT=	DOCS
> 
>-OPTIONS_DEFINE= DOCS DOXYGEN
>-OPTIONS_DEFAULT= DOCS
>-
>-OPTIONS_SUB=yes
>-DOXYGEN_BUILD_DEPENDS=  doxygen:devel/doxygen
>+OPTIONS_SUB=	yes
>+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
> DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON"
> DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" -DENABLE_MANUAL:STRING="OFF"
> 
>diff -urN comms/uhd.orig/distinfo comms/uhd/distinfo
>--- comms/uhd.orig/distinfo	2020-01-05 16:35:18.623384000 +0100
>+++ comms/uhd/distinfo	2020-10-04 13:45:58.942510000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1569601149
>-SHA256 (uhd/EttusResearch-uhd-3.14.1.1-0347a6d81fd64800422ef1ed4dc634d8c480746f_GH0.tar.gz) = 6f30e07e44aaa88f4875c3ed278b209c88abf7068e853514d1afa88528208197
>-SIZE (uhd/EttusResearch-uhd-3.14.1.1-0347a6d81fd64800422ef1ed4dc634d8c480746f_GH0.tar.gz) = 12963094
>+TIMESTAMP = 1601811958
>+SHA256 (uhd/EttusResearch-uhd-4.0.0.0-90ce6062b6b5df2eddeee723777be85108e4e7c7_GH0.tar.gz) = cd2bd780339dbcec15ba3cccefc81058f2c1f6108141e258b27956992365d87d
>+SIZE (uhd/EttusResearch-uhd-4.0.0.0-90ce6062b6b5df2eddeee723777be85108e4e7c7_GH0.tar.gz) = 33956392
>diff -urN comms/uhd.orig/pkg-descr comms/uhd/pkg-descr
>--- comms/uhd.orig/pkg-descr	2020-01-05 16:35:18.495790000 +0100
>+++ comms/uhd/pkg-descr	2020-10-04 14:08:50.904181000 +0200
>@@ -1,8 +1,8 @@
>-UHD is the "Universal Software Radio Peripheral" (USRP) Hardware Driver. It 
>+UHD is the "Universal Software Radio Peripheral" (USRP) Hardware Driver. It
> works on all major platforms (Linux, Windows, and Mac); and can be built with
> GCC, Clang, and MSVC compilers.
> 
>-The goal of UHD is to provide a host driver and API for current and 
>+The goal of UHD is to provide a host driver and API for current and
> future Ettus Research products. Users will be able to use the UHD driver
> standalone or with third-party applications such as:
> 
>@@ -12,4 +12,4 @@
>     OpenBTS
> 
> WWW: https://github.com/EttusResearch/uhd
>-WWW: https://www.ettus.com/sdr-software/detail/usrp-hardware-driver
>+WWW: https://www.ettus.com/sdr-software/uhd-usrp-hardware-driver/

Actions: View | Diff

Attachments on bug 249591: 218513 | 218792 | 218805