- Update multimedia/vdr to 1.7.18 .
- Bump PORTVERSION for all plugins. - Add markad plugin to multimedia/vdr-plugins metaport.
This commit is contained in:
Juergen Lock
parent
55a8a509a8
commit
510e9ec467
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=272936
40 changed files with 85 additions and 220 deletions
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
lib/vdr/libvdr-control.so.1.7.17
|
||||
lib/vdr/libvdr-control.so.1.7.18
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
lib/vdr/libvdr-remote.so.1.7.17
|
||||
lib/vdr/libvdr-remote.so.1.7.18
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue