Index: head/multimedia/vdr/Makefile =================================================================== --- head/multimedia/vdr/Makefile (revision 312663) +++ head/multimedia/vdr/Makefile (revision 312664) @@ -1,131 +1,131 @@ # New ports collection makefile for: vdr # Date created: Wed Apr 14 18:11:42 CEST 2010 # Whom: Juergen Lock # # $FreeBSD$ # PORTNAME= vdr PORTVERSION= 1.7.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - development version BUILD_DEPENDS= v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig OPTIONS_DEFINE= IPTVPATCH TTXPATCH STB0899_SIGNAL 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 DIST_SUBDIR= vdr USE_BZIP2= yes USE_GMAKE= yes USE_PKGCONFIG= build USE_GETTEXT= yes USE_ICONV= yes PORTDOCS= COPYING INSTALL MANUAL README HISTORY MAKE_JOBS_SAFE= yes MAN1= vdr.1 MAN5= vdr.5 MANCOMPRESSED= yes 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 ALL_TARGET= all plugins VIDEODIR= /video SUB_LIST+= VIDEODIR=${VIDEODIR} SUB_FILES+= vdr-waitdvb USE_RC_SUBR= vdr VDR_USER= vdr VDR_GROUP= vdr USERS= ${VDR_USER} GROUPS= ${VDR_GROUP} PLIST_SUB= VDR_USER=${VDR_USER} PLIST_SUB+= VDR_GROUP=${VDR_GROUP} .include 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} '/^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} '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-install: .if ${PORT_OPTIONS:MNLS} @(cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${PREFIX}/share/) .endif ${MKDIR} ${CONFDIR}/plugins ${CHOWN} ${VDR_USER}:${VDR_GROUP} ${CONFDIR} ${CONFDIR}/plugins ${INSTALL_DATA} ${FILESDIR}/remote.conf ${CONFDIR}/remote.conf.sample @if [ ! -f ${CONFDIR}/remote.conf ]; then \ ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${FILESDIR}/remote.conf ${CONFDIR}; \ fi for i in $$(cd ${WRKSRC} && ls *.conf); do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${CONFDIR}/$$i.sample; \ if [ ! -f ${CONFDIR}/$$i ]; then \ ${INSTALL_DATA} -o ${VDR_USER} -g ${VDR_GROUP} ${WRKSRC}/$$i ${CONFDIR}/$$i; \ fi; \ done ${INSTALL_SCRIPT} ${WRKDIR}/vdr-waitdvb ${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif .include Index: head/multimedia/vdr/files/patch-dvbdevice.c =================================================================== --- head/multimedia/vdr/files/patch-dvbdevice.c (revision 312663) +++ head/multimedia/vdr/files/patch-dvbdevice.c (revision 312664) @@ -1,37 +1,55 @@ --- dvbdevice.c.orig +++ dvbdevice.c @@ -7,6 +7,7 @@ - * $Id: dvbdevice.c 2.38 2010/05/01 09:47:13 kls Exp $ + * $Id: dvbdevice.c 2.71 2012/05/09 08:33:59 kls Exp $ */ +#include #include "dvbdevice.h" #include #include -@@ -592,7 +598,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -579,7 +580,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1) break; - if (errno == EOPNOTSUPP) { + if (errno == EOPNOTSUPP || errno == ENXIO) { Snr = 0xFFFF; HasSnr = false; break; -@@ -605,7 +611,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -592,7 +593,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1) break; - if (errno == EOPNOTSUPP) { + if (errno == EOPNOTSUPP || errno == ENXIO) { Ber = 0; HasBer = false; break; -@@ -618,7 +624,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -605,7 +606,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1) break; - if (errno == EOPNOTSUPP) { + if (errno == EOPNOTSUPP || errno == ENXIO) { Unc = 0; HasUnc = false; break; +@@ -732,7 +733,7 @@ bool cDvbTuner::SetFrontend(void) + if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) { + frequency -= diseqc->Lof(); + if (diseqc != lastDiseqc || diseqc->IsScr()) { +- if (GetBondedMaster() == this) { ++ if (!bondedTuner || bondedMaster) { + ExecuteDiseqc(diseqc, &frequency); + if (frequency == 0) + return false; +@@ -758,7 +759,7 @@ bool cDvbTuner::SetFrontend(void) + tone = SEC_TONE_ON; + } + int volt = (dtp.Polarization() == 'V' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18; +- if (GetBondedMaster() != this) { ++ if (bondedTuner && !bondedMaster) { + tone = SEC_TONE_OFF; + volt = SEC_VOLTAGE_13; + } Property changes on: head/multimedia/vdr/files/patch-dvbdevice.c ___________________________________________________________________ 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 Index: head/multimedia/vdr/files/patch-menu.c =================================================================== --- head/multimedia/vdr/files/patch-menu.c (nonexistent) +++ head/multimedia/vdr/files/patch-menu.c (revision 312664) @@ -0,0 +1,11 @@ +--- menu.c.orig ++++ menu.c +@@ -2938,6 +2938,8 @@ void cMenuSetupLNB::Setup(void) + for (int i = 0; i < cDevice::NumDevices(); i++) { + if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat)) + Add(new cMenuEditIntItem(cString::sprintf(tr("Setup.LNB$Device %d connected to sat cable"), i + 1), &satCableNumbers.Array()[i], 0, NumSatDevices, tr("Setup.LNB$own"))); ++ else ++ satCableNumbers.Array()[i] = 0; + } + } + Property changes on: head/multimedia/vdr/files/patch-menu.c ___________________________________________________________________ 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