From owner-svn-ports-all@freebsd.org Thu Sep 26 09:20:47 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B2CF8FFE2C; Thu, 26 Sep 2019 09:20:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46f8YC4M7Rz41YL; Thu, 26 Sep 2019 09:20:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7978B26053; Thu, 26 Sep 2019 09:20:47 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8Q9Klpc028452; Thu, 26 Sep 2019 09:20:47 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8Q9KllX028451; Thu, 26 Sep 2019 09:20:47 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201909260920.x8Q9KllX028451@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Thu, 26 Sep 2019 09:20:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512885 - in head/multimedia/tvheadend: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/multimedia/tvheadend: . files X-SVN-Commit-Revision: 512885 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2019 09:20:47 -0000 Author: decke Date: Thu Sep 26 09:20:46 2019 New Revision: 512885 URL: https://svnweb.freebsd.org/changeset/ports/512885 Log: multimedia/tvheadend: Fix compilation after update of multimedia/libhdhomerun to 20190621 Obtained from: https://github.com/tvheadend/tvheadend/pull/1281 MFH: 2019Q3 Added: head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c (contents, props changed) Modified: head/multimedia/tvheadend/Makefile Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Thu Sep 26 08:46:14 2019 (r512884) +++ head/multimedia/tvheadend/Makefile Thu Sep 26 09:20:46 2019 (r512885) @@ -4,7 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.8 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org Added: head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c Thu Sep 26 09:20:46 2019 (r512885) @@ -0,0 +1,26 @@ +From 6f494ce84b77de092447dbb793eca8cc7b5296ee Mon Sep 17 00:00:00 2001 +From: Michael Marley +Date: Wed, 26 Jun 2019 19:35:50 -0400 +Subject: [PATCH] Fix compilation with libhdhomerun 20190621 + +They renamed the symbol that was used to determine whether the +"hdhomerun_discover_find_devices_custom" needed to be aliased, +causing an FTBFS. Instead, recognize both the old and new symbols. +--- + src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c +index 58dec51ab3..18068faf5d 100644 +--- src/input/mpegts/tvhdhomerun/tvhdhomerun.c ++++ src/input/mpegts/tvhdhomerun/tvhdhomerun.c +@@ -32,7 +32,8 @@ + + #include "config.h" + +-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN ++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \ ++ || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED) + #define hdhomerun_discover_find_devices_custom \ + hdhomerun_discover_find_devices_custom_v2 + #endif