rtl-sdr: update to 0.5.4
upstream changes: bugfixes minor improvments add new HanfTek dongle
This commit is contained in:
parent
a57fabe380
commit
757bc46838
4 changed files with 7 additions and 80 deletions
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.11 2018/06/28 19:00:14 gdt Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2018/09/01 19:09:57 gdt Exp $
|
||||
|
||||
DISTNAME= rtl-sdr-0.5.3
|
||||
PKGREVISION= 3
|
||||
DISTNAME= rtl-sdr-0.5.4
|
||||
CATEGORIES= ham
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=steve-m/}
|
||||
GITHUB_PROJECT= librtlsdr
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.7 2018/06/28 19:00:14 gdt Exp $
|
||||
$NetBSD: distinfo,v 1.8 2018/09/01 19:09:57 gdt Exp $
|
||||
|
||||
SHA1 (rtl-sdr-0.5.3.tar.gz) = f6f20f7b0562a6d3f7b9ff7bff38a15bff175982
|
||||
RMD160 (rtl-sdr-0.5.3.tar.gz) = 3b30938053870ed2d4b261ac9e27ad0863762ca4
|
||||
SHA512 (rtl-sdr-0.5.3.tar.gz) = b2887b5df2728f8481b07fb4d8b9bee18b98c5c0ccd0c8e65c2e784a32826cc2301631e95e54071324e5dfbdaa11f0a5aa483cc619b864d4788c3700980b38b6
|
||||
Size (rtl-sdr-0.5.3.tar.gz) = 117414 bytes
|
||||
SHA1 (rtl-sdr-0.5.4.tar.gz) = da720927e8958bac87f6170366d5c814c1cec65e
|
||||
RMD160 (rtl-sdr-0.5.4.tar.gz) = 8a93a1fccd6e2b10d0cd1a5dd9118b1cdb6d24df
|
||||
SHA512 (rtl-sdr-0.5.4.tar.gz) = 81d01ccced763d728b4bb1aeff4bc04c394d4d6906f1df5c8b83671769bb4ca551017fea680981431a9e9436644a765b049259e42fcec1be8b709a81daf420ea
|
||||
Size (rtl-sdr-0.5.4.tar.gz) = 120549 bytes
|
||||
SHA1 (patch-cmake_Modules_FindLibUSB.cmake) = 95df1dd9ff3b9d5cf7afc55cc5f80cabe1d90491
|
||||
SHA1 (patch-src_librtlsdr.c) = 881418afaff87e98511e955cb0ed4d40fba19237
|
||||
SHA1 (patch-src_rtl__fm_c) = 04ec7142f38f26d2ed431765017f53e8e79a3a36
|
||||
SHA1 (patch-src_tuner__r82xx.c) = 54763a749eaa64e2c7f816cfe04df8b76eff93c9
|
||||
|
|
|
@ -1,57 +0,0 @@
|
|||
$NetBSD: patch-src_librtlsdr.c,v 1.1 2016/01/26 09:10:39 dbj Exp $
|
||||
|
||||
--- src/librtlsdr.c.orig 2014-02-07 01:04:24.000000000 +0000
|
||||
+++ src/librtlsdr.c
|
||||
@@ -39,6 +39,12 @@
|
||||
#define LIBUSB_CALL
|
||||
#endif
|
||||
|
||||
+/* libusb < 1.0.9 doesn't have libusb_handle_events_timeout_completed */
|
||||
+#ifndef HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED
|
||||
+#define libusb_handle_events_timeout_completed(ctx, tv, c) \
|
||||
+ libusb_handle_events_timeout(ctx, tv)
|
||||
+#endif
|
||||
+
|
||||
/* two raised to the power of n */
|
||||
#define TWO_POW(n) ((double)(1ULL<<(n)))
|
||||
|
||||
@@ -1776,11 +1782,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev,
|
||||
}
|
||||
|
||||
while (RTLSDR_INACTIVE != dev->async_status) {
|
||||
-#ifdef HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED
|
||||
- r = libusb_handle_events_timeout_completed(dev->ctx, &tv, &dev->async_cancel);
|
||||
-#else
|
||||
- r = libusb_handle_events_timeout(dev->ctx, &tv);
|
||||
-#endif
|
||||
+ r = libusb_handle_events_timeout_completed(dev->ctx, &tv,
|
||||
+ &dev->async_cancel);
|
||||
if (r < 0) {
|
||||
/*fprintf(stderr, "handle_events returned: %d\n", r);*/
|
||||
if (r == LIBUSB_ERROR_INTERRUPTED) /* stray signal */
|
||||
@@ -1801,6 +1804,11 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev,
|
||||
if (LIBUSB_TRANSFER_CANCELLED !=
|
||||
dev->xfer[i]->status) {
|
||||
r = libusb_cancel_transfer(dev->xfer[i]);
|
||||
+ /* handle events after canceling
|
||||
+ * to allow transfer status to
|
||||
+ * propagate */
|
||||
+ libusb_handle_events_timeout_completed(dev->ctx,
|
||||
+ &zerotv, NULL);
|
||||
if (r < 0)
|
||||
continue;
|
||||
|
||||
@@ -1812,11 +1820,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev,
|
||||
/* handle any events that still need to
|
||||
* be handled before exiting after we
|
||||
* just cancelled all transfers */
|
||||
-#ifdef HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED
|
||||
- libusb_handle_events_timeout_completed(dev->ctx, &zerotv, NULL);
|
||||
-#else
|
||||
- libusb_handle_events_timeout(dev->ctx, &zerotv);
|
||||
-#endif
|
||||
+ libusb_handle_events_timeout_completed(dev->ctx,
|
||||
+ &zerotv, NULL);
|
||||
break;
|
||||
}
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-src_tuner__r82xx.c,v 1.1 2016/01/26 09:10:39 dbj Exp $
|
||||
|
||||
--- src/tuner_r82xx.c.orig 2014-02-07 01:04:24.000000000 +0000
|
||||
+++ src/tuner_r82xx.c
|
||||
@@ -547,7 +547,7 @@ static int r82xx_set_pll(struct r82xx_pr
|
||||
}
|
||||
|
||||
if (!(data[2] & 0x40)) {
|
||||
- printf("[R82XX] PLL not locked!\n");
|
||||
+ fprintf(stderr, "[R82XX] PLL not locked!\n");
|
||||
priv->has_lock = 0;
|
||||
return 0;
|
||||
}
|
Loading…
Reference in a new issue