(pkgsrc)

 - Drop two patches, seems included
(upstream)
 - Update 3.7.2 to 3.8.5

Change Log for Releases
==============================
## 003.008.005
* E3xx: Added support for battery-based E3xx device (E312),
  get_freq() for network mode, fixed GPS time initialization bug
* AD9361-based devices: Fixed frequency readback bug
* B200: Fixed DCM issues, better loopback failure handling,
  fix erroneous warning for custom clock rates
* X3x0: Better warnings for clock reate / ref freq
* multi_usrp: Added define for GPIO capabilities (enables
  exposure in GNU Radio)
* UHD: sc16->sc16 SSE converter
* Manual: Multiple minor updates, FPGA manual improvements,
* Build System: Fixed builds on some Windows platforms, removed
  stray prints

## 003.008.004
* B200: Fixed EEPROM writing bug, updated images for B200 Rev5/6
* E300: GPS antenna power defaults to staying on, GPS time used as
  default if available
* UBX: PDF frequency fix on X300
* USRP2: Bugfix that allows latest UHD to work with USRP2
* Documentation: Many fixes for E300 section, added FPGA manual

## 003.008.003
* UBX: Fixed phase synchronization issues
  (Related changes: Change X300 daughterboard frequency, increase
   N210 FIFO depth)
* Fixed many compiler warnings
* B200: Fixed timing issues, fixed tick rate issue, stabilized
  operations at high clock rates
* X300: Improved phase alignment across devices
* CMake: Build fixes
* E300: Flow control fix


## 003.008.002
* CMake: Introducing named versions for dev branches, enable static libs,
* E300: Docs updates, compat number bump, VCTCXO updates,
  more status bits for ref locking, fixed serial number length fix,
  RSSI Sensor
* B200: RSSI sensor
* AD9361: Better handling of different interpolation rates in FIR,
  fix for gain value truncation, removed gain value offset
* UBX: Added drivers
* Manual/Docs: Numerous updates, minimum compiler versions now specified,
* Converters: Multiple fixes for sc12
* Examples: Fixes to txrx_loopback_to_file
* Path handling vastly improved, made more consistent
* Minor UHD fixes

## 003.008.001
* B2x0: Fixed PLL settings, Fixed external ref selection, serialized
  streamer setup (thread-safety)
* X3x0: Fixed flow control issue, improved DAC ctrl + init logic,
  Fixed I/Q alignment issue
* Generation-3 devices: Fixed LED registers
* UHD: Improved tuning logic for manual tunes
* Tools: Multiple kitchen sink fixes, coloured output
* Examples: Multiple bugfixes (multi-channel ops)
* Docs/Manual: Multiple fixes, E310 panel images

## 003.008.000
* Added E310 support
* B200/B210: Moved AD9361 controls from firmware to host
* Added several tools: ZPU dissector, improved CHDR dissector,
  kitchen sink, B200/B210 USB debugging utility, latency
  measurement tool.
* Reorganized firmware/ directory structure. Refactored some
  firmware.
* Removed FPGA sources, is now in own repository (submoduled).
* Cleaned up command line arguments for some tools
* Added math namespace, plus a unified float comparison infrastructure
* Fixed tuning-related bugs
* Moved manual over to Doxygen, also several manual bug fixes and
  amendments
* Added many missing virtual destructors (less build warnings)
* Added support for NI-RIO 14.0
* X300 fixes: Not found over PCIe with no eth interfaces
* CMake improvements: Now comes with own UHDConfig.cmake and example
  to build standalone UHD apps, build fixes on Apple, interoperability
  with GNU Radio
* OctoClock fixes and improvements: Ethernet initialization, external
  ref detection, stability fixes, host driver (UHD can now talk to
  OctoClock)
* Examples: Improved GPIO example, rx_samples_to_file
* Bumped minimum Boost version to 1.46

## 003.007.003
* Fixed examples
* Removed compiler warnings
* Fixed CBX LO settings (FRAC truncation)
* Fixed build issues for out-of-tree tools for some distros
* Fixed some logging strings (SBX, GPSDO)
* Improved logging (speedups, removed unnecessary cycles)
* Added output sync for DAC reference clocks on X300
* Multiple FPGA improvements, as well as upgrade of build env
* Added support for B200 vs B210 discovery

1 files changed, 8 insertions, 34 deletions

