Attachment #162710 for bug #204138

Lines 20-25 Link Here

(-)tvheadend/Makefile (-1 / +18 lines)
20	USE_GITHUB= yes	20	USE_GITHUB= yes
21	GH_TAGNAME= d97d5f1	21	GH_TAGNAME= d97d5f1
22		22
		23	DISTFILES= tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
		24	EXTRACT_ONLY= tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
		25
23	USES= execinfo gmake pkgconfig python shebangfix	26	USES= execinfo gmake pkgconfig python shebangfix
24	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
25	MAKE_JOBS_UNSAFE= yes	28	MAKE_JOBS_UNSAFE= yes
Lines 45-51 Link Here
45	CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast	48	CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
46	LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz	49	LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
47		50
48	OPTIONS_DEFINE= AVAHI DVBCSA TRANSCODING XMLTV	51	OPTIONS_DEFINE= AVAHI DVBCSA TRANSCODING XMLTV HDHOMERUN
49	OPTIONS_DEFAULT=DVBCSA	52	OPTIONS_DEFAULT=DVBCSA
50		53
51	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app	54	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
Lines 58-63 Link Here
58	TRANSCODING_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg	61	TRANSCODING_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
59	TRANSCODING_CONFIGURE_ENABLE= libav	62	TRANSCODING_CONFIGURE_ENABLE= libav
60		63
		64	HDHOMERUN_DESC= HDHomerun support (libhdhomerun)
		65	HDHOMERUN_CONFIGURE_ENABLE= dhomerun_client hdhomerun_static
		66
61	XMLTV_RUN_DEPENDS= p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv	67	XMLTV_RUN_DEPENDS= p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv
62		68
63	.include <bsd.port.pre.mk>	69	.include <bsd.port.pre.mk>
Lines 68-73 Link Here
68	-Wno-tautological-constant-out-of-range-compare	74	-Wno-tautological-constant-out-of-range-compare
69	.endif	75	.endif
70		76
		77	.if ${PORT_OPTIONS:MHDHOMERUN}
		78	DISTFILES+= libhdhomerun_20150826.tgz:extra
		79	MASTER_SITES+= http://download.silicondust.com/hdhomerun/:extra
		80	.endif
		81
		82	post-extract:
		83	.if ${PORT_OPTIONS:MHDHOMERUN}
		84	${MKDIR} ${WRKSRC}/libhdhomerun_static
		85	${CP} ${_DISTDIR}/libhdhomerun_20150826.tgz ${WRKSRC}/libhdhomerun_static
		86	.endif
		87
71	post-patch:	88	post-patch:
72	@${REINPLACE_CMD} 's\|0.0.0~unknown\|${PORTVERSION}-${GH_TAGNAME}\|' \	89	@${REINPLACE_CMD} 's\|0.0.0~unknown\|${PORTVERSION}-${GH_TAGNAME}\|' \
73	${WRKSRC}/support/version	90	${WRKSRC}/support/version




# Created by: Bernhard Froehlich <decke@FreeBSD.org>
# $FreeBSD: head/multimedia/tvheadend/Makefile 399955 2015-10-22 10:19:42Z decke $

PORTNAME=	tvheadend
PORTVERSION=	4.0.6
CATEGORIES=	multimedia

MAINTAINER=	decke@FreeBSD.org
COMMENT=	TV streaming server supporting DVB, IPTV and V4L

LICENSE=	GPLv3

BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat

LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
		liburiparser.so:${PORTSDIR}/net/uriparser
RUN_DEPENDS=	dtv-scan-tables>=0:${PORTSDIR}/multimedia/dtv-scan-tables

USE_GITHUB=	yes
GH_TAGNAME=	d97d5f1

USES=		execinfo gmake pkgconfig python shebangfix
GNU_CONFIGURE=	yes
MAKE_JOBS_UNSAFE=	yes
USE_RC_SUBR=	${PORTNAME}

