Date: Tue, 13 Dec 2016 12:15:33 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428482 - in head/multimedia/vdr: . files Message-ID: <201612131215.uBDCFXL1002458@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Dec 13 12:15:33 2016 New Revision: 428482 URL: https://svnweb.freebsd.org/changeset/ports/428482 Log: - Pet portlint - Switch to options helpers - Cosmetic fixes - Remove broken extra patch - Turn non-optional extra patch to regular patch - Fix Makefile.plugins to not override PLIST_SUB Added: head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates - copied unchanged from r428481, head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch Deleted: head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch head/multimedia/vdr/files/vdr-1.7.27-pat.diff Modified: head/multimedia/vdr/Makefile head/multimedia/vdr/Makefile.plugins Modified: head/multimedia/vdr/Makefile ============================================================================== --- head/multimedia/vdr/Makefile Tue Dec 13 11:58:14 2016 (r428481) +++ head/multimedia/vdr/Makefile Tue Dec 13 12:15:33 2016 (r428482) @@ -6,6 +6,7 @@ PORTVERSION= 1.7.29 PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ +DIST_SUBDIR= vdr MAINTAINER= ports@FreeBSD.org COMMENT= Video Disk Recorder - development version @@ -13,47 +14,53 @@ COMMENT= Video Disk Recorder - developme LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ +BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat \ + ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig \ xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype -OPTIONS_DEFINE= IPTVPATCH TTXPATCH STB0899_SIGNAL DOCS NLS -IPTVPATCH_DESC= Stops EIT scans on IPTV channels -TTXPATCH_DESC= Support patches for teletext subtitle plugin -DVBPATCH_DESC= DVB audio patch for some countries -STB0899_SIGNAL_DESC= STB0899 signal strength patch -OPTIONS_DEFAULT= IPTVPATCH TTXPATCH - USES= cpe gettext gmake iconv:wchar_t jpeg pkgconfig shebangfix tar:bzip2 CPE_VENDOR= tvdr SHEBANG_FILES= svdrpsend -DIST_SUBDIR= vdr -PORTDOCS= COPYING INSTALL MANUAL README HISTORY CONFDIR= ${ETCDIR} USE_CSTD= gnu89 -MAKE_ARGS+= CC="${CC}" -MAKE_ARGS+= CXX="${CXX}" -MAKE_ARGS+= VDR_USER=${VDR_USER} -MAKE_ARGS+= CONFDIR=${CONFDIR} -MAKE_ARGS+= OSTYPE=FreeBSD -MAKE_ARGS+= LIRC_DEVICE=/var/run/lirc/lircd -MAKE_ARGS+= LIBDIR=../../lib -MAKE_ARGS+= VDRDIR=${WRKSRC} -MAKE_ARGS+= TMPDIR=/tmp -MAKE_ARGS+= PREFIX=${PREFIX} +MAKE_ARGS= CC="${CC}" \ + CXX="${CXX}" \ + VDR_USER=${VDR_USER} \ + CONFDIR=${CONFDIR} \ + OSTYPE=FreeBSD \ + LIRC_DEVICE=/var/run/lirc/lircd \ + LIBDIR=../../lib \ + VDRDIR=${WRKSRC} \ + TMPDIR=/tmp \ + PREFIX=${PREFIX} ALL_TARGET= all plugins -VIDEODIR= /video -SUB_LIST+= VIDEODIR=${VIDEODIR} -SUB_FILES+= vdr-waitdvb -USE_RC_SUBR= vdr VDR_USER= vdr VDR_GROUP= vdr + +VIDEODIR= /video +SUB_LIST= VIDEODIR=${VIDEODIR} +SUB_FILES= vdr-waitdvb +USE_RC_SUBR= vdr USERS= ${VDR_USER} GROUPS= ${VDR_GROUP} -PLIST_SUB= VDR_USER=${VDR_USER} -PLIST_SUB+= VDR_GROUP=${VDR_GROUP} +PLIST_SUB= VDR_USER=${VDR_USER} \ + VDR_GROUP=${VDR_GROUP} + +PORTDOCS= INSTALL MANUAL README HISTORY + +OPTIONS_DEFINE= IPTVPATCH TTXPATCH STB0899_SIGNAL DOCS NLS +OPTIONS_DEFAULT= IPTVPATCH TTXPATCH +OPTIONS_SUB= yes + +IPTVPATCH_DESC= Stops EIT scans on IPTV channels +TTXPATCH_DESC= Support patches for teletext subtitle plugin +STB0899_SIGNAL_DESC= STB0899 signal strength patch + +IPTVPATCH_EXTRA_PATCHES= ${FILESDIR}/vdr-1.7.15-disable_eitscan.patch + +NLS_ALL_TARGET= vdr plugins .include <bsd.port.options.mk> @@ -65,27 +72,6 @@ IGNORE= will not work due to lack of dr USE_GCC= any .endif -EXTRA_PATCHES+= ${FILESDIR}/vdr-1.7.15-disable_ca_updates.patch -.if ${PORT_OPTIONS:MIPTVPATCH} -EXTRA_PATCHES+= ${FILESDIR}/vdr-1.7.15-disable_eitscan.patch -.endif -.if ${PORT_OPTIONS:MDVBPATCH} -EXTRA_PATCHES+= ${FILESDIR}/vdr-1.7.27-pat.diff -.endif - -.if ${PORT_OPTIONS:MTTXPATCH} -PLIST_SUB+= TTXPATCH="" -.else -PLIST_SUB+= TTXPATCH="@comment " -.endif - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -ALL_TARGET= vdr plugins -.endif - post-patch: # clang doesn't know -MG: @${REINPLACE_CMD} -e '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \ @@ -93,15 +79,6 @@ post-patch: ${WRKSRC}/PLUGINS/src/*/Makefile @[ ! -f ${WRKSRC}/s2apiwrapper.c ] || \ ${REINPLACE_CMD} 's/__u32/uint32_t/' ${WRKSRC}/s2apiwrapper.c -.if ${PORT_OPTIONS:MTTXPATCH} - @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/vdr-1.7.21-ttxtsubs.patch-1 - @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/vdr-1.7.21-ttxtsubs.patch-2 -.endif -.if ${PORT_OPTIONS:MSTB0899_SIGNAL} -# This fixes signal strength display for e.g. pctv452e-based tuners. -# (like TT S2-36?0.) - @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/stb0899-signalstrength.patch -.endif @${SED} \ -e '/^PREFIX/d' \ -e 's|^\(VIDEODIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*|\1\2${VIDEODIR}|' \ @@ -110,20 +87,29 @@ post-patch: # We don't support this yet: @${RM} -r ${WRKSRC}/PLUGINS/src/dvbhddevice +post-patch-TTXPATCH-on: + @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/vdr-1.7.21-ttxtsubs.patch-1 + @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/vdr-1.7.21-ttxtsubs.patch-2 + +post-patch-STB0899_SIGNAL-on: +# This fixes signal strength display for e.g. pctv452e-based tuners. +# (like TT S2-36?0.) + @${PATCH} -d ${WRKSRC} --quiet -p1 <${FILESDIR}/stb0899-signalstrength.patch + post-install: -.if ${PORT_OPTIONS:MNLS} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share/) -.endif - ${MKDIR} ${STAGEDIR}${CONFDIR}/plugins + @${MKDIR} ${STAGEDIR}${CONFDIR}/plugins ${INSTALL_DATA} ${FILESDIR}/remote.conf ${STAGEDIR}${CONFDIR}/remote.conf.sample for i in $$(cd ${WRKSRC} && ls *.conf); do \ ${MV} -i ${STAGEDIR}${CONFDIR}/$$i \ ${STAGEDIR}${CONFDIR}/$$i.sample; \ done ${INSTALL_SCRIPT} ${WRKDIR}/vdr-waitdvb ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install-NLS-on: + @(cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share/) + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/multimedia/vdr/Makefile.plugins ============================================================================== --- head/multimedia/vdr/Makefile.plugins Tue Dec 13 11:58:14 2016 (r428481) +++ head/multimedia/vdr/Makefile.plugins Tue Dec 13 12:15:33 2016 (r428482) @@ -27,7 +27,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} MAKE_ENV+= LOCALBASE=${LOCALBASE} VDR_USER= vdr VDR_GROUP= vdr -PLIST_SUB= VDR_USER=${VDR_USER} +PLIST_SUB+= VDR_USER=${VDR_USER} PLIST_SUB+= VDR_GROUP=${VDR_GROUP} PLIST_SUB+= APIVERSION=${APIVERSION} Copied: head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates (from r428481, head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates Tue Dec 13 12:15:33 2016 (r428482, copy of r428481, head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch) @@ -0,0 +1,10 @@ +--- pat.c.orig 2010-06-06 19:11:15.000000000 +0300 ++++ pat.c 2010-06-06 20:42:47.000000000 +0300 +@@ -490,6 +490,7 @@ + } + if (Setup.UpdateChannels >= 2) { + Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid); ++ if (!cSource::IsType(Channel->Source(), 'I')) + Channel->SetCaIds(CaDescriptors->CaIds()); + Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131215.uBDCFXL1002458>