diff options
40 files changed, 85 insertions, 220 deletions
diff --git a/multimedia/vdr-plugin-control/Makefile b/multimedia/vdr-plugin-control/Makefile index f11f07e916e6..367fc138b3f8 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= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://ricomp.de/vdr/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a45/a/}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-control/pkg-plist b/multimedia/vdr-plugin-control/pkg-plist index 0e78d2763d1d..0967063b99d8 100644 --- a/multimedia/vdr-plugin-control/pkg-plist +++ b/multimedia/vdr-plugin-control/pkg-plist @@ -1 +1 @@ -lib/vdr/libvdr-control.so.1.7.17 +lib/vdr/libvdr-control.so.1.7.18 diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile index a1e460f6dc33..68f58272c124 100644 --- a/multimedia/vdr-plugin-epgsearch/Makefile +++ b/multimedia/vdr-plugin-epgsearch/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-epgsearch PORTVERSION= 0.9.25b20s20110221 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://winni.vdr-developer.org/epgsearch/downloads/beta/:beta \ LOCAL/nox/:snapshot diff --git a/multimedia/vdr-plugin-epgsearch/pkg-plist b/multimedia/vdr-plugin-epgsearch/pkg-plist index dee721e8070f..a7393e8bbfb4 100644 --- a/multimedia/vdr-plugin-epgsearch/pkg-plist +++ b/multimedia/vdr-plugin-epgsearch/pkg-plist @@ -1,7 +1,7 @@ -lib/vdr/libvdr-epgsearch.so.1.7.17 -lib/vdr/libvdr-epgsearchonly.so.1.7.17 -lib/vdr/libvdr-conflictcheckonly.so.1.7.17 -lib/vdr/libvdr-quickepgsearch.so.1.7.17 +lib/vdr/libvdr-epgsearch.so.1.7.18 +lib/vdr/libvdr-epgsearchonly.so.1.7.18 +lib/vdr/libvdr-conflictcheckonly.so.1.7.18 +lib/vdr/libvdr-quickepgsearch.so.1.7.18 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo %%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo diff --git a/multimedia/vdr-plugin-femon/Makefile b/multimedia/vdr-plugin-femon/Makefile index d4510b890520..3f48f4945f5c 100644 --- a/multimedia/vdr-plugin-femon/Makefile +++ b/multimedia/vdr-plugin-femon/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-femon PORTVERSION= 1.7.9 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-femon/pkg-plist b/multimedia/vdr-plugin-femon/pkg-plist index 3e66a6b0b213..4e5653a2d9c6 100644 --- a/multimedia/vdr-plugin-femon/pkg-plist +++ b/multimedia/vdr-plugin-femon/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-femon.so.1.7.17 +lib/vdr/libvdr-femon.so.1.7.18 %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-femon.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-femon.mo %%NLS%%share/locale/et_EE/LC_MESSAGES/vdr-femon.mo diff --git a/multimedia/vdr-plugin-infosatepg/Makefile b/multimedia/vdr-plugin-infosatepg/Makefile index b7a414d74580..aff2084d3b44 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= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/342/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-infosatepg/pkg-plist b/multimedia/vdr-plugin-infosatepg/pkg-plist index 305b7f3f6ed5..d406e213ce12 100644 --- a/multimedia/vdr-plugin-infosatepg/pkg-plist +++ b/multimedia/vdr-plugin-infosatepg/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-infosatepg.so.1.7.17 +lib/vdr/libvdr-infosatepg.so.1.7.18 @exec /usr/bin/install -o %%VDR_USER%% -g %%VDR_GROUP%% -d /var/cache/vdr/infosatepg %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-infosatepg.mo %%NLS%%share/locale/it_IT/LC_MESSAGES/vdr-infosatepg.mo diff --git a/multimedia/vdr-plugin-iptv/Makefile b/multimedia/vdr-plugin-iptv/Makefile index 7b05b686b037..d386bdbc1ece 100644 --- a/multimedia/vdr-plugin-iptv/Makefile +++ b/multimedia/vdr-plugin-iptv/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-iptv PORTVERSION= 0.4.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-iptv/pkg-plist b/multimedia/vdr-plugin-iptv/pkg-plist index 087da002d667..b0c587a9701c 100644 --- a/multimedia/vdr-plugin-iptv/pkg-plist +++ b/multimedia/vdr-plugin-iptv/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-iptv.so.1.7.17 +lib/vdr/libvdr-iptv.so.1.7.18 @unexec if cmp -s %D/etc/vdr/plugins/iptv/image.sh.sample %D/etc/vdr/plugins/iptv/image.sh; then rm -f %D/etc/vdr/plugins/iptv/image.sh; fi etc/vdr/plugins/iptv/image.sh.sample @exec if [ ! -f %D/etc/vdr/plugins/iptv/image.sh ] ; then cp -p %D/%F %B/image.sh; fi diff --git a/multimedia/vdr-plugin-markad/Makefile b/multimedia/vdr-plugin-markad/Makefile index cfea1f3ef1f7..ea9dfb0b7a1e 100644 --- a/multimedia/vdr-plugin-markad/Makefile +++ b/multimedia/vdr-plugin-markad/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-markad PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/578/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-markad/pkg-plist b/multimedia/vdr-plugin-markad/pkg-plist index 64292070f396..e32a9621a9c5 100644 --- a/multimedia/vdr-plugin-markad/pkg-plist +++ b/multimedia/vdr-plugin-markad/pkg-plist @@ -1,5 +1,5 @@ bin/markad -lib/vdr/libvdr-markad.so.1.7.17 +lib/vdr/libvdr-markad.so.1.7.18 %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-markad.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-markad.mo %%NLS%%share/locale/fi_FI/LC_MESSAGES/vdr-markad.mo diff --git a/multimedia/vdr-plugin-osdpip/Makefile b/multimedia/vdr-plugin-osdpip/Makefile index 07a39e0896ae..53185a542a62 100644 --- a/multimedia/vdr-plugin-osdpip/Makefile +++ b/multimedia/vdr-plugin-osdpip/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-osdpip PORTVERSION= 0.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/267/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-osdpip/pkg-plist b/multimedia/vdr-plugin-osdpip/pkg-plist index 1b86acc7c776..b0fb8007de5a 100644 --- a/multimedia/vdr-plugin-osdpip/pkg-plist +++ b/multimedia/vdr-plugin-osdpip/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-osdpip.so.1.7.17 +lib/vdr/libvdr-osdpip.so.1.7.18 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-osdpip.mo %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-osdpip.mo %%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-osdpip.mo diff --git a/multimedia/vdr-plugin-osdteletext/Makefile b/multimedia/vdr-plugin-osdteletext/Makefile index f74111db6b84..ca0c7886b258 100644 --- a/multimedia/vdr-plugin-osdteletext/Makefile +++ b/multimedia/vdr-plugin-osdteletext/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-osdteletext PORTVERSION= 0.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/416/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-osdteletext/pkg-plist b/multimedia/vdr-plugin-osdteletext/pkg-plist index 433ebd923320..0627c3a281da 100644 --- a/multimedia/vdr-plugin-osdteletext/pkg-plist +++ b/multimedia/vdr-plugin-osdteletext/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-osdteletext.so.1.7.17 +lib/vdr/libvdr-osdteletext.so.1.7.18 @exec /usr/bin/install -o %%VDR_USER%% -g %%VDR_GROUP%% -d /var/cache/vdr/vtx %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-osdteletext.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-osdteletext.mo diff --git a/multimedia/vdr-plugin-remote/Makefile b/multimedia/vdr-plugin-remote/Makefile index ba6d23978e25..7517e12d05b8 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= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://www.escape-edv.de/endriss/vdr/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-remote/pkg-plist b/multimedia/vdr-plugin-remote/pkg-plist index 288c94e46137..04567b582ba1 100644 --- a/multimedia/vdr-plugin-remote/pkg-plist +++ b/multimedia/vdr-plugin-remote/pkg-plist @@ -1 +1 @@ -lib/vdr/libvdr-remote.so.1.7.17 +lib/vdr/libvdr-remote.so.1.7.18 diff --git a/multimedia/vdr-plugin-skinenigmang/Makefile b/multimedia/vdr-plugin-skinenigmang/Makefile index a3b9e27c8ac5..e9b7cd2e7678 100644 --- a/multimedia/vdr-plugin-skinenigmang/Makefile +++ b/multimedia/vdr-plugin-skinenigmang/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-skinenigmang PORTVERSION= 0.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://andreas.vdr-developer.org/enigmang/download/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-skinenigmang/pkg-plist b/multimedia/vdr-plugin-skinenigmang/pkg-plist index ada78f9857e8..9a465de9f925 100644 --- a/multimedia/vdr-plugin-skinenigmang/pkg-plist +++ b/multimedia/vdr-plugin-skinenigmang/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-skinenigmang.so.1.7.17 +lib/vdr/libvdr-skinenigmang.so.1.7.18 etc/vdr/plugins/skinenigmang/HISTORY etc/vdr/plugins/skinenigmang/README etc/vdr/plugins/skinenigmang/flags/deu.xpm diff --git a/multimedia/vdr-plugin-softdevice/Makefile b/multimedia/vdr-plugin-softdevice/Makefile index f8375aaeadfb..f4f21c522389 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= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= LOCAL MASTER_SITE_SUBDIR= nox/ diff --git a/multimedia/vdr-plugin-softdevice/pkg-plist b/multimedia/vdr-plugin-softdevice/pkg-plist index b7ae7b611878..47bbadc55811 100644 --- a/multimedia/vdr-plugin-softdevice/pkg-plist +++ b/multimedia/vdr-plugin-softdevice/pkg-plist @@ -1,7 +1,7 @@ bin/ShmClient -lib/vdr/libvdr-softdevice.so.1.7.17 -lib/vdr/libsoftdevice-xv.so.1.7.17 -lib/vdr/libsoftdevice-shm.so.1.7.17 +lib/vdr/libvdr-softdevice.so.1.7.18 +lib/vdr/libsoftdevice-xv.so.1.7.18 +lib/vdr/libsoftdevice-shm.so.1.7.18 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo %%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo %%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo diff --git a/multimedia/vdr-plugin-streamdev/Makefile b/multimedia/vdr-plugin-streamdev/Makefile index eefd2547a4c2..c884433634a6 100644 --- a/multimedia/vdr-plugin-streamdev/Makefile +++ b/multimedia/vdr-plugin-streamdev/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-streamdev PORTVERSION= 0.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/497/:release \ LOCAL:snapshot diff --git a/multimedia/vdr-plugin-streamdev/files/patch-server-livestreamer.c b/multimedia/vdr-plugin-streamdev/files/patch-server-livestreamer.c deleted file mode 100644 index 68e5f7aaff9d..000000000000 --- a/multimedia/vdr-plugin-streamdev/files/patch-server-livestreamer.c +++ /dev/null @@ -1,15 +0,0 @@ ---- server/livestreamer.c.orig -+++ server/livestreamer.c -@@ -1,7 +1,12 @@ - #include <assert.h> - -+#ifdef __FreeBSD__ -+#include <vdr/libsi/section.h> -+#include <vdr/libsi/descriptor.h> -+#else - #include <libsi/section.h> - #include <libsi/descriptor.h> -+#endif - - #include <vdr/ringbuffer.h> - diff --git a/multimedia/vdr-plugin-streamdev/pkg-plist b/multimedia/vdr-plugin-streamdev/pkg-plist index 8b987bfb59c1..28e5d12ec26d 100644 --- a/multimedia/vdr-plugin-streamdev/pkg-plist +++ b/multimedia/vdr-plugin-streamdev/pkg-plist @@ -1,5 +1,5 @@ -lib/vdr/libvdr-streamdev-client.so.1.7.17 -lib/vdr/libvdr-streamdev-server.so.1.7.17 +lib/vdr/libvdr-streamdev-client.so.1.7.18 +lib/vdr/libvdr-streamdev-server.so.1.7.18 @unexec if cmp -s %D/etc/vdr/plugins/streamdev-server/externremux.sh.sample %D/etc/vdr/plugins/streamdev-server/externremux.sh; then rm -f %D/etc/vdr/plugins/streamdev-server/externremux.sh; fi etc/vdr/plugins/streamdev-server/externremux.sh.sample @exec if [ ! -f %D/etc/vdr/plugins/streamdev-server/externremux.sh ] ; then cp -p %D/%F %B/externremux.sh; fi diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile index eb51ede35018..400e67ce756f 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= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/177/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX} diff --git a/multimedia/vdr-plugin-upnp/pkg-plist b/multimedia/vdr-plugin-upnp/pkg-plist index 4fd0c3c812f3..9e378db464a0 100644 --- a/multimedia/vdr-plugin-upnp/pkg-plist +++ b/multimedia/vdr-plugin-upnp/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-upnp.so.1.7.17 +lib/vdr/libvdr-upnp.so.1.7.18 etc/vdr/plugins/upnp/http/icons/upnpIconLrg.jpeg etc/vdr/plugins/upnp/http/icons/upnpIconLrg.png etc/vdr/plugins/upnp/http/icons/upnpIconSm.jpeg diff --git a/multimedia/vdr-plugin-vnsiserver/Makefile b/multimedia/vdr-plugin-vnsiserver/Makefile index 402fc435a72a..20a1ea334c94 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= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= http://ppa.launchpad.net/yavdr/testing-vdr/ubuntu/pool/main/v/vdr-plugin-vnsiserver/ \ LOCAL/nox/ diff --git a/multimedia/vdr-plugin-vnsiserver/pkg-plist b/multimedia/vdr-plugin-vnsiserver/pkg-plist index ca3b139dc200..dafe2143dc41 100644 --- a/multimedia/vdr-plugin-vnsiserver/pkg-plist +++ b/multimedia/vdr-plugin-vnsiserver/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-vnsiserver.so.1.7.17 +lib/vdr/libvdr-vnsiserver.so.1.7.18 @unexec if cmp -s %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf.sample %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf; fi etc/vdr/plugins/vnsiserver/allowed_hosts.conf.sample @exec if [ ! -f %D/etc/vdr/plugins/vnsiserver/allowed_hosts.conf ] ; then cp -p %D/%F %B/allowed_hosts.conf; fi diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 5b50013149fb..b998e14d1bc6 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20110308.2305 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot diff --git a/multimedia/vdr-plugin-xineliboutput/pkg-plist b/multimedia/vdr-plugin-xineliboutput/pkg-plist index 37e97899b332..73dccaa85556 100644 --- a/multimedia/vdr-plugin-xineliboutput/pkg-plist +++ b/multimedia/vdr-plugin-xineliboutput/pkg-plist @@ -4,7 +4,7 @@ lib/xine/plugins/1.29/xineplug_inp_xvdr.so lib/xine/plugins/1.29/post/xineplug_post_autocrop.so lib/xine/plugins/1.29/post/xineplug_post_swscale.so lib/xine/plugins/1.29/post/xineplug_post_audiochannel.so -lib/vdr/libvdr-xineliboutput.so.1.7.17 +lib/vdr/libvdr-xineliboutput.so.1.7.18 lib/vdr/libxineliboutput-sxfe.so.1.0.90-cvs @unexec if cmp -s %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf.sample %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; fi etc/vdr/plugins/xineliboutput/allowed_hosts.conf.sample diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile index 9ee5fa29d7c8..62707519024b 100644 --- a/multimedia/vdr-plugins/Makefile +++ b/multimedia/vdr-plugins/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr-plugins -PORTVERSION= 1.7.17 -PORTREVISION= 1 +PORTVERSION= 1.7.18 CATEGORIES= multimedia MASTER_SITES= # none DISTFILES= # none @@ -32,7 +31,8 @@ OPTIONS= CONTROL "telnet control" On \ LIVE "live web plugin" On \ UPNP "UPnP/DLNA plugin (alpha!)" On \ VNSISERVER "VNSI server (for xbmc pvr branch - untested)" Off \ - SOFTDEVICE "softdevice (broken?)" Off + SOFTDEVICE "softdevice (broken?)" Off \ + MARKAD "MarkAd plugin" Off .include <bsd.port.options.mk> @@ -81,6 +81,9 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-softdevice.so.${PORTVERSION}:${PORTSDI .if defined(WITH_VNSISERVER) RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-vnsiserver.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-vnsiserver .endif +.if defined(WITH_MARKAD) +RUN_DEPENDS+= ${LOCALBASE}/lib/vdr/libvdr-markad.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-markad +.endif do-install: # empty diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile index 578df8da442a..250e5ac20a0a 100644 --- a/multimedia/vdr/Makefile +++ b/multimedia/vdr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= vdr -PORTVERSION= 1.7.17 -PORTREVISION= 1 +PORTVERSION= 1.7.18 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ @@ -19,8 +18,7 @@ LIB_DEPENDS= jpeg.11:${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= IPTVPATCH "Stops EIT scans on IPTV channels" On \ - AC3PATCH "North America DVB-S AC3 audio workaround" Off +OPTIONS= IPTVPATCH "Stops EIT scans on IPTV channels" On DIST_SUBDIR= vdr USE_BZIP2= yes @@ -57,9 +55,6 @@ PLIST_SUB+= VDR_GROUP=${VDR_GROUP} EXTRA_PATCHES+= ${FILESDIR}/vdr-1.7.15-disable_ca_updates.patch \ ${FILESDIR}/vdr-1.7.15-disable_eitscan.patch .endif -.if defined(WITH_AC3PATCH) -EXTRA_PATCHES+= ${FILESDIR}/vdr-1.7.17-fix_na_dvbs_ac3.diff -.endif .if !defined(WITHOUT_NLS) PLIST_SUB+= NLS="" @@ -72,6 +67,8 @@ post-patch: @${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 !defined(WITHOUT_NLS) diff --git a/multimedia/vdr/distinfo b/multimedia/vdr/distinfo index bd9710b6b034..7a5a420d8c52 100644 --- a/multimedia/vdr/distinfo +++ b/multimedia/vdr/distinfo @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-1.7.17.tar.bz2) = f11102d4b4595347587f09f3957d508567cead6ccd231f9831fc02be8deb7994 -SIZE (vdr/vdr-1.7.17.tar.bz2) = 688181 +SHA256 (vdr/vdr-1.7.18.tar.bz2) = 503168921cbcae21687fc4d686c56c2f0b1cbdc578fb053b4a18eee8e5002705 +SIZE (vdr/vdr-1.7.18.tar.bz2) = 712601 diff --git a/multimedia/vdr/files/patch-tools.c-indexregenfix b/multimedia/vdr/files/patch-tools.c-indexregenfix index c5590f141e4b..e69de29bb2d1 100644 --- a/multimedia/vdr/files/patch-tools.c-indexregenfix +++ b/multimedia/vdr/files/patch-tools.c-indexregenfix @@ -1,12 +0,0 @@ ---- tools.c.orig -+++ tools.c -@@ -1669,6 +1669,9 @@ ssize_t cUnbufferedFile::Read(void *Data - } - } - lastpos = curpos; -+#else -+ if (bytesRead > 0) -+ curpos += bytesRead; - #endif - return bytesRead; - } diff --git a/multimedia/vdr/files/patch-vdr-1.7.17_FreeBSD b/multimedia/vdr/files/patch-vdr-1.7.18_FreeBSD index 3b3943b745e9..3bae564bbdda 100644 --- a/multimedia/vdr/files/patch-vdr-1.7.17_FreeBSD +++ b/multimedia/vdr/files/patch-vdr-1.7.18_FreeBSD @@ -81,20 +81,19 @@ Index: Makefile CC ?= gcc CFLAGS ?= -g -O3 -Wall -@@ -20,7 +25,12 @@ PREFIX ?= /usr/local - MANDIR = $(PREFIX)/share/man +@@ -21,7 +26,11 @@ MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin + INCDIR = $(PREFIX)/include LOCDIR = ./locale +ifdef FREEBSD -+LIBDIRS = -L${LOCALBASE}/lib -+LIBS = -ljpeg -lpthread -lrt -lfreetype -lfontconfig -liconv -lintl ++LIBS = -ljpeg -lpthread -lrt $(shell pkg-config --libs freetype2 fontconfig) -liconv -lintl +else - LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig + LIBS = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig) +endif - INCLUDES ?= $(shell pkg-config --cflags freetype2) + INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig) PLUGINDIR= ./PLUGINS -@@ -129,7 +139,11 @@ i18n: $(I18Nmsgs) +@@ -130,7 +139,11 @@ i18n: $(I18Nmsgs) install-i18n: @mkdir -p $(DESTDIR)$(LOCDIR) @@ -106,7 +105,7 @@ Index: Makefile # The 'include' directory (for plugins): -@@ -168,7 +182,11 @@ install: install-bin install-conf instal +@@ -169,7 +182,11 @@ install: install-bin install-conf instal install-bin: vdr @mkdir -p $(DESTDIR)$(BINDIR) @@ -118,7 +117,7 @@ Index: Makefile # Configuration files: -@@ -191,7 +209,11 @@ install-doc: +@@ -192,13 +209,18 @@ install-doc: install-plugins: plugins @mkdir -p $(DESTDIR)$(PLUGINLIBDIR) @@ -128,6 +127,13 @@ Index: Makefile @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR) +endif + # Includes: + + install-includes: include-dir + @mkdir -p $(DESTDIR)$(INCDIR) + @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) ++ @cp Make.config Make.global $(DESTDIR)$(INCDIR)/vdr + # Source documentation: Index: channels.c @@ -230,62 +236,6 @@ diff -u -r1.1.1.3 -r1.4 if (fields == 4) commands = NULL; //XXX Apparently sscanf() doesn't work correctly if the last %a argument results in an empty string if (4 <= fields && fields <= 5) { -Index: dvbsubtitle.c -=================================================================== -RCS file: /progs/network/ccvs/vdr/dvbsubtitle.c,v -retrieving revision 1.1.1.5 -retrieving revision 1.5 -diff -u -r1.1.1.5 -r1.5 ---- dvbsubtitle.c 2010/10/19 20:28:49 1.1.1.5 -+++ dvbsubtitle.c 2010/10/19 20:32:58 1.5 -@@ -718,7 +718,11 @@ - if (Length > PayloadOffset + SubstreamHeaderLength) { - int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : 0; - if (pts) -+#ifdef __FreeBSD__ -+ dbgconverter("Converter PTS: %lld\n", (long long int)pts); -+#else - dbgconverter("Converter PTS: %lld\n", pts); -+#endif - const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header - int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header - if (ResetSubtitleAssembler) -@@ -754,7 +758,11 @@ - if (Length > PayloadOffset) { - int64_t pts = PesGetPts(Data); - if (pts) -+#ifdef __FreeBSD__ -+ dbgconverter("Converter PTS: %lld\n", (long long int)pts); -+#else - dbgconverter("Converter PTS: %lld\n", pts); -+#endif - const uchar *data = Data + PayloadOffset; - int length = Length - PayloadOffset; - if (length > 3) { -@@ -819,7 +827,11 @@ - if (AssertOsd()) { - sb->Draw(osd); - Timeout.Set(sb->Timeout() * 1000); -+#ifdef __FreeBSD__ -+ dbgconverter("PTS: %lld STC: %lld (%lld) timeout: %d\n", (long long int)sb->Pts(), (long long int)cDevice::PrimaryDevice()->GetSTC(), (long long int)Delta, sb->Timeout()); -+#else - dbgconverter("PTS: %lld STC: %lld (%lld) timeout: %d\n", sb->Pts(), cDevice::PrimaryDevice()->GetSTC(), Delta, sb->Timeout()); -+#endif - } - bitmaps->Del(sb); - } -@@ -889,7 +901,11 @@ - page->SetTimeout(Data[6]); - page->SetState((Data[6 + 1] & 0x0C) >> 2); - page->regions.Clear(); -+#ifdef __FreeBSD__ -+ dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), (long long int)page->Pts(), page->Timeout(), page->State()); -+#else - dbgpages("Update page id %d version %d pts %lld timeout %d state %d\n", pageId, page->Version(), page->Pts(), page->Timeout(), page->State()); -+#endif - for (int i = 6 + 2; i < segmentLength; i += 6) { - cSubtitleRegion *region = page->GetRegionById(Data[i], true); - region->SetHorizontalAddress((Data[i + 2] << 8) + Data[i + 3]); Index: eit.c =================================================================== RCS file: /progs/network/ccvs/vdr/eit.c,v @@ -426,18 +376,6 @@ retrieving revision 1.5 diff -u -r1.1.1.3 -r1.5 --- recording.c 2010/03/16 15:18:58 1.1.1.3 +++ recording.c 2010/03/16 15:21:05 1.5 -@@ -1505,7 +1505,11 @@ - delta = int(buf.st_size % sizeof(tIndexTs)); - if (delta) { - delta = sizeof(tIndexTs) - delta; -+#ifdef __FreeBSD__ -+ esyslog("ERROR: invalid file size (%lld) in '%s'", (long long int)buf.st_size, fileName); -+#else - esyslog("ERROR: invalid file size (%lld) in '%s'", buf.st_size, fileName); -+#endif - } - last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1); - if (!Record && last >= 0) { @@ -1825,7 +1829,11 @@ // Search for a PAT packet from the end of the file: cPatPmtParser PatPmtParser; @@ -473,32 +411,6 @@ diff -u -r1.1.1.3 -r1.5 if (!file) LOG_ERROR_STR(fileName); } -Index: remote.c -=================================================================== -RCS file: /progs/network/ccvs/vdr/remote.c,v -retrieving revision 1.1.1.2 -retrieving revision 1.2 -diff -u -r1.1.1.2 -r1.2 ---- remote.c 2010/02/17 10:14:45 1.1.1.2 -+++ remote.c 2010/02/17 12:36:01 1.2 -@@ -121,7 +121,11 @@ - bool cRemote::Put(uint64_t Code, bool Repeat, bool Release) - { - char buffer[32]; -+#ifdef __FreeBSD__ -+ snprintf(buffer, sizeof(buffer), "%016llX", (long long unsigned int)Code); -+#else - snprintf(buffer, sizeof(buffer), "%016llX", Code); -+#endif - return Put(buffer, Repeat, Release); - } - -Index: shutdown.c -=================================================================== -RCS file: /progs/network/ccvs/vdr/shutdown.c,v -retrieving revision 1.1.1.2 -retrieving revision 1.4 -diff -u -r1.1.1.2 -r1.4 Index: skins.c =================================================================== RCS file: /progs/network/ccvs/vdr/skins.c,v diff --git a/multimedia/vdr/files/patch-z-Makefile b/multimedia/vdr/files/patch-z-Makefile index 60b41fde1ed6..d8da405753a1 100644 --- a/multimedia/vdr/files/patch-z-Makefile +++ b/multimedia/vdr/files/patch-z-Makefile @@ -1,22 +1,14 @@ Index: Makefile -@@ -25,6 +25,7 @@ PREFIX ?= /usr/local - MANDIR = $(PREFIX)/share/man - BINDIR = $(PREFIX)/bin - LOCDIR = ./locale -+INCDIR = $(PREFIX)/include - ifdef FREEBSD - INCLUDES = -I/usr/local/include/freetype2 - LIBDIRS = -L/usr/local/lib -@@ -177,7 +178,7 @@ clean-plugins: +@@ -176,7 +176,7 @@ clean-plugins: # Install the files: --install: install-bin install-conf install-doc install-plugins install-i18n -+install: install-bin install-doc install-plugins install-header +-install: install-bin install-conf install-doc install-plugins install-i18n install-includes ++install: install-bin install-doc install-plugins install-includes # VDR binary: -@@ -192,7 +193,6 @@ endif +@@ -191,7 +191,6 @@ endif # Configuration files: install-conf: @@ -24,7 +16,7 @@ Index: Makefile @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\ mkdir -p $(DESTDIR)$(CONFDIR);\ cp *.conf $(DESTDIR)$(CONFDIR);\ -@@ -208,7 +208,7 @@ install-doc: +@@ -207,7 +206,7 @@ install-doc: # Plugins: @@ -33,17 +25,3 @@ Index: Makefile @mkdir -p $(DESTDIR)$(PLUGINLIBDIR) ifdef FREEBSD @cp -f $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR) -@@ -216,6 +216,13 @@ else - @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR) - endif - -+# Header files: -+ -+install-header: -+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi -+ @cp *.h Make.config Make.global $(DESTDIR)$(INCDIR)/vdr -+ @cp libsi/*.h $(DESTDIR)$(INCDIR)/vdr/libsi -+ - # Source documentation: - - srcdoc: diff --git a/multimedia/vdr/pkg-plist b/multimedia/vdr/pkg-plist index 9fedb1c62c55..d2bd13017f6c 100644 --- a/multimedia/vdr/pkg-plist +++ b/multimedia/vdr/pkg-plist @@ -1,14 +1,14 @@ bin/svdrpsend.pl bin/vdr -lib/vdr/libvdr-dvbsddevice.so.1.7.17 -lib/vdr/libvdr-svcsvr.so.1.7.17 -lib/vdr/libvdr-svccli.so.1.7.17 -lib/vdr/libvdr-status.so.1.7.17 -lib/vdr/libvdr-skincurses.so.1.7.17 -lib/vdr/libvdr-pictures.so.1.7.17 -lib/vdr/libvdr-osddemo.so.1.7.17 -lib/vdr/libvdr-hello.so.1.7.17 -lib/vdr/libvdr-svdrpdemo.so.1.7.17 +lib/vdr/libvdr-dvbsddevice.so.1.7.18 +lib/vdr/libvdr-svcsvr.so.1.7.18 +lib/vdr/libvdr-svccli.so.1.7.18 +lib/vdr/libvdr-status.so.1.7.18 +lib/vdr/libvdr-skincurses.so.1.7.18 +lib/vdr/libvdr-pictures.so.1.7.18 +lib/vdr/libvdr-osddemo.so.1.7.18 +lib/vdr/libvdr-hello.so.1.7.18 +lib/vdr/libvdr-svdrpdemo.so.1.7.18 %%NLS%%share/locale/ar/LC_MESSAGES/vdr.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-hello.mo @@ -74,11 +74,11 @@ lib/vdr/libvdr-svdrpdemo.so.1.7.17 %%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/vdr/libsi/util.h -include/vdr/libsi/si.h -include/vdr/libsi/section.h -include/vdr/libsi/headers.h -include/vdr/libsi/descriptor.h +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/vdr/Make.config include/vdr/videodir.h @@ -203,6 +203,6 @@ etc/vdr/svdrphosts.conf.sample @dirrmtry etc/vdr/plugins @dirrmtry etc/vdr @dirrmtry lib/vdr -@dirrm include/vdr/libsi +@dirrm include/libsi @dirrm include/vdr @unexec echo "Warning: If you will *NOT* use this package anymore, please remove the vdr user and group manually." diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile index 687164aa7410..9029879e747c 100644 --- a/www/vdr-plugin-live/Makefile +++ b/www/vdr-plugin-live/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-live PORTVERSION= 0.2.0s20110303 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www multimedia MASTER_SITES= http://live.vdr-developer.org/downloads/:release \ LOCAL/nox/:snapshot diff --git a/www/vdr-plugin-live/pkg-plist b/www/vdr-plugin-live/pkg-plist index 8bcd35397a63..727f7bf2bf89 100644 --- a/www/vdr-plugin-live/pkg-plist +++ b/www/vdr-plugin-live/pkg-plist @@ -1,4 +1,4 @@ -lib/vdr/libvdr-live.so.1.7.17 +lib/vdr/libvdr-live.so.1.7.18 etc/vdr/plugins/live/css/DatePicker.css etc/vdr/plugins/live/css/siteprefs.css etc/vdr/plugins/live/img/active.png |