SHEBANG_FILES=	${WRKSRC}/Autobuild.sh \
		${WRKSRC}/configure \
		${WRKSRC}/support/configure.inc \
		${WRKSRC}/support/getmuxlist \
		${WRKSRC}/support/pbuilder \
		${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
CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz

OPTIONS_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV
OPTIONS_DEFAULT=DVBCSA

AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app

DVBCSA_DESC=		Replace internal ffdecsa with dvbcsa
DVBCSA_LIB_DEPENDS=	libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
DVBCSA_CONFIGURE_ENABLE=	dvbcsa

TRANSCODING_DESC=	Transcoding for mobile and web clients
TRANSCODING_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
TRANSCODING_CONFIGURE_ENABLE=	libav

XMLTV_RUN_DEPENDS=	p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv

.include <bsd.port.pre.mk>

.if ( !empty(CC:M*clang*) || ${OSVERSION} >= 1000024 )
# CLANG also needs -Wno-microsoft which GCC 4.2 does not know
CFLAGS+=	-Wno-microsoft \
		-Wno-tautological-constant-out-of-range-compare
.endif

post-patch:
	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
		${WRKSRC}/support/version
	@${REINPLACE_CMD} 's|-g||' \
		${WRKSRC}/Makefile
	@${REINPLACE_CMD} 's|-ldl||' \
		${WRKSRC}/Makefile
	# ignore gcc warnings on FreeBSD 9.X, and clang warnings on FreeBSD 10+
	@${REINPLACE_CMD} 's|-Werror||' \
		${WRKSRC}/Makefile
	# Remove -Wunused-result because gcc 4.2 on FreeBSD 9.x does not know it
	@${REINPLACE_CMD} 's|-Wunused-result||' \
		${WRKSRC}/Makefile
.if ${OSVERSION} >= 1000000
	# to suppress clang CC flags on FreeBSD 10+
	# @${REINPLACE_CMD} 's|clang|clang-options-disabled|' \
	# to enable clang CC flags, because clang is identified as 'cc' on FreeBSD 10+
	@${REINPLACE_CMD} 's|clang|cc|' \
		${WRKSRC}/Makefile
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)tvheadend/distinfo (+2 lines)
1	SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf	1	SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf
2	SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659	2	SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659
		3	SHA256 (libhdhomerun_20150826.tgz) = 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf
		4	SIZE (libhdhomerun_20150826.tgz) = 49169

Line 0 Link Here

(-)tvheadend/distinfo.orig (+2 lines)
	1	SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf
	2	SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659




--- Makefile.hdhomerun.orig	2015-09-25 15:57:59.000000000 +0200
+++ Makefile.hdhomerun	2015-11-02 15:56:03.698931040 +0100
@@ -23,15 +23,8 @@
 
 define DOWNLOAD
 	@mkdir -p $(LIBHDHRDIR)/build
-	@if test -z "$${TVHEADEND_FILE_CACHE}"; then \
-	  printf "WGET            $(1)\n"; \
-	  wget --no-verbose -O $(2) $(1); \
-	else \
-	  file=$$(basename $(2)); \
-	  cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
-	fi
 	@{ \
-	  sum=$$(sha1sum $(2) | cut -d ' ' -f 1); \
+	  sum=$$(sha1 $(2) | cut -d ' ' -f 4); \
 	  printf "SHA1SUM test '$${sum}' == '$(3)': "; \
 	  test "y$${sum}" = "y$(3)"; \
 	}
@@ -75,6 +68,7 @@
 	$(call DOWNLOAD,$(LIBHDHR_URL),$(LIBHDHRDIR)/$(LIBHDHR_TB),$(LIBHDHR_SHA1))
 	$(call UNTAR,$(LIBHDHR_TB),z)
 	ln -sf libhdhomerun $(LIBHDHRDIR)/$(LIBHDHR)
+	sed -I '' 's|gcc|cc|' $(LIBHDHRDIR)/$(LIBHDHR)/Makefile
 	@touch $@
 
 $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build: \

Return to bug 204138

Line 0 Link Here

(-)tvheadend/Makefile.orig (+92 lines)
		1	# Created by: Bernhard Froehlich <decke@FreeBSD.org>
		2	# $FreeBSD: head/multimedia/tvheadend/Makefile 399955 2015-10-22 10:19:42Z decke $
		3
		4	PORTNAME= tvheadend
		5	PORTVERSION= 4.0.6
		6	CATEGORIES= multimedia
		7
		8	MAINTAINER= decke@FreeBSD.org
		9	COMMENT= TV streaming server supporting DVB, IPTV and V4L
		10
		11	LICENSE= GPLv3
		12
		13	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
		14	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
		15
		16	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
		17	liburiparser.so:${PORTSDIR}/net/uriparser
		18	RUN_DEPENDS= dtv-scan-tables>=0:${PORTSDIR}/multimedia/dtv-scan-tables
		19
		20	USE_GITHUB= yes
		21	GH_TAGNAME= d97d5f1
		22
		23	USES= execinfo gmake pkgconfig python shebangfix
		24	GNU_CONFIGURE= yes
		25	MAKE_JOBS_UNSAFE= yes
		26	USE_RC_SUBR= ${PORTNAME}
		27
		28	SHEBANG_FILES= ${WRKSRC}/Autobuild.sh \
		29	${WRKSRC}/configure \
		30	${WRKSRC}/support/configure.inc \
		31	${WRKSRC}/support/getmuxlist \
		32	${WRKSRC}/support/pbuilder \
		33	${WRKSRC}/support/version
		34
		35	TVHUSER?= tvheadend
		36	TVHGROUP?= tvheadend
		37
		38	USERS= ${TVHUSER}
		39	GROUPS= ${TVHGROUP} webcamd
		40	SUB_LIST+= TVHUSER="${TVHUSER}" \
		41	TVHGROUP="${TVHGROUP}"
		42
		43	CONFIGURE_ENV+= PLATFORM=freebsd
		44	CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
		45	CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
		46	LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
		47
		48	OPTIONS_DEFINE= AVAHI DVBCSA TRANSCODING XMLTV
		49	OPTIONS_DEFAULT=DVBCSA
		50
		51	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
		52
		53	DVBCSA_DESC= Replace internal ffdecsa with dvbcsa
		54	DVBCSA_LIB_DEPENDS= libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa
		55	DVBCSA_CONFIGURE_ENABLE= dvbcsa
		56
		57	TRANSCODING_DESC= Transcoding for mobile and web clients
		58	TRANSCODING_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
		59	TRANSCODING_CONFIGURE_ENABLE= libav
		60
		61	XMLTV_RUN_DEPENDS= p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv
		62
		63	.include <bsd.port.pre.mk>
		64
