Received: by mail.netbsd.org (Postfix, from userid 605) id 86A0384D6C; Fri, 4 Oct 2019 10:41:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0D46384CE8 for ; Fri, 4 Oct 2019 10:41:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VwcOu8KDbRJ1 for ; Fri, 4 Oct 2019 10:41:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2549784C85 for ; Fri, 4 Oct 2019 10:41:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1DDCCFBF4; Fri, 4 Oct 2019 10:41:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1570185705196030" MIME-Version: 1.0 Date: Fri, 4 Oct 2019 10:41:45 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/ham/uhd To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20191004104145.1DDCCFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1570185705196030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Oct 4 10:41:45 UTC 2019 Modified Files: pkgsrc/ham/uhd: Makefile distinfo Added Files: pkgsrc/ham/uhd/patches: patch-CMakeLists.txt patch-docs_CMakeLists.txt patch-lib_transport_nirio_lvbitx_process-lvbitx.py Log Message: uhd: updated to 3.14.1.1 003.014.001.001 Device3: latch n on m in axi_rate_change in DUC/DDC Device3: UART: fix TX <-> RX, FIFO size as parameter Device3: Restore default buffer sizes for MPMD UDP RFNoC: Fix off by one error in window.v E320: fix time source clobbering ref source B200: Add command to query bootloader status RFNoC: fix multidevice graph connections MPMD: Fix corner case in MPM device discovery MPM: fixed mboard_max_revision value (MPM compat check failures) MPM: Fix version string for logger Docs: x300: update docs for multiple timed commands Docs: Fix Doxygen warnings due to spurious backslashes Docs: RFNoC: Fix Doxygen warning due to undoc'd parameter Docs: Adjust FPGA functional verification tests Docs: Fix MPM cmake command for E320 RFNoC: Re-enable flow ctrl for blocks on same xbar Tools: Fix build issues with kitchen_sink cmake: Add UHD_COMPONENT variable To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 pkgsrc/ham/uhd/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/ham/uhd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt \ pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt \ pkgsrc/ham/uhd/patches/patch-lib_transport_nirio_lvbitx_process-lvbitx.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1570185705196030 Content-Disposition: inline Content-Length: 6336 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/uhd/Makefile diff -u pkgsrc/ham/uhd/Makefile:1.50 pkgsrc/ham/uhd/Makefile:1.51 --- pkgsrc/ham/uhd/Makefile:1.50 Thu Aug 22 12:23:24 2019 +++ pkgsrc/ham/uhd/Makefile Fri Oct 4 10:41:44 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2019/08/22 12:23:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2019/10/04 10:41:44 adam Exp $ -DISTNAME= uhd-3.14.1.0 -PKGREVISION= 1 +DISTNAME= uhd-3.14.1.1 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -14,6 +13,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests +CMAKE_ARGS+= -DPKG_MAN_DIR=${PKGMANDIR}/man1 CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py CMAKE_ARGS+= -Wno-dev .include "../../lang/python/pyversion.mk" @@ -63,13 +63,6 @@ INSTALLATION_DIRS+= share/uhd/firmware INSTALLATION_DIRS+= share/uhd/fpga INSTALLATION_DIRS+= share/uhd/images -SUBST_CLASSES+= man -SUBST_MESSAGE.man= Convert share/man to man -SUBST_STAGE.man= pre-configure -SUBST_FILES.man= docs/CMakeLists.txt -SUBST_SED.man= -e '/UHD_INSTALL/s,$${PKG_MAN_DIR},${PREFIX}/${PKGMANDIR}/man1,' -# UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) - .include "options.mk" .include "../../devel/boost-libs/buildlink3.mk" Index: pkgsrc/ham/uhd/distinfo diff -u pkgsrc/ham/uhd/distinfo:1.21 pkgsrc/ham/uhd/distinfo:1.22 --- pkgsrc/ham/uhd/distinfo:1.21 Tue Jul 2 16:44:55 2019 +++ pkgsrc/ham/uhd/distinfo Fri Oct 4 10:41:44 2019 @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.21 2019/07/02 16:44:55 adam Exp $ +$NetBSD: distinfo,v 1.22 2019/10/04 10:41:44 adam Exp $ -SHA1 (uhd-3.14.1.0.tar.gz) = d26c5f19b9ed926780980f061634ae9f09b9ac11 -RMD160 (uhd-3.14.1.0.tar.gz) = c2135cb3be04ab40bdf4ce7258d07c81147976a9 -SHA512 (uhd-3.14.1.0.tar.gz) = afb58b2f75b9855a4252c21c40e0f8816626910a134719321fa98ec78ce13aa32577a959da11d13d1e40dc61f143442ab7c2993edec111267de4664730c6eb82 -Size (uhd-3.14.1.0.tar.gz) = 12960041 bytes +SHA1 (uhd-3.14.1.1.tar.gz) = 6ca67393422bb8c1cc56ba201844d9a0212ce03d +RMD160 (uhd-3.14.1.1.tar.gz) = e6eb3a304a324eb16479fda760d1e93b7e72e8b9 +SHA512 (uhd-3.14.1.1.tar.gz) = 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4 +Size (uhd-3.14.1.1.tar.gz) = 12960651 bytes +SHA1 (patch-CMakeLists.txt) = fa86f08bccb4afbb9108d3b1eb02d3101e933cdc +SHA1 (patch-docs_CMakeLists.txt) = 23b70637499deafaf378f7c68764afd674673ad2 +SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7 Added files: Index: pkgsrc/ham/uhd/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.1 --- /dev/null Fri Oct 4 10:41:45 2019 +++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt Fri Oct 4 10:41:44 2019 @@ -0,0 +1,22 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/04 10:41:44 adam Exp $ + +Allow overrides on PKG_DOC_DIR and PKG_MAN_DIR. +https://github.com/EttusResearch/uhd/issues/301 + +--- CMakeLists.txt.orig 2019-10-03 18:21:01.000000000 +0000 ++++ CMakeLists.txt +@@ -128,8 +128,12 @@ set(PKG_DATA_DIR share/uhd) + if(NOT DEFINED PKG_LIB_DIR) + set(PKG_LIB_DIR ${LIBRARY_DIR}/uhd) + endif() +-set(PKG_DOC_DIR share/doc/uhd) +-set(PKG_MAN_DIR share/man/man1) ++if(NOT DEFINED PKG_DOC_DIR) ++ set(PKG_DOC_DIR share/doc/uhd) ++endif() ++if(NOT DEFINED PKG_MAN_DIR) ++ set(PKG_MAN_DIR share/man/man1) ++endif() + + ######################################################################## + # UHD config files Index: pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt diff -u /dev/null pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt:1.1 --- /dev/null Fri Oct 4 10:41:45 2019 +++ pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt Fri Oct 4 10:41:44 2019 @@ -0,0 +1,31 @@ +$NetBSD: patch-docs_CMakeLists.txt,v 1.1 2019/10/04 10:41:44 adam Exp $ + +Do not compress man pages. + +--- docs/CMakeLists.txt.orig 2019-10-03 17:48:04.000000000 +0000 ++++ docs/CMakeLists.txt +@@ -150,23 +150,5 @@ LIBUHD_REGISTER_COMPONENT("Man Pages" EN + + if(ENABLE_MAN_PAGES) + #Generate man pages +- foreach(manfile ${man_page_sources}) +- #make the gzip file depend on the text file +- string(REPLACE ".1" "" PROGRAM_NAME "${manfile}") +- set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz") +- set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}") +- add_custom_command( +- OUTPUT ${gzfile} +- DEPENDS ${manfile} +- COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile} +- COMMENT "Generating ${PROGRAM_NAME} man page" +- ) +- +- #make the man page target depend on the gz file +- list(APPEND man_page_gz_files ${gzfile}) +- UHD_INSTALL(FILES ${gzfile} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) +- endforeach(manfile ${man_page_sources}) +- +- #make the man pages a build-time dependency +- add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files}) ++ UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages) + endif(ENABLE_MAN_PAGES) Index: pkgsrc/ham/uhd/patches/patch-lib_transport_nirio_lvbitx_process-lvbitx.py diff -u /dev/null pkgsrc/ham/uhd/patches/patch-lib_transport_nirio_lvbitx_process-lvbitx.py:1.1 --- /dev/null Fri Oct 4 10:41:45 2019 +++ pkgsrc/ham/uhd/patches/patch-lib_transport_nirio_lvbitx_process-lvbitx.py Fri Oct 4 10:41:44 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_transport_nirio_lvbitx_process-lvbitx.py,v 1.1 2019/10/04 10:41:44 adam Exp $ + +Do not modify output path. + +--- lib/transport/nirio/lvbitx/process-lvbitx.py.orig 2019-10-03 18:11:53.000000000 +0000 ++++ lib/transport/nirio/lvbitx/process-lvbitx.py +@@ -30,7 +30,7 @@ if (len(args) < 1): + + lvbitx_filename = args[0] + input_filename = os.path.relpath(lvbitx_filename) +-autogen_src_path = os.path.relpath(options.output_src_path) if (options.output_src_path is not None) else os.path.dirname(input_filename) ++autogen_src_path = options.output_src_path if options.output_src_path is not None else os.path.dirname(input_filename) + class_name = os.path.splitext(os.path.basename(input_filename))[0] + + if (not os.path.isfile(input_filename)): --_----------=_1570185705196030--