Attachment 162710 Details for Bug 204138 – Improved patch

[patch] Improved patch

tvheadend.hdhomerun.patch2 (text/plain), 6.73 KB, created by Karsten Schmidt on 2015-11-02 15:03:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Schmidt

Created: 2015-11-02 15:03:23 UTC

Size: 6.73 KB

patch

obsolete

>diff -ruN tvheadend.orig/Makefile tvheadend/Makefile
>--- tvheadend.orig/Makefile	2015-10-22 12:19:42.000000000 +0200
>+++ tvheadend/Makefile	2015-11-02 15:58:59.094918686 +0100
>@@ -20,6 +20,9 @@
> USE_GITHUB=	yes
> GH_TAGNAME=	d97d5f1
> 
>+DISTFILES=	tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
>+EXTRACT_ONLY=	tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz
>+
> USES=		execinfo gmake pkgconfig python shebangfix
> GNU_CONFIGURE=	yes
> MAKE_JOBS_UNSAFE=	yes
>@@ -45,7 +48,7 @@
> 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_DEFINE=	AVAHI DVBCSA TRANSCODING XMLTV HDHOMERUN
> OPTIONS_DEFAULT=DVBCSA
> 
> AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
>@@ -58,6 +61,9 @@
> TRANSCODING_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
> TRANSCODING_CONFIGURE_ENABLE=	libav
> 
>+HDHOMERUN_DESC=		HDHomerun support (libhdhomerun)
>+HDHOMERUN_CONFIGURE_ENABLE=	dhomerun_client hdhomerun_static
>+
> XMLTV_RUN_DEPENDS=	p5-xmltv>=0:${PORTSDIR}/textproc/p5-xmltv
> 
> .include <bsd.port.pre.mk>
>@@ -68,6 +74,17 @@
> 		-Wno-tautological-constant-out-of-range-compare
> .endif
> 
>+.if ${PORT_OPTIONS:MHDHOMERUN}
>+DISTFILES+=	libhdhomerun_20150826.tgz:extra
>+MASTER_SITES+=	http://download.silicondust.com/hdhomerun/:extra
>+.endif
>+
>+post-extract:
>+.if ${PORT_OPTIONS:MHDHOMERUN}
>+	${MKDIR} ${WRKSRC}/libhdhomerun_static
>+	${CP} ${_DISTDIR}/libhdhomerun_20150826.tgz ${WRKSRC}/libhdhomerun_static
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
> 		${WRKSRC}/support/version
>diff -ruN tvheadend.orig/Makefile.orig tvheadend/Makefile.orig
>--- tvheadend.orig/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
>+++ tvheadend/Makefile.orig	2015-10-22 12:19:42.000000000 +0200
>@@ -0,0 +1,92 @@
>+# 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>
>diff -ruN tvheadend.orig/distinfo tvheadend/distinfo
>--- tvheadend.orig/distinfo	2015-10-22 12:19:42.000000000 +0200
>+++ tvheadend/distinfo	2015-11-02 15:59:04.557917323 +0100
>@@ -1,2 +1,4 @@
> SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf
> SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659
>+SHA256 (libhdhomerun_20150826.tgz) = 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf
>+SIZE (libhdhomerun_20150826.tgz) = 49169
>diff -ruN tvheadend.orig/distinfo.orig tvheadend/distinfo.orig
>--- tvheadend.orig/distinfo.orig	1970-01-01 01:00:00.000000000 +0100
>+++ tvheadend/distinfo.orig	2015-10-22 12:19:42.000000000 +0200
>@@ -0,0 +1,2 @@
>+SHA256 (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 154ad12248847e0f8a8ff91b186f2edcd4b081c40c39d467be78d14f62842bcf
>+SIZE (tvheadend-tvheadend-4.0.6-d97d5f1_GH0.tar.gz) = 15825659
>diff -ruN tvheadend.orig/files/patch-Makefile.hdhomerun tvheadend/files/patch-Makefile.hdhomerun
>--- tvheadend.orig/files/patch-Makefile.hdhomerun	1970-01-01 01:00:00.000000000 +0100
>+++ tvheadend/files/patch-Makefile.hdhomerun	2015-11-02 15:58:59.096921103 +0100
>@@ -0,0 +1,27 @@
>+--- 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: \

Actions: View | Diff

Attachments on bug 204138: 162591 | 162710 | 162711 | 165851