65	.if ( !empty(CC:Mclang) \|\| ${OSVERSION} >= 1000024 )
66	# CLANG also needs -Wno-microsoft which GCC 4.2 does not know
67	CFLAGS+= -Wno-microsoft \
68	-Wno-tautological-constant-out-of-range-compare
69	.endif
70
71	post-patch:
72	@${REINPLACE_CMD} 's\|0.0.0~unknown\|${PORTVERSION}-${GH_TAGNAME}\|' \
73	${WRKSRC}/support/version
74	@${REINPLACE_CMD} 's\|-g\|\|' \
75	${WRKSRC}/Makefile
76	@${REINPLACE_CMD} 's\|-ldl\|\|' \
77	${WRKSRC}/Makefile
78	# ignore gcc warnings on FreeBSD 9.X, and clang warnings on FreeBSD 10+
79	@${REINPLACE_CMD} 's\|-Werror\|\|' \
80	${WRKSRC}/Makefile
81	# Remove -Wunused-result because gcc 4.2 on FreeBSD 9.x does not know it
82	@${REINPLACE_CMD} 's\|-Wunused-result\|\|' \
83	${WRKSRC}/Makefile
84	.if ${OSVERSION} >= 1000000
85	# to suppress clang CC flags on FreeBSD 10+
86	# @${REINPLACE_CMD} 's\|clang\|clang-options-disabled\|' \
87	# to enable clang CC flags, because clang is identified as 'cc' on FreeBSD 10+
88	@${REINPLACE_CMD} 's\|clang\|cc\|' \
89	${WRKSRC}/Makefile
90	.endif
91
92	.include <bsd.port.post.mk>

Line 0 Link Here

(-)tvheadend/files/patch-Makefile.hdhomerun (+27 lines)
	1	--- Makefile.hdhomerun.orig 2015-09-25 15:57:59.000000000 +0200
	2	+++ Makefile.hdhomerun 2015-11-02 15:56:03.698931040 +0100
	3	@@ -23,15 +23,8 @@
	4
	5	define DOWNLOAD
	6	@mkdir -p $(LIBHDHRDIR)/build
	7	- @if test -z "$${TVHEADEND_FILE_CACHE}"; then \
	8	- printf "WGET $(1)\n"; \
	9	- wget --no-verbose -O $(2) $(1); \
	10	- else \
	11	- file=$$(basename $(2)); \
	12	- cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
	13	- fi
	14	@{ \
	15	- sum=$$(sha1sum $(2) \| cut -d ' ' -f 1); \
	16	+ sum=$$(sha1 $(2) \| cut -d ' ' -f 4); \
	17	printf "SHA1SUM test '$${sum}' == '$(3)': "; \
	18	test "y$${sum}" = "y$(3)"; \
	19	}
	20	@@ -75,6 +68,7 @@
	21	$(call DOWNLOAD,$(LIBHDHR_URL),$(LIBHDHRDIR)/$(LIBHDHR_TB),$(LIBHDHR_SHA1))
	22	$(call UNTAR,$(LIBHDHR_TB),z)
	23	ln -sf libhdhomerun $(LIBHDHRDIR)/$(LIBHDHR)
	24	+ sed -I '' 's\|gcc\|cc\|' $(LIBHDHRDIR)/$(LIBHDHR)/Makefile
	25	@touch $@
	26
	27	$(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build: \