Index: head/multimedia/tvheadend/Makefile =================================================================== --- head/multimedia/tvheadend/Makefile (revision 458286) +++ head/multimedia/tvheadend/Makefile (revision 458287) @@ -1,90 +1,89 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= tvheadend -PORTVERSION= 4.2.3 +PORTVERSION= 4.2.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 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 BROKEN_mips= fails to configure: No C compiler found BROKEN_mips64= fails to configure: No C compiler found BROKEN_powerpc64= fails to configure: No C compiler found USES= 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 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 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/distinfo =================================================================== --- head/multimedia/tvheadend/distinfo (revision 458286) +++ head/multimedia/tvheadend/distinfo (revision 458287) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501062908 -SHA256 (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 2d289a1a8a0a960feba1da2da97c977a2b714d87adfdfaf00a53142e39d808e6 -SIZE (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 21518785 +TIMESTAMP = 1515264849 +SHA256 (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740 +SIZE (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 21528718 Index: head/multimedia/tvheadend/files/patch-src_byteswap.h =================================================================== --- head/multimedia/tvheadend/files/patch-src_byteswap.h (revision 458286) +++ head/multimedia/tvheadend/files/patch-src_byteswap.h (nonexistent) @@ -1,45 +0,0 @@ ---- src/byteswap.h.orig 2015-10-21 17:12:45 UTC -+++ src/byteswap.h -@@ -0,0 +1,42 @@ -+/*- -+ * Copyright (c) 2010 Isilon Systems, Inc. -+ * Copyright (c) 2010 iX Systems, Inc. -+ * Copyright (c) 2010 Panasas, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice unmodified, this list of conditions, and the following -+ * disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#ifndef _INFINIBAND_BYTESWAP_H_ -+#define _INFINIBAND_BYTESWAP_H_ -+/* -+ * This file is included for compatibility with the userland libraries -+ * accompanying the infiniband stack. -+ */ -+#include -+#include -+ -+#define bswap_16 bswap16 -+#define bswap_32 bswap32 -+#define bswap_64 bswap64 -+ -+#endif /* _INFINIBAND_BYTESWAP_H_ */ Property changes on: head/multimedia/tvheadend/files/patch-src_byteswap.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/tvheadend/files/patch-src_tcp.c =================================================================== --- head/multimedia/tvheadend/files/patch-src_tcp.c (revision 458286) +++ head/multimedia/tvheadend/files/patch-src_tcp.c (nonexistent) @@ -1,64 +0,0 @@ -- DSCP cannot be modified on FreeBSD yet -src/tcp.c:61:14: error: use of undeclared identifier 'IPTOS_DSCP_MASK' - v = dscp & IPTOS_DSCP_MASK; - -- Change include order for FreeBSD -In file included from src/tcp.c:33: -/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:69:24: error: field has incomplete type 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:181:19: error: field has incomplete type 'struct in_addr' - struct in_addr ipt_addr; - ^ -/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:216:17: error: field has incomplete type 'struct in_addr' - struct in_addr ippseudo_src; /* source internet address */ - ^ -/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ -/usr/include/netinet/ip.h:217:17: error: field has incomplete type 'struct in_addr' - struct in_addr ippseudo_dst; /* destination internet address */ - ^ -/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr' - struct in_addr ip_src,ip_dst; /* source and dest address */ - ^ ---- src/tcp.c.orig 2017-01-20 19:41:51.000000000 +0100 -+++ src/tcp.c 2017-02-08 11:15:26.836727000 +0100 -@@ -30,8 +30,8 @@ - #include - #include - #include --#include - #include -+#include - #include - #include - -@@ -56,6 +56,7 @@ - int - socket_set_dscp(int sockfd, uint32_t dscp, char *errbuf, size_t errbufsize) - { -+#ifdef IPTOS_DSCP_MASK - int r, v; - - v = dscp & IPTOS_DSCP_MASK; -@@ -65,6 +66,7 @@ - snprintf(errbuf, errbufsize, "IP_TOS failed: %s", strerror(errno)); - return -1; - } -+#endif - return 0; - } - Property changes on: head/multimedia/tvheadend/files/patch-src_tcp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/tvheadend/files/patch-src_tcp.h =================================================================== --- head/multimedia/tvheadend/files/patch-src_tcp.h (revision 458286) +++ head/multimedia/tvheadend/files/patch-src_tcp.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/tcp.h.orig 2015-09-25 13:57:59 UTC -+++ src/tcp.h -@@ -19,6 +19,8 @@ - #ifndef TCP_H_ - #define TCP_H_ - -+#include -+ - #include "htsbuf.h" - #include "htsmsg.h" - Property changes on: head/multimedia/tvheadend/files/patch-src_tcp.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property