Index: head/multimedia/tvheadend/Makefile =================================================================== --- head/multimedia/tvheadend/Makefile (revision 512884) +++ head/multimedia/tvheadend/Makefile (revision 512885) @@ -1,90 +1,90 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= tvheadend PORTVERSION= 4.2.8 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org COMMENT= TV streaming server supporting DVB, IPTV, SAT>IP and more LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= bash:shells/bash \ cmake:devel/cmake \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libcurl.so:ftp/curl \ liburiparser.so:net/uriparser RUN_DEPENDS= dtv-scan-tables>=0:multimedia/dtv-scan-tables USES= compiler:c++11-lang gettext gmake pkgconfig python shebangfix ssl USE_GITHUB= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= ${WRKSRC}/Autobuild.sh \ ${WRKSRC}/configure \ ${WRKSRC}/support/apt-update \ ${WRKSRC}/support/configure.inc \ ${WRKSRC}/support/getmuxlist \ ${WRKSRC}/support/version TVHUSER?= tvheadend TVHGROUP?= tvheadend USERS= ${TVHUSER} GROUPS= ${TVHGROUP} webcamd SUB_LIST+= TVHUSER="${TVHUSER}" \ TVHGROUP="${TVHGROUP}" CONFIGURE_ENV+= PLATFORM=freebsd CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-hdhomerun_static \ --disable-bintray_cache --disable-ffmpeg_static --disable-pie CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz OPTIONS_DEFINE= AVAHI DVBCSA DVBEN50221 HDHOMERUN INOTIFY TRANSCODING XMLTV OPTIONS_DEFAULT=DVBCSA HDHOMERUN INOTIFY AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app DVBCSA_DESC= Replace internal ffdecsa with dvbcsa DVBCSA_LIB_DEPENDS= libdvbcsa.so:multimedia/libdvbcsa DVBCSA_CONFIGURE_ENABLE= dvbcsa DVBEN50221_DESC= Hardware CAM support DVBEN50221_LIB_DEPENDS= libdvben50221.so:multimedia/dvb-apps DVBEN50221_CONFIGURE_ENABLE= dvben50221 HDHOMERUN_DESC= Native support for HDHomeRun network tuners HDHOMERUN_LIB_DEPENDS= libhdhomerun.so:multimedia/libhdhomerun HDHOMERUN_CONFIGURE_ENABLE= hdhomerun_client INOTIFY_DESC= File system notifications support INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify INOTIFY_CONFIGURE_ENABLE= inotify INOTIFY_LDFLAGS= -linotify TRANSCODING_DESC= Transcoding for mobile and web clients TRANSCODING_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg TRANSCODING_CONFIGURE_ENABLE= libav XMLTV_RUN_DEPENDS= p5-xmltv>=0:textproc/p5-xmltv .include post-patch: @${REINPLACE_CMD} 's|-ldl||' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} 's|-Werror||' \ ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/tvheadend .include Index: head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c =================================================================== --- head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c (nonexistent) +++ head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c (revision 512885) @@ -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 Property changes on: head/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property