Index: head/multimedia/vdr/Makefile =================================================================== --- head/multimedia/vdr/Makefile (revision 428481) +++ head/multimedia/vdr/Makefile (revision 428482) @@ -1,129 +1,115 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= vdr 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 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 .if ${OPSYS} == DragonFly IGNORE= will not work due to lack of driver support .endif .if ${ARCH} == "i386" 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/' \ ${WRKSRC}/Makefile ${WRKSRC}/libsi/Makefile \ ${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}|' \ ${WRKSRC}/Make.config.template >${WRKSRC}/Make.config @${REINPLACE_CMD} -e 's|%%CONFDIR%%|${CONFDIR}|' ${WRKSRC}/vdr.1 # 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 Index: head/multimedia/vdr/Makefile.plugins =================================================================== --- head/multimedia/vdr/Makefile.plugins (revision 428481) +++ head/multimedia/vdr/Makefile.plugins (revision 428482) @@ -1,58 +1,58 @@ # this is to be included by vdr plugin ports # # $FreeBSD$ BUILD_DEPENDS+= ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat BUILD_DEPENDS+= vdr:multimedia/vdr RUN_DEPENDS+= vdr:multimedia/vdr APIVERSION= 1.7.29 DIST_SUBDIR= vdr PATCH_SUBDIR= vdr USES+= gettext gmake VDRDIR= ${LOCALBASE}/include/vdr VDRINCDIR= ${LOCALBASE}/include USE_CSTD?= gnu89 MAKE_ARGS+= CC="${CC}" MAKE_ARGS+= CXX="${CXX}" MAKE_ARGS+= DVBDIR=${LOCALBASE}/include MAKE_ARGS+= VDRDIR=${VDRDIR} MAKE_ARGS+= VDR_USER=${VDR_USER} MAKE_ARGS+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" MAKE_ARGS+= OSTYPE=FreeBSD MAKE_ARGS+= PREFIX=${PREFIX} PLUGIN?= ${PORTNAME:S/^vdr-plugin-//} 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} .include .if ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif localeplist: @${FIND} ${WRKDIR}/locale -type f -print |${SED} 's|^.*locale/|%%NLS%%share/locale/|' post-patch-plugin: @${MKDIR} ${WRKDIR}/lib ${WRKDIR}/locale @${REINPLACE_CMD} -e 's/^\(LIBDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2..\/lib/;' \ -e 's/^\(LOCALEDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2..\/locale/;' \ -e 's/^\(VDRDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${VDRDIR:S-/-\\\\/-g}/;" \ -e 's/^\(VDRINCDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${VDRINCDIR:S-/-\\\\/-g}/;" \ -e 's/^\(BINDIR[[:space:]]*\)[?]*\(=[[:space:]]*\).*/\1\2'"${PREFIX:S-/-\\\\/-g}\/bin/;" \ -e '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \ ${WRKSRC}/Makefile ${VDR_PLUGIN_MAKEFILES} post-install-pluginlocales: .if ${PORT_OPTIONS:MNLS} @(cd ${WRKDIR} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share/) .endif Index: head/multimedia/vdr/files/vdr-1.7.27-pat.diff =================================================================== --- head/multimedia/vdr/files/vdr-1.7.27-pat.diff (revision 428481) +++ head/multimedia/vdr/files/vdr-1.7.27-pat.diff (nonexistent) @@ -1,44 +0,0 @@ ---- pat.c 2012/03/02 10:56:45 2.17 -+++ pat.c 2012/04/09 11:49:39 2.18 -@@ -456,11 +456,28 @@ - } - } - break; -- case 0x80: // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57) -- Vpid = esPid; -- Ppid = pmt.getPCRPid(); -- Vtype = 0x02; // compression based upon MPEG-2 -- ProcessCaDescriptors = true; -+ // see http://www.smpte-ra.org/mpegreg/mpegreg.html for the codes used below -+ case 0x80: { // STREAMTYPE_USER_PRIVATE - DigiCipher II VIDEO (ANSI/SCTE 57) -+ SI::Descriptor *d; -+ for (SI::Loop::Iterator it; (d = stream.streamDescriptors.getNext(it)); ) { -+ switch (d->getDescriptorTag()) { -+ case SI::RegistrationDescriptorTag: { -+ SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d; -+ switch (rd->getFormatIdentifier()) { -+ case 0x44434949: // 'DCII' aka. DigiCipher II -+ Vpid = esPid; -+ Ppid = pmt.getPCRPid(); -+ Vtype = 0x02; // compression based upon MPEG-2 -+ ProcessCaDescriptors = true; -+ break; -+ default: ; -+ } -+ } -+ break; -+ default: ; -+ } -+ } -+ } - break; - case 0x81: // STREAMTYPE_USER_PRIVATE - ATSC A/53 AUDIO (ANSI/SCTE 57) - { -@@ -495,7 +512,6 @@ - switch (d->getDescriptorTag()) { - case SI::RegistrationDescriptorTag: { - SI::RegistrationDescriptor *rd = (SI::RegistrationDescriptor *)d; -- // http://www.smpte-ra.org/mpegreg/mpegreg.html - switch (rd->getFormatIdentifier()) { - case 0x41432D33: // 'AC-3' - IsAc3 = true; Property changes on: head/multimedia/vdr/files/vdr-1.7.27-pat.diff ___________________________________________________________________ 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/vdr/files/vdr-1.7.15-disable_ca_updates.patch =================================================================== --- head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch (revision 428481) +++ head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch (nonexistent) @@ -1,10 +0,0 @@ ---- 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); - } Property changes on: head/multimedia/vdr/files/vdr-1.7.15-disable_ca_updates.patch ___________________________________________________________________ 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/vdr/files/patch-vdr-1.7.15-disable_ca_updates =================================================================== --- head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates (nonexistent) +++ head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates (revision 428482) @@ -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); + } Property changes on: head/multimedia/vdr/files/patch-vdr-1.7.15-disable_ca_updates ___________________________________________________________________ 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