From 41e4b588f578d9f99a7bbdfde7f7756773360034 Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Tue, 1 Oct 2019 03:23:17 +0000 Subject: multimedia/libhdhomerun: Backport FreeBSD broadcast patch Release 20190621 caused a regression in the ability to discover tuner hardware, for example using: hdhomerun_config discover. This change backports a commit [1] marked as "Release 20190625" which doesn't (yet?) appear to be available/distributed. [1] https://github.com/Silicondust/libhdhomerun/commit/b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6 PR: 240907 Reported by: Daniel Becker Submitted by: David O'Rourke (maintainer) --- multimedia/libhdhomerun/Makefile | 1 + .../libhdhomerun/files/patch-hdhomerun__discover.c | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 multimedia/libhdhomerun/files/patch-hdhomerun__discover.c (limited to 'multimedia/libhdhomerun') diff --git a/multimedia/libhdhomerun/Makefile b/multimedia/libhdhomerun/Makefile index fbe39de488b1..97d9a764ef8e 100644 --- a/multimedia/libhdhomerun/Makefile +++ b/multimedia/libhdhomerun/Makefile @@ -2,6 +2,7 @@ PORTNAME= libhdhomerun PORTVERSION= 20190621 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://download.silicondust.com/hdhomerun/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/multimedia/libhdhomerun/files/patch-hdhomerun__discover.c b/multimedia/libhdhomerun/files/patch-hdhomerun__discover.c new file mode 100644 index 000000000000..088440edc395 --- /dev/null +++ b/multimedia/libhdhomerun/files/patch-hdhomerun__discover.c @@ -0,0 +1,35 @@ +# Backport FreeBSD broadcast patch +# https://github.com/Silicondust/libhdhomerun/commit/b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6 + +--- hdhomerun_discover.c.orig 2019-09-30 16:45:23 UTC ++++ hdhomerun_discover.c +@@ -183,7 +183,8 @@ static bool hdhomerun_discover_send(struct hdhomerun_d + unsigned int i; + for (i = 1; i < ds->sock_count; i++) { + struct hdhomerun_discover_sock_t *dss = &ds->socks[i]; +- ++ uint32_t send_ip = target_ip; ++ + if (target_ip != 0xFFFFFFFF) { + if (dss->subnet_mask == 0) { + continue; +@@ -193,7 +194,18 @@ static bool hdhomerun_discover_send(struct hdhomerun_d + } + } + +- result |= hdhomerun_discover_send_internal(ds, dss, target_ip, device_type, device_id); ++#if defined(IP_ONESBCAST) ++ /* FreeBSD special handling - send subnet broadcast */ ++ if (target_ip == 0xFFFFFFFF) { ++ send_ip = dss->local_ip | ~dss->subnet_mask; ++ ++ if ((send_ip == 0x00000000) || (send_ip == 0xFFFFFFFF)) { ++ continue; ++ } ++ } ++#endif ++ ++ result |= hdhomerun_discover_send_internal(ds, dss, send_ip, device_type, device_id); + } + + /* -- cgit v1.2.3