[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-vompserver/files/, media-plugins/vdr-vompserver/

2022-08-29 Thread Andreas Sturmlechner
commit: 915e8fcf589e59c216115382ca0b99a884015bc7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 28 21:48:32 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 29 18:39:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915e8fcf

media-plugins/vdr-vompserver: drop 0.4.1, 0.4.1-r1, EAPI-6--

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-plugins/vdr-vompserver/Manifest  |  1 -
 .../files/vdr-vompserver-0.4.1_c++11.patch | 15 -
 .../vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild  | 39 --
 .../vdr-vompserver/vdr-vompserver-0.4.1.ebuild | 37 
 4 files changed, 92 deletions(-)

diff --git a/media-plugins/vdr-vompserver/Manifest 
b/media-plugins/vdr-vompserver/Manifest
index 24383473dc5d..4fc8ac159881 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,2 +1 @@
-DIST vdr-vompserver-0.4.1.tgz 87056 BLAKE2B 
a2106bc88407a198a218a003bb7973af8e96e5d367f7c6a86b95e802adfc9135dc2ede2534594284428acec418f22604ad49fe4ac245b37c0f51c5889a689cfe
 SHA512 
79fbc311b48a752206842f21ec8d864df67aa7614f092b4e6a6623d732d4e053c2e35af7981aaed7d392f6510ebaac59f60640acae540e13c4f38cce04ddd1bd
 DIST vdr-vompserver-0.5.1.tgz 97156 BLAKE2B 
a4c122cd83eb9f228ec2acb53b3e4ca0774effdda85516d8af131d9d93b791d92e78373fc79c9260d6dc7961039acc452789b37e8a5f873bfb8293dc1123e40e
 SHA512 
24c5c67c25889a62735ad473143246a99df72cc972ffa68989821214765cc16eb49e4057fd7e1987e7602afe631f07c6e3554499c768cfc45e3a030db105ce45

diff --git 
a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch 
b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch
deleted file mode 100644
index 7571f9457b7e..
--- a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-compile fix gcc-6
-https://bugs.gentoo.org/show_bug.cgi?id=593854
-Signed-of-by: Joerg Bornkessel  (2016/Oct/16)
-diff -Naur vompserver-0.4.1.orig/Makefile vompserver-0.4.1/Makefile
 vompserver-0.4.1.orig/Makefile 2016-10-16 23:48:36.10058 +0200
-+++ vompserver-0.4.1/Makefile  2016-10-16 23:49:05.22658 +0200
-@@ -53,7 +53,7 @@
- 
- INCLUDES +=
- 
--DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D__STL_CONFIG_H
- 
- # VOMP-INSERT
- DEFINES += -DVOMPSERVER

diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild 
b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild
deleted file mode 100644
index 5619624e7512..
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: server part for MediaMVP device"
-HOMEPAGE="https://www.loggytronic.com/vomp.php";
-SRC_URI="https://www.loggytronic.com/dl/${P}.tgz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.7.36-r1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}_c++11.patch" )
-
-KEEP_I18NOBJECT="yes"
-
-src_install() {
-   vdr-plugin-2_src_install
-
-   insinto /etc/vdr/plugins/vompserver
-   newins vomp.conf.sample vomp.conf
-   newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
-}
-
-pkg_postinst() {
-   vdr-plugin-2_pkg_postinst
-
-   elog "\nHave a look to the VOMP sample files in /etc/vdr/plugins.\n"
-
-   elog "You have to download the dongle file (i.e. firmware) and adapt"
-   elog "the vomp configuration files accordingly."
-}

diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild 
b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
deleted file mode 100644
index d8ef5d36284f..
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: server part for MediaMVP device"
-HOMEPAGE="https://www.loggytronic.com/vomp.php";
-SRC_URI="https://www.loggytronic.com/dl/${P}.tgz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.7.36-r1"
-RDEPEND="${DEPEND}"
-
-KEEP_I18NOBJECT="yes"
-
-src_install() {
-   vdr-plugin-2_src_install
-
-   insinto /etc/vdr/plugins/vompserver
-   newins vomp.conf.sample vomp.conf
-   newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
-}
-
-pkg_postinst() {
-   vdr-plugin-2_pkg_postinst
-
-   elog "\nHave a look to the VOMP sample files in /etc/vdr/plugins.\n"
-
-   elog "You have to download the dongle file (i.e. firmware) and adapt"
-   elog "the vomp configuration files accordingly."
-}