diff --git a/ham/uhd/Makefile b/ham/uhd/Makefile
index 68d2d2f630b..ad716442f0a 100644
--- a/ham/uhd/Makefile
+++ b/ham/uhd/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2015/08/14 04:53:08 mef Exp $
+# $NetBSD: Makefile,v 1.12 2015/08/14 06:19:13 mef Exp $
 
-DISTNAME=		uhd-3.7.2
-PKGREVISION=		2
+DISTNAME=		uhd-3.8.5
 CATEGORIES=		ham
 MASTER_SITES=           ${MASTER_SITE_GITHUB:=EttusResearch/}
 GITHUB_PROJECT=         uhd
-GITHUB_TAG=		release_003_007_002
+GITHUB_TAG=		release_003_008_005
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://code.ettus.com/redmine/ettus/projects/uhd/wiki
@@ -16,6 +15,7 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 
 CMAKE_ARGS+=		-DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+CMAKE_ARGS+=		-Wno-dev
 
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake pkg-config
@@ -30,6 +30,8 @@ WRKSRC=			${WRKDIR}/uhd-${GITHUB_TAG}/host
 
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON=	\
+	utils/latency/graph.py \
+	utils/latency/run_tests.py \
 	utils/uhd_images_downloader.py.in \
 	utils/usrp2_card_burner.py \
 	utils/usrp2_card_burner_gui.py \
@@ -39,34 +41,6 @@ REPLACE_PYTHON=	\
 	uhd-firmware/fx2/utils/edit-gpif-b100.py \
 	uhd-firmware/fx2/utils/edit-gpif.py \
 	uhd-firmware/fx2/utils/generate_regs.py \
-        uhd-firmware/x300/bin_to_coe.py \
-	uhd-firmware/zpu/bin/bin_to_mif.py \
-	uhd-firmware/zpu/bin/bin_to_ram_macro_init.py \
-	uhd-firmware/zpu/bin/divisors.py \
-	uhd-firmware/zpu/bin/elf_to_sbf \
-	uhd-firmware/zpu/bin/serial_loader \
-	uhd-firmware/zpu/bin/uart_ihex_flash_loader.py \
-	uhd-firmware/zpu/bin/uart_ihex_ram_loader.py \
-	uhd-fpga/usrp1/gen_makefile_extra.py \
-	uhd-fpga/usrp1/sdr_lib/gen_cordic_consts.py \
-	uhd-fpga/usrp1/tb/makesine.pl \
-	uhd-fpga/usrp1/toplevel/mrfm/mrfm.py \
-	uhd-fpga/usrp1/toplevel/mrfm/mrfm_fft.py \
-	uhd-fpga/usrp2/sdr_lib/gen_cordic_consts.py \
-	uhd-fpga/usrp2/top/extract_usage.py \
-	uhd-fpga/usrp2/top/python/check_inout.py \
-	uhd-fpga/usrp2/top/python/check_timing.py \
-	uhd-fpga/usrp3/top/python/bit_to_zynq_bin.py \
-	uhd-fpga/usrp3/top/python/check_inout.py \
-	uhd-fpga/usrp3/top/python/check_timing.py \
-        uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py
-
-REPLACE_PERL=	uhd-fpga/usrp1/tb/makesine.pl
-
-REPLACE_BASH=	\
-	uhd-fpga/usrp2/top/impactor.sh \
-	uhd-fpga/usrp3/top/impactor.sh \
-        uhd-fpga/usrp3/top/python/batch-build
 
 INSTALLATION_DIRS+=	share/uhd
 INSTALLATION_DIRS+=	share/uhd/firmware
@@ -88,7 +62,7 @@ PLIST_SRC=	${PKGDIR}/PLIST
 # to receive REPLACE_PYTHON conversion ( otherwise above the range )
 post-patch:
 	(cd ${WRKDIR}; \
-	for i in firmware fpga images ; do \
+	for i in firmware images ; do \
 	  ${MKDIR} ${WRKSRC}/uhd-$$i ;\
 	${CP} -r ${WRKDIR}/uhd-${GITHUB_TAG}/$$i/* ${WRKSRC}/uhd-$$i ;\
 	done)
@@ -99,7 +73,7 @@ post-patch:
 #  Converting ${CP} into ${INTALL_DATA_DIR} and ${INSTALL_DATA} as pkglint
 #  flags are NOT easy, sorry for that.
 post-install:
-	for i in firmware fpga images ; do \
+	for i in firmware images ; do \
 	  ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\
 	  ${FIND} ${DESTDIR}${PREFIX}/share/uhd/$$i -type f -exec \
 	          ${CHMOD} -x '{}' \; ;\