diff options
51 files changed, 412 insertions, 211 deletions
diff --git a/multimedia/vdr-plugin-control/Makefile b/multimedia/vdr-plugin-control/Makefile index 58ded7778956..b92efe8a161f 100644 --- a/multimedia/vdr-plugin-control/Makefile +++ b/multimedia/vdr-plugin-control/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-control PORTVERSION= 0.0.2a45 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://ricomp.de/vdr/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a45/a/}${DISTVERSIONSUFFIX} @@ -23,7 +23,7 @@ COMMENT= Video Disk Recorder - telnet control plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION:S/a45/a/} diff --git a/multimedia/vdr-plugin-eepg/Makefile b/multimedia/vdr-plugin-eepg/Makefile index 75f310d00408..d8c4bcc16374 100644 --- a/multimedia/vdr-plugin-eepg/Makefile +++ b/multimedia/vdr-plugin-eepg/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-eepg PORTVERSION= 0.0.6p2011071921 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox/ DISTNAME= ${PORTNAME}-${PORTVERSION:C/p.*/pre/}-0-g${GITHASH} @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - extended EPG plugin GITHASH= e7383ed PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${GITHASH} diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile index 29f00390e86f..4e1d5f116473 100644 --- a/multimedia/vdr-plugin-epgsearch/Makefile +++ b/multimedia/vdr-plugin-epgsearch/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-epgsearch PORTVERSION= 1.0.1s20120322 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://winni.vdr-developer.org/epgsearch/downloads/beta/:beta \ LOCAL/nox/:snapshot @@ -20,7 +21,7 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \ USE_BZIP2= yes PATCH_STRIP= -p1 -PORTDOCS= COPYING HISTORY +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I$(LOCALBASE)/include/vdr -I${WRKSRC}" diff --git a/multimedia/vdr-plugin-epgsearch/files/patch-menu_searchresults.c b/multimedia/vdr-plugin-epgsearch/files/patch-menu_searchresults.c new file mode 100644 index 000000000000..3fc2faf758d3 --- /dev/null +++ b/multimedia/vdr-plugin-epgsearch/files/patch-menu_searchresults.c @@ -0,0 +1,14 @@ +--- menu_searchresults.c.orig ++++ menu_searchresults.c +@@ -815,7 +815,11 @@ eOSState cMenuSearchResultsForRecs::Play + { + cRecording *recording = GetRecording(ri); + if (recording) { ++#if APIVERSNUM < 10728 + cReplayControl::SetRecording(recording->FileName(), recording->Title()); ++#else ++ cReplayControl::SetRecording(recording->FileName()); ++#endif + return osReplay; + } + } diff --git a/multimedia/vdr-plugin-extrecmenu/Makefile b/multimedia/vdr-plugin-extrecmenu/Makefile index aa84ff111d53..ada7019c4ceb 100644 --- a/multimedia/vdr-plugin-extrecmenu/Makefile +++ b/multimedia/vdr-plugin-extrecmenu/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-extrecmenu PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/936/ DISTNAME= vdr-${PLUGIN}-${PORTVERSION} diff --git a/multimedia/vdr-plugin-femon/Makefile b/multimedia/vdr-plugin-femon/Makefile index f55082dacf65..813e6e0838b8 100644 --- a/multimedia/vdr-plugin-femon/Makefile +++ b/multimedia/vdr-plugin-femon/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-femon PORTVERSION= 1.7.17 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -17,7 +18,7 @@ COMMENT= Video Disk Recorder - frontend monitor plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-infosatepg/Makefile b/multimedia/vdr-plugin-infosatepg/Makefile index 5d4e344523f3..32a0c605820e 100644 --- a/multimedia/vdr-plugin-infosatepg/Makefile +++ b/multimedia/vdr-plugin-infosatepg/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-infosatepg PORTVERSION= 0.0.11 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/342/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - infosat EPG plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-iptv/Makefile b/multimedia/vdr-plugin-iptv/Makefile index d0704cbe4f52..d303a6b6653f 100644 --- a/multimedia/vdr-plugin-iptv/Makefile +++ b/multimedia/vdr-plugin-iptv/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-iptv PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -17,7 +18,7 @@ COMMENT= Video Disk Recorder - IP television plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY PORTEXAMPLES= channels.conf.iptv MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile index 14b85cb8f270..f56de25c6725 100644 --- a/multimedia/vdr-plugin-markad/Makefile +++ b/multimedia/vdr-plugin-markad/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-markad PORTVERSION= 0.1.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/578/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -17,11 +17,11 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - MarkAd plugin LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \ - execinfo.1:${PORTSDIR}/devel/libexecinfo + execinfo:${PORTSDIR}/devel/libexecinfo PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY PORTDATA= logos MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile index 01d393b6f457..d6fcd4503ef3 100644 --- a/multimedia/vdr-plugin-osdpip/Makefile +++ b/multimedia/vdr-plugin-osdpip/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-osdpip PORTVERSION= 0.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/880/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -19,13 +19,13 @@ PATCHFILES= osdpip-vdr-1.7.26.diff MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - picture-in-picture plugin -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg DIST_SUBDIR= vdr PATCH_STRIP= -p1 PATCH_DIST_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-osdteletext/Makefile b/multimedia/vdr-plugin-osdteletext/Makefile index af26b0412cd2..4a37f2444afd 100644 --- a/multimedia/vdr-plugin-osdteletext/Makefile +++ b/multimedia/vdr-plugin-osdteletext/Makefile @@ -7,21 +7,18 @@ PORTNAME= vdr-plugin-osdteletext PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/899/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} EXTRACT_SUFX= .tgz -#PATCH_SITES= http://projects.vdr-developer.org/attachments/download/901/ -#PATCHFILES= receiver-fix-2.diff -#PATCH_DIST_STRIP= -p1 - MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - OSD teletext plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-reelchannelscan/Makefile b/multimedia/vdr-plugin-reelchannelscan/Makefile index 7705b99df7f7..c8d34f2c103b 100644 --- a/multimedia/vdr-plugin-reelchannelscan/Makefile +++ b/multimedia/vdr-plugin-reelchannelscan/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-reelchannelscan PORTVERSION= 0.6.1b1.7.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox \ http://ppa.launchpad.net/yavdr/stable-vdr/ubuntu/pool/main/v/vdr-plugin-reelchannelscan/ @@ -19,7 +19,7 @@ COMMENT= Video Disk Recorder - Reelchannelscan plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/b1.7.15//} diff --git a/multimedia/vdr-plugin-remote/Makefile b/multimedia/vdr-plugin-remote/Makefile index a56647335518..d2d7508075ac 100644 --- a/multimedia/vdr-plugin-remote/Makefile +++ b/multimedia/vdr-plugin-remote/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-remote PORTVERSION= 0.4.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://www.escape-edv.de/endriss/vdr/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - remote control plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-skinenigmang/Makefile b/multimedia/vdr-plugin-skinenigmang/Makefile index bc8564ae2aca..238cdb48bd4e 100644 --- a/multimedia/vdr-plugin-skinenigmang/Makefile +++ b/multimedia/vdr-plugin-skinenigmang/Makefile @@ -6,21 +6,22 @@ # PORTNAME= vdr-plugin-skinenigmang -PORTVERSION= 0.1.2 +PORTVERSION= 0.1.2s20120606 CATEGORIES= multimedia -MASTER_SITES= http://andreas.vdr-developer.org/enigmang/download/ -DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -DISTFILES= ${DISTNAME}.tgz \ - skinenigmang-logos-xpm-hi-20070702.tgz +MASTER_SITES= http://andreas.vdr-developer.org/enigmang/download/:release \ + LOCAL/nox:snapshot +DISTNAME= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} +DISTFILES= ${DISTNAME}.tar.bz2:snapshot \ + skinenigmang-logos-xpm-hi-20070702.tgz:release MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - Enigma-NG skin plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes -WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME} .include "${.CURDIR}/../vdr/Makefile.plugins" diff --git a/multimedia/vdr-plugin-skinenigmang/distinfo b/multimedia/vdr-plugin-skinenigmang/distinfo index 3bbc8ae73ced..c89bc8c36400 100644 --- a/multimedia/vdr-plugin-skinenigmang/distinfo +++ b/multimedia/vdr-plugin-skinenigmang/distinfo @@ -1,4 +1,4 @@ -SHA256 (vdr/vdr-skinenigmang-0.1.2.tgz) = b64fb69312dc92a8b45aac4ad5a3c4b3af7328af0f872da57f419bcb7f94a1ad -SIZE (vdr/vdr-skinenigmang-0.1.2.tgz) = 92959 +SHA256 (vdr/vdr-plugin-skinenigmang-0.1.2s20120606.tar.bz2) = 2de64f81947ae245888dd19055ebcd7a79521356a7e8d81d81b466fba05f25bb +SIZE (vdr/vdr-plugin-skinenigmang-0.1.2s20120606.tar.bz2) = 78215 SHA256 (vdr/skinenigmang-logos-xpm-hi-20070702.tgz) = 3428569d284db2fb1e57fe2683a818be489311d0b0ca3d4d172d34638fa61eaf SIZE (vdr/skinenigmang-logos-xpm-hi-20070702.tgz) = 49245 diff --git a/multimedia/vdr-plugin-sleeptimer/Makefile b/multimedia/vdr-plugin-sleeptimer/Makefile index ddcdc887f176..092210066260 100644 --- a/multimedia/vdr-plugin-sleeptimer/Makefile +++ b/multimedia/vdr-plugin-sleeptimer/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-sleeptimer PORTVERSION= 0.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/652/ EXTRACT_SUFX= .tgz @@ -17,7 +17,7 @@ COMMENT= Video Disk Recorder - sleep timer plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} diff --git a/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile b/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile index a14f1df9789b..3a230caa2e85 100644 --- a/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile +++ b/multimedia/vdr-plugin-sleeptimer/files/patch-Makefile @@ -1,14 +1,5 @@ --- a/Makefile +++ b/Makefile -@@ -50,7 +50,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I - - ### The object files (add further files here): - --OBJS = $(PLUGIN).o i18n.o -+OBJS = $(PLUGIN).o - - ### Implicit rules: - @@ -110,3 +110,6 @@ dist: clean clean: @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot diff --git a/multimedia/vdr-plugin-sleeptimer/files/patch-i18.c b/multimedia/vdr-plugin-sleeptimer/files/patch-i18.c new file mode 100644 index 000000000000..1a759fb42398 --- /dev/null +++ b/multimedia/vdr-plugin-sleeptimer/files/patch-i18.c @@ -0,0 +1,14 @@ +--- a/i18n.c ++++ b/i18n.c +@@ -6,9 +6,10 @@ + * $Id: i18n.c 1.3 2002/06/23 13:05:59 kls Exp $ + */ + +-#include "i18n.h" ++#include <vdr/config.h> + + #if VDRVERSNUM < 10507 ++#include "i18n.h" + + const tI18nPhrase Phrases[] = { + { "Not active",// English diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile index f1984bf73d6f..92e65bb78425 100644 --- a/multimedia/vdr-plugin-softdevice/Makefile +++ b/multimedia/vdr-plugin-softdevice/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-softdevice PORTVERSION= 0.5.0p20100414 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= multimedia MASTER_SITES= LOCAL MASTER_SITE_SUBDIR= nox/ @@ -16,14 +16,14 @@ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERS MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - softdevice plugin -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg USE_BZIP2= yes USE_GNOME+= pkgconfig USE_XORG+= xv x11 xinerama PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN} CONFIGURE_ARGS+= --disable-vidix --disable-fb --disable-dfb --disable-cle266 --disable-alsa #--disable-yaepg diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile index ae1c0ce54973..6ff0b4dcdb74 100644 --- a/multimedia/vdr-plugin-softhddevice/Makefile +++ b/multimedia/vdr-plugin-softhddevice/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-softhddevice PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/919/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-streamdev/Makefile b/multimedia/vdr-plugin-streamdev/Makefile index 264e4a85b485..848405276588 100644 --- a/multimedia/vdr-plugin-streamdev/Makefile +++ b/multimedia/vdr-plugin-streamdev/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-streamdev PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/953/:release \ LOCAL:snapshot @@ -19,7 +20,7 @@ COMMENT= Video Disk Recorder - stream device plugin RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY HAVE_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile index fb99d6345783..4dabde837b2a 100644 --- a/multimedia/vdr-plugin-ttxtsubs/Makefile +++ b/multimedia/vdr-plugin-ttxtsubs/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-ttxtsubs PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/725/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile index 2c8affa33fae..6fe2d6ace091 100644 --- a/multimedia/vdr-plugin-upnp/Makefile +++ b/multimedia/vdr-plugin-upnp/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-upnp PORTVERSION= 0.0.2a2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/177/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX} @@ -16,15 +16,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - UPnP/DLNA plugin (alpha!) -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \ boost_system:${PORTSDIR}/devel/boost-libs \ - upnp.9:${PORTSDIR}/devel/upnp \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 + upnp:${PORTSDIR}/devel/upnp \ + sqlite3:${PORTSDIR}/databases/sqlite3 DIST_SUBDIR= vdr PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION:S/a2//} diff --git a/multimedia/vdr-plugin-upnp/files/patch-receiver-livereceiver.cpp b/multimedia/vdr-plugin-upnp/files/patch-receiver-livereceiver.cpp new file mode 100644 index 000000000000..51fcc7e52a46 --- /dev/null +++ b/multimedia/vdr-plugin-upnp/files/patch-receiver-livereceiver.cpp @@ -0,0 +1,29 @@ +--- a/receiver/livereceiver.cpp ++++ b/receiver/livereceiver.cpp +@@ -31,9 +31,19 @@ cLiveReceiver* cLiveReceiver::newInstanc + } + } + ++#if (APIVERSNUM < 10725) + cLiveReceiver::cLiveReceiver(cChannel *Channel, cDevice *Device) + : cReceiver( Channel->GetChannelID(), 0, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()), + mDevice(Device), mChannel(Channel){ ++#else ++cLiveReceiver::cLiveReceiver(cChannel *Channel, cDevice *Device) ++: cReceiver( Channel, 0), ++ mDevice(Device), mChannel(Channel){ ++ AddPid(Channel->Vpid()); ++ AddPids(Channel->Apids()); ++ AddPids(Channel->Dpids()); ++ AddPids(Channel->Spids()); ++#endif + this->mLiveBuffer = NULL; + this->mOutputBuffer = NULL; + this->mFrameDetector = NULL; +@@ -185,4 +195,4 @@ void cLiveReceiver::close(){ + delete this->mLiveBuffer; this->mLiveBuffer = NULL; + this->mFrameDetector = NULL; + MESSAGE(VERBOSE_LIVE_TV, "Live receiver closed."); +-} +\ No newline at end of file ++} diff --git a/multimedia/vdr-plugin-vdrmanager/Makefile b/multimedia/vdr-plugin-vdrmanager/Makefile index cb219939a560..7da89b0fb6c7 100644 --- a/multimedia/vdr-plugin-vdrmanager/Makefile +++ b/multimedia/vdr-plugin-vdrmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-vdrmanager PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/828/ DISTNAME= ${PORTNAME:S/-plugin//}-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - VDR-Manager server plugin PATCH_STRIP= -p1 -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes .include "${.CURDIR}/../vdr/Makefile.plugins" diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile index 66edcb176668..9f23d61691b4 100644 --- a/multimedia/vdr-plugin-vnsiserver/Makefile +++ b/multimedia/vdr-plugin-vnsiserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-vnsiserver PORTVERSION= 0.0.2s20100808.0952 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://ppa.launchpad.net/yavdr/testing-vdr/ubuntu/pool/main/v/vdr-plugin-vnsiserver/ \ LOCAL/nox/ @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - VNSI server plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:S/s20/+svn20/}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c b/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c index 11bd62546019..35f01deca25d 100644 --- a/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c +++ b/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c @@ -1,5 +1,43 @@ --- a/cmdcontrol.c +++ b/cmdcontrol.c +@@ -950,15 +950,15 @@ bool cCmdControl::processRECORDINGS_GetL + } + else + { +- recordingStart = recording->start; ++ recordingStart = recording->Start(); + } + } + LOGCONSOLE("GRI: RC: recordingStart=%lu recordingDuration=%lu", recordingStart, recordingDuration); + + m_resp->add_U32(recordingStart); + m_resp->add_U32(recordingDuration); +- m_resp->add_U32(recording->priority); +- m_resp->add_U32(recording->lifetime); ++ m_resp->add_U32(recording->Priority()); ++ m_resp->add_U32(recording->Lifetime()); + m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : ""); + const char* fullname = recording->Name(); + const char* recname = strrchr(fullname, '~'); +@@ -1019,15 +1019,15 @@ bool cCmdControl::processRECORDINGS_GetI + } + else + { +- recordingStart = recording->start; ++ recordingStart = recording->Start(); + } + } + LOGCONSOLE("GRI: RC: recordingStart=%lu recordingDuration=%lu", recordingStart, recordingDuration); + + m_resp->add_U32(recordingStart); + m_resp->add_U32(recordingDuration); +- m_resp->add_U32(recording->priority); +- m_resp->add_U32(recording->lifetime); ++ m_resp->add_U32(recording->Priority()); ++ m_resp->add_U32(recording->Lifetime()); + m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : ""); + if (!isempty(recording->Info()->Title())) + m_resp->add_String(m_toUTF8.Convert(recording->Info()->Title())); @@ -1232,7 +1232,7 @@ bool cCmdControl::processRECORDINGS_Move return true; } diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c new file mode 100644 index 000000000000..7bbfde6257e6 --- /dev/null +++ b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c @@ -0,0 +1,47 @@ +--- a/receiver.c ++++ b/receiver.c +@@ -56,14 +56,23 @@ protected: + virtual void Receive(uchar *Data, int Length); + + public: +- cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids); ++ cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids); + virtual ~cLiveReceiver(); + }; + +-cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids) +- : cReceiver(ChannelID, Priority, 0, Pids) ++#if (APIVERSNUM < 10725) ++cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids) ++ : cReceiver(Channel->GetChannelID(), Priority, 0, Pids) + , m_Streamer(Streamer) + { ++#else ++cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids) ++ : cReceiver(Channel, Priority) ++ , m_Streamer(Streamer) ++{ ++ AddPid(0); ++ AddPids(Pids); ++#endif + LOGCONSOLE("Starting live receiver"); + } + +@@ -492,7 +501,7 @@ void cLivePatFilter::Process(u_short Pid + } + } + +- m_Streamer->m_Receiver = new cLiveReceiver(m_Streamer, m_Channel->GetChannelID(), m_Streamer->m_Priority, m_Streamer->m_Pids); ++ m_Streamer->m_Receiver = new cLiveReceiver(m_Streamer, m_Channel, m_Streamer->m_Priority, m_Streamer->m_Pids); + m_Streamer->m_Device->AttachReceiver(m_Streamer->m_Receiver); + isyslog("VNSI: Currently unknown new streams found, receiver and demuxers reinited\n"); + } +@@ -785,7 +794,7 @@ bool cLiveStreamer::StreamChannel(const + if (m_NumStreams > 0 && m_Socket) + { + dsyslog("VNSI: Creating new live Receiver"); +- m_Receiver = new cLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids); ++ m_Receiver = new cLiveReceiver(this, m_Channel, m_Priority, m_Pids); + m_PatFilter = new cLivePatFilter(this, m_Channel); + m_Device->AttachReceiver(m_Receiver); + m_Device->AttachFilter(m_PatFilter); diff --git a/multimedia/vdr-plugin-wirbelscan/Makefile b/multimedia/vdr-plugin-wirbelscan/Makefile index 1abc99444c5e..eebbd25cef9d 100644 --- a/multimedia/vdr-plugin-wirbelscan/Makefile +++ b/multimedia/vdr-plugin-wirbelscan/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-wirbelscan PORTVERSION= 0.0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://wirbel.htpc-forum.de/wirbelscan/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - wirbelscan plugin PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/${PLUGIN}-${DISTVERSION} diff --git a/multimedia/vdr-plugin-wirbelscan/files/patch-64f969e39d18aefa263dc3a61172e33df33963fb b/multimedia/vdr-plugin-wirbelscan/files/patch-64f969e39d18aefa263dc3a61172e33df33963fb new file mode 100644 index 000000000000..3db92846ba08 --- /dev/null +++ b/multimedia/vdr-plugin-wirbelscan/files/patch-64f969e39d18aefa263dc3a61172e33df33963fb @@ -0,0 +1,51 @@ +commit 64f969e39d18aefa263dc3a61172e33df33963fb +Author: Stefan Saraev <stefan@saraev.ca> +Date: Thu Mar 29 20:22:11 2012 +0300 + + wirbelscan: receiver-api-fixes + +diff --git a/statemachine.c b/statemachine.c +index 48a212e..bc0c8e5 100644 +--- a/statemachine.c ++++ b/statemachine.c +@@ -36,12 +36,12 @@ protected: + while (Running()) cCondWait::SleepMs(5); + }; /*TODO: check here periodically for lock and wether we got any data!*/ + public: +- cScanReceiver(tChannelID ChannelID, int AnyPid); ++ cScanReceiver(const cChannel* chan, int AnyPid); + virtual ~cScanReceiver() {cReceiver::Detach(); }; + }; + +-cScanReceiver::cScanReceiver(tChannelID ChannelID, int AnyPid) : +- cReceiver(ChannelID, 99, AnyPid), cThread("dummy receiver") { } ++cScanReceiver::cScanReceiver(const cChannel* chan, int AnyPid) : ++ cReceiver(chan, 99), cThread("dummy receiver") { AddPid(AnyPid); } + + ///!----------------------------------------------------------------- + ///! v 0.0.5, store state in lastState if different and print state +@@ -144,7 +144,7 @@ void cStateMachine::Action(void) { + ScannedTransponders.Add(ScannedTransponder); + + dev->SwitchChannel(Transponder, false); +- aReceiver = new cScanReceiver(Transponder->GetChannelID(), 99); ++ aReceiver = new cScanReceiver(Transponder, 99); + dev->AttachReceiver(aReceiver); + + cCondWait::SleepMs(1000); +diff --git a/ttext.c b/ttext.c +index 0053936..0864484 100644 +--- a/ttext.c ++++ b/ttext.c +@@ -374,9 +374,9 @@ void cSwReceiver::Action() { + } + } + +-cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel->GetChannelID(), +- 100, Channel->Tpid()), cThread("ttext") { ++cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel, 100), cThread("ttext") { + ++ AddPid(Channel->Tpid()); + stopped = fuzzy = false; + channel = Channel; + buffer = new cRingBufferLinear(MEGABYTE(1),184); diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 7b082b3bbd3b..d03de0f51019 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20120511 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot @@ -28,7 +28,7 @@ PATCH_STRIP= -p1 USE_GNOME+= pkgconfig USE_XORG+= xrandr xrender USE_GL= gl glu glut -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY PORTEXAMPLES= xine MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/vdr-${PLUGIN} diff --git a/multimedia/vdr-plugin-xvdr/Makefile b/multimedia/vdr-plugin-xvdr/Makefile index a9ce53f72148..c4425d9f40d5 100644 --- a/multimedia/vdr-plugin-xvdr/Makefile +++ b/multimedia/vdr-plugin-xvdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-xvdr PORTVERSION= 0.9.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox/ DISTNAME= pipelka-${PORTNAME}-xvdr-${PORTVERSION}-0-g${GITHASH} @@ -18,7 +18,7 @@ COMMENT= Video Disk Recorder - XVDR server plugin GITHASH= e4cab47 PATCH_STRIP= -p1 HAVE_CONFIGURE= yes -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/pipelka-${PORTNAME}-${GITHASH} diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile index 3962970909a9..989d72f25861 100644 --- a/multimedia/vdr-plugins/Makefile +++ b/multimedia/vdr-plugins/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr-plugins -PORTVERSION= 1.7.27 -PORTREVISION= 1 +PORTVERSION= 1.7.28 CATEGORIES= multimedia MASTER_SITES= # none DISTFILES= # none @@ -22,7 +21,7 @@ OPTIONS_DEFINE= CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \ OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \ TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \ SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE \ - VNSISERVER SOFTDEVICE MARKAD + EXTRECMENU VNSISERVER SOFTDEVICE MARKAD CONTROL_DESC= telnet control EPGSEARCH_DESC= EPG search @@ -45,6 +44,7 @@ XVDR_DESC= XVDR plugin (for connecting XBMC PVR) EEPG_DESC= extended EPG plugin (for UK/NL/etc.) VDRMANAGER_DESC= plugin for VDR-Manager Android clients SOFTHDDEVICE_DESC= softhddevice plugin +EXTRECMENU_DESC= extended recordings menu plugin VNSISERVER_DESC= VNSI server (for XBMC PVR branch - old) SOFTDEVICE_DESC= softdevice (broken?) MARKAD_DESC= MarkAd plugin @@ -52,7 +52,7 @@ MARKAD_DESC= MarkAd plugin OPTIONS_DEFAULT= CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \ OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \ TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \ - SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE + SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE EXTRECMENU .include <bsd.port.options.mk> @@ -128,6 +128,9 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-vdrmanager.so.${PORTVERSION}:${PORTSDI .if ${PORT_OPTIONS:MSOFTHDDEVICE} RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-softhddevice.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-softhddevice .endif +.if ${PORT_OPTIONS:MEXTRECMENU} +RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-extrecmenu.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-extrecmenu +.endif do-install: # empty diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile index 9e652a1b4266..2a78cdb9c764 100644 --- a/multimedia/vdr/Makefile +++ b/multimedia/vdr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr -PORTVERSION= 1.7.27 -PORTREVISION= 3 +PORTVERSION= 1.7.28 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ @@ -19,7 +18,7 @@ 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 DVBPATCH STB0899_SIGNAL +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 diff --git a/multimedia/vdr/Makefile.plugins b/multimedia/vdr/Makefile.plugins index 65152561d42a..9e01ae143789 100644 --- a/multimedia/vdr/Makefile.plugins +++ b/multimedia/vdr/Makefile.plugins @@ -1,13 +1,13 @@ # this is to be included by vdr plugin ports # -# $FreeBSD: /tmp/pcvs/ports/multimedia/vdr/Makefile.plugins,v 1.3 2012-04-21 14:10:52 nox Exp $ +# $FreeBSD: /tmp/pcvs/ports/multimedia/vdr/Makefile.plugins,v 1.4 2012-06-19 18:42:07 nox Exp $ BUILD_DEPENDS+= ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat BUILD_DEPENDS+= vdr:${PORTSDIR}/multimedia/vdr RUN_DEPENDS+= vdr:${PORTSDIR}/multimedia/vdr -APIVERSION= 1.7.27 +APIVERSION= 1.7.28 DIST_SUBDIR= vdr PATCH_SUBDIR= vdr USE_GMAKE= yes diff --git a/multimedia/vdr/distinfo b/multimedia/vdr/distinfo index e829026e8d76..f8d93b6ae8af 100644 --- a/multimedia/vdr/distinfo +++ b/multimedia/vdr/distinfo @@ -1,4 +1,2 @@ -SHA256 (vdr/vdr-1.7.27.tar.bz2) = d948841535b917ab6eb31582d6d40bc281ff6a751988e5bfc1b097567e7ca264 -SIZE (vdr/vdr-1.7.27.tar.bz2) = 767714 -SHA256 (vdr/vdr-1.7.24-s2apiwrapper-0.8.diff) = 2d8b83c01c769c05bcc1a27889f9eb7223aea4e74b66e67b876c52e7fd0f296a -SIZE (vdr/vdr-1.7.24-s2apiwrapper-0.8.diff) = 19788 +SHA256 (vdr/vdr-1.7.28.tar.bz2) = c932df0468e9a256d35c7339247ec212b48d911f88ec8ea3c367e22816d9484f +SIZE (vdr/vdr-1.7.28.tar.bz2) = 782861 diff --git a/multimedia/vdr/files/patch-channels.c b/multimedia/vdr/files/patch-channels.c deleted file mode 100644 index b98a445c37b5..000000000000 --- a/multimedia/vdr/files/patch-channels.c +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN vdr-1.7.27-orig/channels.c vdr-1.7.27/channels.c ---- channels.c -+++ channels.c -@@ -955,7 +955,7 @@ int cChannels::MaxShortChannelNameLength - if (!maxShortChannelNameLength) { - for (cChannel *channel = First(); channel; channel = Next(channel)) { - if (!channel->GroupSep()) -- maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength); -+ maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength); - } - } - return maxShortChannelNameLength; diff --git a/multimedia/vdr/files/patch-eitscan.c b/multimedia/vdr/files/patch-eitscan.c deleted file mode 100644 index af276b6a2f14..000000000000 --- a/multimedia/vdr/files/patch-eitscan.c +++ /dev/null @@ -1,11 +0,0 @@ ---- eitscan.c.orig -+++ eitscan.c -@@ -148,7 +148,7 @@ void cEITScanner::Process(void) - if (Channel) { - if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { - if (Device->ProvidesTransponder(Channel)) { -- if (!Device->Receiving()) { -+ if (Device->Priority() < 0) { - bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel); - if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) { - if (!MaySwitchTransponder) { diff --git a/multimedia/vdr/files/patch-font.c b/multimedia/vdr/files/patch-font.c deleted file mode 100644 index 15f960e05777..000000000000 --- a/multimedia/vdr/files/patch-font.c +++ /dev/null @@ -1,12 +0,0 @@ ---- font.c.orig -+++ font.c -@@ -486,7 +486,8 @@ cString cFont::GetFontFileName(const cha - FcPatternAddBool(pat, FC_SCALABLE, FcTrue); - FcConfigSubstitute(NULL, pat, FcMatchPattern); - FcDefaultSubstitute(pat); -- FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL); -+ FcResult fresult; -+ FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult); - if (fontset) { - for (int i = 0; i < fontset->nfont; i++) { - FcBool scalable; diff --git a/multimedia/vdr/files/patch-oldgcc b/multimedia/vdr/files/patch-oldgcc new file mode 100644 index 000000000000..b393001b89c0 --- /dev/null +++ b/multimedia/vdr/files/patch-oldgcc @@ -0,0 +1,11 @@ +--- timers.c.orig ++++ timers.c +@@ -843,7 +843,7 @@ static int CompareTimers(const void *a, + } + + cSortedTimers::cSortedTimers(void) +-:cVector(Timers.Count()) ++:cVector<const cTimer *>(Timers.Count()) + { + for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer)) + Append(Timer); diff --git a/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER b/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER deleted file mode 100644 index 2d12071a5593..000000000000 --- a/multimedia/vdr/files/patch-receiver.h-LEGACY_CRECEIVER +++ /dev/null @@ -1,11 +0,0 @@ ---- receiver.h.orig -+++ receiver.h -@@ -14,7 +14,7 @@ - - #define MAXRECEIVEPIDS 64 // the maximum number of PIDs per receiver - --//#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version -+#define LEGACY_CRECEIVER // Code enclosed with this macro is deprecated and may be removed in a future version - - class cReceiver { - friend class cDevice; diff --git a/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS b/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS deleted file mode 100644 index 7f029ed6febe..000000000000 --- a/multimedia/vdr/files/patch-recording.h-__RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS +++ /dev/null @@ -1,11 +0,0 @@ ---- recording.h.orig -+++ recording.h -@@ -22,7 +22,7 @@ - #define TIMERMACRO_TITLE "TITLE" - #define TIMERMACRO_EPISODE "EPISODE" - --//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version -+#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version - - extern bool VfatFileSystem; - extern int InstanceId; diff --git a/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff b/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff new file mode 100644 index 000000000000..4261a9b9f81b --- /dev/null +++ b/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff @@ -0,0 +1,11 @@ +--- device.c 2012/06/09 14:37:24 2.61 ++++ device.c 2012/06/10 13:13:18 +@@ -334,7 +334,7 @@ + if (d->ProvidesTransponder(Channel)) { + if (d->MaySwitchTransponder(Channel)) + Device = d; // this device may switch to the transponder without disturbing any receiver or live view +- else if (!d->Occupied()) { ++ else if (!d->Occupied() && d->MaySwitchTransponder(Channel)) { // MaySwitchTransponder() implicitly calls Occupied() + if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority())) + Device = d; // use this one only if no other with less impact can be found + } diff --git a/multimedia/vdr/files/patch-vdr-1.7.27_FreeBSD b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD index b20b6df54cdc..e10e0922cb4c 100644 --- a/multimedia/vdr/files/patch-vdr-1.7.27_FreeBSD +++ b/multimedia/vdr/files/patch-vdr-1.7.28_FreeBSD @@ -852,7 +852,7 @@ Index: tools.h typedef unsigned char uchar; extern int SysLogLevel; -@@ -227,9 +233,17 @@ bool SpinUpDisk(const char *FileName); +@@ -227,12 +233,20 @@ bool SpinUpDisk(const char *FileName); void TouchFile(const char *FileName); time_t LastModifiedTime(const char *FileName); off_t FileSize(const char *FileName); ///< returns the size of the given file, or -1 in case of an error (e.g. if the file doesn't exist) @@ -861,15 +861,18 @@ Index: tools.h +#else cString WeekDayName(int WeekDay); +#endif + ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a three letter + ///< day name. cString WeekDayName(time_t t); + ///< Converts the week day of the given time to a three letter day name. +#ifdef __FreeBSD__ +cString WeekDayNameFullReal(int WeekDay); +#else cString WeekDayNameFull(int WeekDay); +#endif + ///< Converts the given WeekDay (0=Sunday, 1=Monday, ...) to a full + ///< day name. cString WeekDayNameFull(time_t t); - cString DayDateTime(time_t t = 0); - cString TimeToString(time_t t); Index: vdr.c --- vdr.c +++ vdr.c diff --git a/multimedia/vdr/files/remote.conf b/multimedia/vdr/files/remote.conf index cc797a701f51..d6898e16a2d3 100644 --- a/multimedia/vdr/files/remote.conf +++ b/multimedia/vdr/files/remote.conf @@ -35,7 +35,7 @@ XKeySym.Info i XKeySym.Mute m XKeySym.Play p XKeySym.Play y -XKeySym.Pause Space +XKeySym.Pause space XKeySym.Stop s XKeySym.Record r XKeySym.FastFwd w diff --git a/multimedia/vdr/pkg-plist b/multimedia/vdr/pkg-plist index f3c53ab06cd7..7fee53c526d7 100644 --- a/multimedia/vdr/pkg-plist +++ b/multimedia/vdr/pkg-plist @@ -1,17 +1,17 @@ bin/svdrpsend bin/vdr bin/vdr-waitdvb -lib/vdr/libvdr-dvbsddevice.so.1.7.27 -lib/vdr/libvdr-svcsvr.so.1.7.27 -lib/vdr/libvdr-svccli.so.1.7.27 -lib/vdr/libvdr-status.so.1.7.27 -lib/vdr/libvdr-skincurses.so.1.7.27 -lib/vdr/libvdr-pictures.so.1.7.27 -lib/vdr/libvdr-osddemo.so.1.7.27 -lib/vdr/libvdr-hello.so.1.7.27 -lib/vdr/libvdr-svdrpdemo.so.1.7.27 -lib/vdr/libvdr-epgtableid0.so.1.7.27 -lib/vdr/libvdr-rcu.so.1.7.27 +lib/vdr/libvdr-dvbsddevice.so.1.7.28 +lib/vdr/libvdr-svcsvr.so.1.7.28 +lib/vdr/libvdr-svccli.so.1.7.28 +lib/vdr/libvdr-status.so.1.7.28 +lib/vdr/libvdr-skincurses.so.1.7.28 +lib/vdr/libvdr-pictures.so.1.7.28 +lib/vdr/libvdr-osddemo.so.1.7.28 +lib/vdr/libvdr-hello.so.1.7.28 +lib/vdr/libvdr-svdrpdemo.so.1.7.28 +lib/vdr/libvdr-epgtableid0.so.1.7.28 +lib/vdr/libvdr-rcu.so.1.7.28 libdata/pkgconfig/vdr.pc %%NLS%%share/locale/ar/LC_MESSAGES/vdr.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr.mo @@ -78,65 +78,66 @@ libdata/pkgconfig/vdr.pc %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr.mo %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -include/libsi/util.h -include/libsi/si.h -include/libsi/section.h -include/libsi/headers.h include/libsi/descriptor.h -include/vdr/audio.h +include/libsi/headers.h +include/libsi/section.h +include/libsi/si.h +include/libsi/util.h include/vdr/Make.config -include/vdr/videodir.h -include/vdr/transfer.h -include/vdr/tools.h -include/vdr/timers.h -include/vdr/thread.h -include/vdr/themes.h -include/vdr/svdrp.h -include/vdr/status.h -include/vdr/spu.h -include/vdr/sources.h -include/vdr/sourceparams.h -include/vdr/skinsttng.h -include/vdr/skins.h -include/vdr/skinclassic.h -include/vdr/shutdown.h -include/vdr/sections.h -include/vdr/sdt.h -include/vdr/ringbuffer.h -include/vdr/remux.h -include/vdr/remote.h -include/vdr/recording.h -include/vdr/recorder.h -include/vdr/receiver.h -include/vdr/plugin.h -include/vdr/player.h -include/vdr/pat.h -include/vdr/osdbase.h -include/vdr/osd.h -include/vdr/nit.h -include/vdr/menuitems.h -include/vdr/menu.h -include/vdr/lirc.h -include/vdr/keys.h -include/vdr/interface.h -include/vdr/i18n.h -include/vdr/font.h -include/vdr/filter.h -include/vdr/epg.h -include/vdr/eitscan.h -include/vdr/eit.h -include/vdr/dvbsubtitle.h -include/vdr/dvbspu.h -include/vdr/dvbplayer.h -include/vdr/dvbdevice.h -include/vdr/dvbci.h -include/vdr/diseqc.h -include/vdr/device.h -include/vdr/cutter.h +include/vdr/Make.global +include/vdr/audio.h +include/vdr/channels.h include/vdr/ci.h include/vdr/config.h -include/vdr/channels.h -include/vdr/Make.global +include/vdr/cutter.h +include/vdr/device.h +include/vdr/diseqc.h +include/vdr/dvbci.h +include/vdr/dvbdevice.h +include/vdr/dvbplayer.h +include/vdr/dvbspu.h +include/vdr/dvbsubtitle.h +include/vdr/eit.h +include/vdr/eitscan.h +include/vdr/epg.h +include/vdr/filter.h +include/vdr/font.h +include/vdr/i18n.h +include/vdr/interface.h +include/vdr/keys.h +include/vdr/lirc.h +include/vdr/menu.h +include/vdr/menuitems.h +include/vdr/nit.h +include/vdr/osd.h +include/vdr/osdbase.h +include/vdr/pat.h +include/vdr/player.h +include/vdr/plugin.h +include/vdr/receiver.h +include/vdr/recorder.h +include/vdr/recording.h +include/vdr/remote.h +include/vdr/remux.h +include/vdr/ringbuffer.h +include/vdr/sdt.h +include/vdr/sections.h +include/vdr/shutdown.h +include/vdr/skinclassic.h +include/vdr/skinlcars.h +include/vdr/skins.h +include/vdr/skinsttng.h +include/vdr/sourceparams.h +include/vdr/sources.h +include/vdr/spu.h +include/vdr/status.h +include/vdr/svdrp.h +include/vdr/themes.h +include/vdr/thread.h +include/vdr/timers.h +include/vdr/tools.h +include/vdr/transfer.h +include/vdr/videodir.h %%TTXPATCH%%include/vdr/vdrttxtsubshooks.h @exec mkdir -p %D/etc/vdr/plugins @exec chown %%VDR_USER%%:%%VDR_GROUP%% %D/etc/vdr %D/etc/vdr/plugins diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile index 92239bd55c91..2664aa419585 100644 --- a/www/vdr-plugin-live/Makefile +++ b/www/vdr-plugin-live/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr-plugin-live -PORTVERSION= 0.2.0s20110303 -PORTREVISION= 8 +PORTVERSION= 0.2.0s20120325 CATEGORIES= www multimedia MASTER_SITES= http://live.vdr-developer.org/downloads/:release \ LOCAL/nox/:snapshot @@ -22,7 +21,7 @@ LIB_DEPENDS+= tntnet:${PORTSDIR}/www/tntnet \ USE_BZIP2= yes PATCH_STRIP= -p1 -PORTDOCS= COPYING README +PORTDOCS= COPYING README HISTORY MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} VDR_PLUGIN_MAKEFILES= ${WRKSRC}/httpd/Makefile ${WRKSRC}/pages/Makefile @@ -31,6 +30,7 @@ MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}" .include "${.CURDIR}/../../multimedia/vdr/Makefile.plugins" post-patch: post-patch-plugin + ${CP} ${FILESDIR}/gen_version_suffix.h ${WRKSRC} post-install: post-install-pluginlocales (cd ${WRKSRC}/${PLUGIN} && \ diff --git a/www/vdr-plugin-live/distinfo b/www/vdr-plugin-live/distinfo index f5053a5271dc..10a3de05686c 100644 --- a/www/vdr-plugin-live/distinfo +++ b/www/vdr-plugin-live/distinfo @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-live-0.2.0s20110303.tar.bz2) = d1a50c8c25f1b8a563c14f8c94cddd61a53764484322d177c506954e6f993462 -SIZE (vdr/vdr-live-0.2.0s20110303.tar.bz2) = 1995550 +SHA256 (vdr/vdr-live-0.2.0s20120325.tar.bz2) = 1c6d226a87930832cd836635214e1fecc6527ddbfd67d5d0ec1c974b12da2733 +SIZE (vdr/vdr-live-0.2.0s20120325.tar.bz2) = 2010190 diff --git a/www/vdr-plugin-live/files/gen_version_suffix.h b/www/vdr-plugin-live/files/gen_version_suffix.h new file mode 100644 index 000000000000..1e0133ad759d --- /dev/null +++ b/www/vdr-plugin-live/files/gen_version_suffix.h @@ -0,0 +1,7 @@ +/* ATTENTION: this file is automatically generated and will be overwritten! + * Manual changes will get lost! + */ +#ifndef GEN_VERSION_SUFFIX_H +#define GEN_VERSION_SUFFIX_H +#define VERSION_SUFFIX "_git_master_94a0a21_20120325164212+0200" +#endif diff --git a/www/vdr-plugin-live/files/patch-Makefile b/www/vdr-plugin-live/files/patch-Makefile index e65d8489b57e..50e6f0d6bc04 100644 --- a/www/vdr-plugin-live/files/patch-Makefile +++ b/www/vdr-plugin-live/files/patch-Makefile @@ -1,6 +1,13 @@ --- a/Makefile +++ b/Makefile -@@ -151,7 +151,11 @@ $(VERSIONSUFFIX): FORCE +@@ -155,12 +155,16 @@ $(SUBDIRS): + PAGES: + @$(MAKE) -C pages PLUGINFEATURES="$(PLUGINFEATURES)" .dependencies + +-$(VERSIONSUFFIX): FORCE +- ./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX) ++#$(VERSIONSUFFIX): FORCE ++# ./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX) libvdr-$(PLUGIN).so: $(VERSIONSUFFIX) $(SUBDIRS) $(PLUGINOBJS) $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) @@ -12,7 +19,7 @@ ifneq ($(TNTVERS7),yes) @echo "" -@@ -189,6 +193,9 @@ clean: $(SUBDIRS) +@@ -198,6 +202,9 @@ clean: $(SUBDIRS) @-rm -f $(PLUGINOBJS) $(DEPFILE) *.so *.tgz core* *~ @-rm -f $(VERSIONSUFFIX) diff --git a/www/vdr-plugin-live/files/patch-tasks.cpp b/www/vdr-plugin-live/files/patch-tasks.cpp new file mode 100644 index 000000000000..a3f1aff2ff9e --- /dev/null +++ b/www/vdr-plugin-live/files/patch-tasks.cpp @@ -0,0 +1,30 @@ +--- a/tasks.cpp ++++ b/tasks.cpp +@@ -60,9 +60,15 @@ void PlayRecordingTask::Action() + + const char *current = NowReplaying(); + if (!current || (0 != strcmp(current, recording->FileName()))) { ++#if APIVERSNUM < 10728 + cReplayControl::SetRecording( 0, 0 ); + cControl::Shutdown(); + cReplayControl::SetRecording( recording->FileName(), recording->Title() ); ++#else ++ cReplayControl::SetRecording( 0 ); ++ cControl::Shutdown(); ++ cReplayControl::SetRecording( recording->FileName() ); ++#endif + cControl::Launch( new cReplayControl ); + cControl::Attach(); + } +@@ -122,7 +128,11 @@ void StopRecordingTask::Action() + return; + } + ++#if APIVERSNUM < 10728 + cReplayControl::SetRecording( 0, 0 ); ++#else ++ cReplayControl::SetRecording( 0 ); ++#endif + cControl::Shutdown(); + } + |