Date: Sun, 18 Aug 2013 16:11:01 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324928 - in head/multimedia/vdr-plugin-vnsiserver: . files Message-ID: <201308181611.r7IGB177099031@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sun Aug 18 16:11:00 2013 New Revision: 324928 URL: http://svnweb.freebsd.org/changeset/ports/324928 Log: - Update to 12.0 (Frodo) to work with the new multimedia/xbmc-addon-pvr port. - Convert Makefile header. Added: head/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c (contents, props changed) Deleted: head/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c head/multimedia/vdr-plugin-vnsiserver/files/patch-server.c Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile head/multimedia/vdr-plugin-vnsiserver/distinfo (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c (contents, props changed) head/multimedia/vdr-plugin-vnsiserver/pkg-descr (contents, props changed) Modified: head/multimedia/vdr-plugin-vnsiserver/Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/Makefile Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/Makefile Sun Aug 18 16:11:00 2013 (r324928) @@ -1,25 +1,25 @@ -# New ports collection makefile for: vdr-plugin-vnsiserver -# Date created: Tue Oct 5 21:13:30 CEST 2010 -# Whom: Juergen Lock <nox@freebsd.org> -# +# Created by: Juergen Lock <nox@FreeBSD.org> # $FreeBSD$ -# PORTNAME= vdr-plugin-vnsiserver -PORTVERSION= 0.0.2s20100808.0952 -PORTREVISION= 13 +PORTVERSION= 12.0 CATEGORIES= multimedia -MASTER_SITES= http://ppa.launchpad.net/yavdr/testing-vdr/ubuntu/pool/main/v/vdr-plugin-vnsiserver/ \ - LOCAL/nox/ -DISTNAME= ${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION:S/s20/+svn20/}${DISTVERSIONSUFFIX}.orig +MASTER_SITES= http://people.freebsd.org/~decke/distfiles/ +DISTNAME= xbmc-pvr-addons-${PORTVERSION}-Frodo MAINTAINER= nox@FreeBSD.org -COMMENT= Video Disk Recorder - VNSI server plugin +COMMENT= Video Disk Recorder - VNSI server plugin (Frodo) PATCH_STRIP= -p1 HAVE_CONFIGURE= yes PORTDOCS= COPYING README HISTORY -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:S/s20/+svn20/}${DISTVERSIONSUFFIX} +MAKE_JOBS_SAFE= yes +WRKSRC= ${WRKDIR}/xbmc-pvr-addons-${PORTVERSION}-Frodo/addons/pvr.vdr.vnsi/${PORTNAME} + +MAKE_ARGS+= LIBDIR=${WRKDIR}/lib \ + LOCDIR=${WRKDIR}/locale \ + VDRSRC=${LOCALBASE}/include/vdr \ + INCLUDES=-I${LOCALBASE}/include .include "${.CURDIR}/../vdr/Makefile.plugins" Modified: head/multimedia/vdr-plugin-vnsiserver/distinfo ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/distinfo Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/distinfo Sun Aug 18 16:11:00 2013 (r324928) @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-plugin-vnsiserver_0.0.2+svn20100808.0952.orig.tar.gz) = 3763fe0cc853c7e9e22196f4bab5bbf7ce56efac82c44de1e3ab1c6f40a9e375 -SIZE (vdr/vdr-plugin-vnsiserver_0.0.2+svn20100808.0952.orig.tar.gz) = 110497 +SHA256 (vdr/xbmc-pvr-addons-12.0-Frodo.tar.gz) = 6a580bccda532369ce7b08319fc93341ca4e9b111b7b63e707d4c6fa8a3c5ee0 +SIZE (vdr/xbmc-pvr-addons-12.0-Frodo.tar.gz) = 3204309 Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-Makefile Sun Aug 18 16:11:00 2013 (r324928) @@ -1,33 +1,33 @@ --- a/Makefile +++ b/Makefile -@@ -45,7 +45,11 @@ PACKAGE = vdr-$(ARCHIVE) - - ### Includes and Defines (add further entries here): +@@ -127,7 +127,11 @@ $(I18Npot): $(wildcard *.cc) + @touch $@ + $(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +ifdef FREEBSD -+INCLUDES += -I$(VDRDIR) ++ install -m644 $< $@ +else - INCLUDES += -I$(VDRDIR)/include + install -D -m644 $< $@ +endif - DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - -@@ -109,7 +113,11 @@ i18n: $(I18Nmsgs) $(I18Npot) + .PHONY: i18n + i18n: $(I18Nmo) $(I18Npot) +@@ -140,7 +144,11 @@ $(SOFILE): $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ - libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(LIBS) $(OBJS) -o $@ + install-lib: $(SOFILE) +ifdef FREEBSD -+ @cp -f $@ $(LIBDIR)/$@.$(APIVERSION) ++ install $^ $(LIBDIR)/$^.$(APIVERSION) +else - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + install -D $^ $(LIBDIR)/$^.$(APIVERSION) +endif - dist: clean - @-rm -rf $(TMPDIR)/$(ARCHIVE) -@@ -121,3 +129,6 @@ dist: clean + install: install-lib install-i18n + +@@ -157,3 +165,6 @@ clean: + @-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~ - clean: - @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot + compile: $(SOFILE) + +install: + ${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION) Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-cxsocket.c Sun Aug 18 16:11:00 2013 (r324928) @@ -1,20 +1,13 @@ --- a/cxsocket.c +++ b/cxsocket.c -@@ -35,7 +35,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__FreeBSD__) - # include <sys/sendfile.h> - #endif - #include <netinet/tcp.h> -@@ -191,7 +191,7 @@ bool cxSocket::set_multicast(int ttl) +@@ -48,6 +48,10 @@ + #include "config.h" + #include "cxsocket.h" - bool cxSocket::set_cork(bool state) ++#ifndef MSG_MORE ++#define MSG_MORE 0 ++#endif ++ + cxSocket::~cxSocket() { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - return false; - #else - int iCork = state ? 1 : 0; + close(); Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c Sun Aug 18 16:11:00 2013 (r324928) @@ -1,47 +1,12 @@ --- a/receiver.c +++ b/receiver.c -@@ -56,14 +56,23 @@ protected: - virtual void Receive(uchar *Data, int Length); +@@ -32,7 +32,9 @@ - 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); + #include <vdr/remux.h> + #include <vdr/channels.h> ++#ifndef __FreeBSD__ + #include <asm/byteorder.h> +#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); + #include "config.h" + #include "receiver.h" Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-recplayer.c Sun Aug 18 16:11:00 2013 (r324928) @@ -1,13 +1,24 @@ --- a/recplayer.c +++ b/recplayer.c -@@ -189,8 +189,10 @@ unsigned long cRecPlayer::getBlock(unsig - fseek(m_file, filePosition, SEEK_SET); - fread(&buffer[got], getFromThisSegment, 1, m_file); +@@ -34,6 +34,10 @@ + #include <sys/stat.h> + #include <unistd.h> + ++#ifndef O_NOATIME ++#define O_NOATIME 0 ++#endif ++ + cRecPlayer::cRecPlayer(cRecording* rec) + { + m_file = -1; +@@ -199,8 +203,10 @@ int cRecPlayer::getBlock(unsigned char* + return 0; + } +#ifndef __FreeBSD__ - // Tell linux not to bother keeping the data in the FS cache - posix_fadvise(m_file->_fileno, filePosition, getFromThisSegment, POSIX_FADV_DONTNEED); + // Tell linux not to bother keeping the data in the FS cache + posix_fadvise(m_file, filePosition, bytes_read, POSIX_FADV_DONTNEED); +#endif - got += getFromThisSegment; - currentPosition += getFromThisSegment; + // divide and conquer + if(bytes_read < amount) { Added: head/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-requestpacket.c Sun Aug 18 16:11:00 2013 (r324928) @@ -0,0 +1,16 @@ +--- a/requestpacket.c ++++ b/requestpacket.c +@@ -28,7 +28,13 @@ + #include <stdint.h> + #include <string.h> + ++#ifndef __FreeBSD__ + #include <asm/byteorder.h> ++#else ++#include <sys/endian.h> ++#define __be64_to_cpu be64toh ++#define __cpu_to_be64 htobe64 ++#endif + + #include "config.h" + #include "requestpacket.h" Modified: head/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-responsepacket.c Sun Aug 18 16:11:00 2013 (r324928) @@ -1,10 +1,18 @@ --- a/responsepacket.c +++ b/responsepacket.c -@@ -27,6 +27,7 @@ +@@ -31,8 +31,15 @@ #include <arpa/inet.h> #include <stdlib.h> #include <string.h> +#include <inttypes.h> ++#ifndef __FreeBSD__ + #include <asm/byteorder.h> ++#else ++#include <sys/endian.h> ++#define __be64_to_cpu be64toh ++#define __cpu_to_be64 htobe64 ++#endif + #include "responsepacket.h" - #include "vdrcommand.h" + #include "vnsicommand.h" Added: head/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vdr-plugin-vnsiserver/files/patch-vnsiserver.c Sun Aug 18 16:11:00 2013 (r324928) @@ -0,0 +1,18 @@ +--- a/vnsiserver.c ++++ b/vnsiserver.c +@@ -156,6 +156,7 @@ void cVNSIServer::NewClientConnected(int + int val = 1; + setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val)); + ++#ifdef SOL_TCP + val = 30; + setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val)); + +@@ -167,6 +168,7 @@ void cVNSIServer::NewClientConnected(int + + val = 1; + setsockopt(fd, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); ++#endif + + INFOLOG("Client with ID %d connected: %s", m_IdCnt, cxSocket::ip2txt(sin.sin_addr.s_addr, sin.sin_port, buf)); + cVNSIClient *connection = new cVNSIClient(fd, m_IdCnt, cxSocket::ip2txt(sin.sin_addr.s_addr, sin.sin_port, buf)); Modified: head/multimedia/vdr-plugin-vnsiserver/pkg-descr ============================================================================== --- head/multimedia/vdr-plugin-vnsiserver/pkg-descr Sun Aug 18 15:39:34 2013 (r324927) +++ head/multimedia/vdr-plugin-vnsiserver/pkg-descr Sun Aug 18 16:11:00 2013 (r324928) @@ -1,7 +1,6 @@ http://www.vdr-wiki.de/wiki/index.php/Vnsi-server-plugin -VDR-Network-Streaming-Interface plugin (untested, currently used by -the XBMC pvr-testing2 branch which hasn't been ported to FreeBSD yet -at the time of writing.) +VDR-Network-Streaming-Interface plugin to be used with XMBC >= 12.0 +(Frodo) pvr.vdr.vnsi addon (now part of multimedia/xbmc-addon-pvr) WWW: http://www.vdr-portal.de/board/thread.php?threadid=95292
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308181611.r7IGB177099031>