[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-vompserver/files/

2016-12-27 Thread Göktürk Yüksek
commit: f763efa3983c36dd7e7b1795bfa776ca77e1683e
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Dec 26 15:02:36 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Dec 27 19:29:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f763efa3

media-plugins/vdr-vompserver: remove unused file

 media-plugins/vdr-vompserver/files/vompserver.mk | 150 ---
 1 file changed, 150 deletions(-)

diff --git a/media-plugins/vdr-vompserver/files/vompserver.mk 
b/media-plugins/vdr-vompserver/files/vompserver.mk
deleted file mode 100644
index 1ea9ac3..
--- a/media-plugins/vdr-vompserver/files/vompserver.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id$
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-
-# add the name of the plugin, next edit the OBJS line,
-PLUGIN = vompserver
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ 
print $$6 }' | sed -e 's/[";]//g')
-
-### The directory environment:
-
-# Use package data if installed...otherwise assume we're under the VDR source 
directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) 
$(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config 
--variable=$(1) ../../../vdr.pc))
-LIBDIR = $(call PKGCFG,libdir)
-LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
-#
-TMPDIR ?= /tmp
-
-### The compiler options:
-
-export CFLAGS   = $(call PKGCFG,cflags)
-export CXXFLAGS = $(call PKGCFG,cxxflags)
-
-### The version number of VDR's plugin API:
-
-APIVERSION = $(call PKGCFG,apiversion)
-
-### Allow user defined options to overwrite defaults:
-
--include $(PLGCFG)
-
-### The name of the distribution archive:
-
-ARCHIVE = $(PLUGIN)-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### The name of the shared object file:
-
-SOFILE = libvdr-$(PLUGIN).so
-
-### Includes and Defines (add further entries here):
-
-INCLUDES +=
-
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-DEFINES += -DVOMPSERVER
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o
-
-OBJS += dsock.o mvpserver.o udpreplier.o bootpd.o tftpd.o i18n.o vompclient.o 
tcp.o \
-ringbuffer.o mvprelay.o vompclientrrproc.o \
-config.o log.o thread.o tftpclient.o \
-media.o responsepacket.o \
-mediafile.o mediaplayer.o servermediafile.o serialize.o medialauncher.o
-
-OBJS2 = recplayer.o mvpreceiver.o
-
-### The main target:
-
-all: allbase $(SOFILE)
-#i18n
-standalone: standalonebase vompserver-standalone
-
-### Implicit rules:
-
-%.o: %.c
-   $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-
-### Dependencies:
-
-MAKEDEP = $(CXX) -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-   @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Internationalization (I18N):
-
-PODIR = po
-I18Npo= $(wildcard $(PODIR)/*.po)
-I18Nmo= $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file
-I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix 
/LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename 
$(file))
-I18Npot   = $(PODIR)/$(PLUGIN).pot
-
-%.mo: %.po
-   msgfmt -c -o $@ $<
-
-$(I18Npot): $(wildcard *.c)
-   xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP 
--package-name=vdr-$(PLUGIN) --package-version=$(VERSION) 
--msgid-bugs-address='' -o $@ `ls $^`
-
-%.po: $(I18Npot)
-   msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
-   @touch $@
-
-$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-   install -D -m644 $< $@
-
-.PHONY: i18n
-i18n: $(I18Nmo) $(I18Npot)
-
-install-i18n: $(I18Nmsgs)
-
-### Targets:
-
-objectsstandalone: $(OBJS)
-objects: $(OBJS) $(OBJS2)
-
-allbase:
-   ( if [ -f .standalone ] ; then ( rm -f .standalone; make clean ; make 
objects ) ; else exit 0 ;fi )
-standalonebase:
-   ( if [ ! -f .standalone ] ; then ( make clean; echo 
"DEFINES+=-DVOMPSTANDALONE" > .standalone; echo 
"DEFINES+=-D_FILE_OFFSET_BITS=64" >> .standalone; make objectsstandalone ) ; 
else exit 0 ;fi )
-
-$(SOFILE): objects
-   $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(OBJS2) -o $@
-   @if [ -n "$(DOOLDINSTALL)" ]; then \
-cp $@ $(LIBDIR)/$@.$(APIVERSION) ; \
-echo "done manual copy"; \
-fi
-
-vompserver-standalone: objectsstandalone
-   $(CXX) $(CXXFLAGS) $(OBJS) -lpthread -o $@
-   chmod u+x $@
-
-install-lib: $(SOFILE)
-   install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-
-install: install-lib install-i18n
-
-dist: $(I18Npo) clean
-   @-rm -rf $(TMPDIR)/$(ARCHIVE)
-   @mkdir $(TMPDIR)/$(ARCHIVE)
-   @cp -a * $(TMPDIR)/$(ARCHIVE)
-   @tar czf $(PACKAGE).tgz -C $(

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-vompserver/files/, media-plugins/vdr-vompserver/

2016-10-16 Thread Joerg Bornkessel
commit: d6a6907a9779021439582acf3453f38d4a362813
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Oct 16 21:58:02 2016 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Oct 16 21:58:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a6907a

media-plugins/vdr-vompserver: compile fix gcc-6, wrt bug 593854; cleanup old

Package-Manager: portage-2.3.0

 media-plugins/vdr-vompserver/Manifest  |  2 -
 .../vdr-vompserver/files/rrprocstart.patch | 43 --
 media-plugins/vdr-vompserver/files/vdr-1.7.27.diff | 36 ---
 .../files/vdr-vompserver-0.4.1_c++11.patch | 15 ++
 .../vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild  | 53 --
 ...0.4.0.ebuild => vdr-vompserver-0.4.1-r1.ebuild} | 16 ++-
 6 files changed, 20 insertions(+), 145 deletions(-)

diff --git a/media-plugins/vdr-vompserver/Manifest 
b/media-plugins/vdr-vompserver/Manifest
index 4cdbd92..980de82 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,3 +1 @@
-DIST vdr-vompserver-0.3.1.tgz 84183 SHA256 
bb9838b1139926bc0bd35e87a750a5aaf937015d78b351361c8611a7610488bd SHA512 
0e77e4a005c78f9840ab75a81ceb67cd34479b9a726f1195d7147a1cfde58ea25e1dd5e5c6a9bc22ccca1d94f4011d0f9b67b56ee1faab4b7a2f9654d8a04d3b
 WHIRLPOOL 
3570eeb9f550da2bac8862ed11d49acb37e33eaaf1833583677af1dae0fc3a64881470a4f33fccb63b56e9e2c5712e0aa8010f15f4a3c11198cd11092c02698b
-DIST vdr-vompserver-0.4.0.tgz 87166 SHA256 
21437dfaa0a5cec57e211ea5819a96d1b2b56a700bd3e76033a1fb1bd8702b06 SHA512 
027b3b63fc8fa34da11cc1841602e89fb48a7345717c22cf796cb24134504991b3056354b459358deb983da93fd6a3e74ddd965e894afcd6ba2bf69c37d058fa
 WHIRLPOOL 
780ee9dd51692456d6b5a8d67c4d273baf77a9c549650416dc7307c0a4386fbf83b2e4df00856008b445875cc21ee665fe06349bf2cf691bae2e7ed91cbbbff2
 DIST vdr-vompserver-0.4.1.tgz 87056 SHA256 
c5d2ba4d48c230de1223dcee6edff3a8cdc574a47779569136b39f4f810fdbd9 SHA512 
79fbc311b48a752206842f21ec8d864df67aa7614f092b4e6a6623d732d4e053c2e35af7981aaed7d392f6510ebaac59f60640acae540e13c4f38cce04ddd1bd
 WHIRLPOOL 
89ff2f8472a3dae695685417e85b6eef07a993c52ce81b4fee3ed4461b6f9394bf3ee04e41d74bfbc65da2ccb2cf8fff7e66010e083fff9320195a098817372f

diff --git a/media-plugins/vdr-vompserver/files/rrprocstart.patch 
b/media-plugins/vdr-vompserver/files/rrprocstart.patch
deleted file mode 100644
index bccdc9d..
--- a/media-plugins/vdr-vompserver/files/rrprocstart.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-rrprocstart.dpatch by  
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backport of a bug in rrproc
-
-fix a message overrun when MediaMVP boots
-The topic is documented in http://forum.loggytronic.com/index.php?topic=528.0
-
-@DPATCH@
-diff -u vdr-plugin-vompserver-new/vompclientrrproc.c 
vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
 vdr-plugin-vompserver-new/vompclientrrproc.c   2010-07-05 
19:20:11.0 +0200
-+++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c 2010-07-05 
19:24:05.0 +0200
-@@ -87,9 +87,25 @@
- 
-   if (req_queue.size() != 0)
-   {
--log->log("RRProc", Log::ERR, "threadMethod err 1"); 
--threadUnlock();
--return;
-+log->log("RRProc", Log::ERR, "threadMethod startup with already queued 
packets"); 
-+while (req_queue.size()) 
-+{
-+  //log->log("RRProc", Log::DEBUG, "thread while");
-+  req = req_queue.front();
-+  req_queue.pop();
-+  
-+  threadUnlock(); // allow recvRequest to be queuing packets while we are 
working on this one
-+  
-+  if (!processPacket())
-+  {
-+log->log("RRProc", Log::ERR, "processPacket exited with fail"); 
-+return;
-+  }
-+  
-+  threadLock();
-+} 
-+log->log("RRProc", Log::ERR, "threadMethod startup with already queued 
packets done."); 
-+
-   }
- 
-   while(1)
-

diff --git a/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff 
b/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
deleted file mode 100644
index f98b75c..
--- a/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur vompserver-0.3.1.orig/mvpreceiver.c vompserver-0.3.1/mvpreceiver.c
 vompserver-0.3.1.orig/mvpreceiver.c2012-05-01 14:35:39.0 
+0200
-+++ vompserver-0.3.1/mvpreceiver.c 2012-05-01 14:49:08.0 +0200
-@@ -40,7 +40,7 @@
- #elif VDRVERSNUM < 10500
- : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), 
channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
- #else
--: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), 
channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
-+: cReceiver(channel, 0)
- #endif
- {
-   logger = Log::getInstance();
-diff -Naur vompserver-0.3.1.orig/vompclientrrproc.c 
vompserver-0.3.1/vompclientrrproc.c
 vompserver-0.3.1.