summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-extrecmenu
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-extrecmenu')
-rw-r--r--media-plugins/vdr-extrecmenu/Manifest3
-rw-r--r--media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch13
-rw-r--r--media-plugins/vdr-extrecmenu/files/dvdarchive.conf23
-rw-r--r--media-plugins/vdr-extrecmenu/files/extrecmenu.mk128
-rw-r--r--media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff98
-rw-r--r--media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff167
-rw-r--r--media-plugins/vdr-extrecmenu/metadata.xml10
-rw-r--r--media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild60
-rw-r--r--media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild45
9 files changed, 547 insertions, 0 deletions
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
new file mode 100644
index 000000000000..22935713ed92
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -0,0 +1,3 @@
+DIST dvdarchive-2.3-beta.sh.gz 3412 SHA256 e8df7ea215e8a856cef1c03373d419c24ddace5c63f780282cbc6b18679000bd SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f WHIRLPOOL fcc459d67ee33080af5a3079b4238d203c27b1dcc62af5b0c06b63082bb881462a47e1b97afc43865f250e86dce7cd12e122de83bf30edd0ccdda71fc22020b6
+DIST vdr-extrecmenu-1.2.2.tgz 734012 SHA256 ac920ee4c43497958ca158d2b81490208cd5caf92545ce809adb8a73f71dfe5e SHA512 071fd3c1d44afe17081ff2cdd747555d4218cffa2fd101ffa9c77b81376114af829bf58ce2f70f74eb7eb1090699b6a85a8e7105e3bf748ee7e8cb39ebee4f3c WHIRLPOOL 0f5504665e901bd24639682f5869f82af8ea9346013c8b66e5da5bd22ea3f927594334cf7ec53e2659caf0f420aae7e0949065807139166908fdaf5c6e9fd402
+DIST vdr-extrecmenu-1.2.4.tgz 731823 SHA256 9e96eb36576f59525183ebe0aca4e899aa2f8f9ce34c4b293a0a605508ca2074 SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592 WHIRLPOOL 8715f24c53eab99f60ad33d8de62a0f8d5da196be95f0054a4dbec093bc2bf00c9578466d5e4aef8049c360b084277d90c56dcb2eff724896f4501d020078b01
diff --git a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
new file mode 100644
index 000000000000..723610e8c58e
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
@@ -0,0 +1,13 @@
+--- dvdarchive-2.3-beta.sh 2009-10-06 16:23:20.000000000 +0200
++++ dvdarchive-2.3-beta.sh 2009-10-06 17:32:43.000000000 +0200
+@@ -118,6 +118,10 @@
+ DEBUGLOG="/tmp/dvdarchive.sh-debug.log"
+
+ #</Configuration>
++
++# read config file
++. /etc/vdr/dvdarchive.conf
++
+ #
+ # No changes needed after this mark
+
diff --git a/media-plugins/vdr-extrecmenu/files/dvdarchive.conf b/media-plugins/vdr-extrecmenu/files/dvdarchive.conf
new file mode 100644
index 000000000000..e404f8160699
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/dvdarchive.conf
@@ -0,0 +1,23 @@
+# config file for /usr/bin/dvdarchive.sh
+# this is used by vdr-extrecmenu for dvdarchives
+
+# Mountpoint, the same as in fstab
+MOUNTPOINT="/mnt/cdrom" # no trailing '/'
+
+# Eject DVD for exit-codes 2 and 3 (no or wrong dvd). 1 = yes, 0 = no.
+EJECTWRONG=1
+
+# Eject DVD after unmounting. 1 = yes, 0 = no.
+EJECTUMOUNT=0
+
+# Log warnings/errors in syslog. 1 = yes, 0 = no.
+SYSLOG=1
+
+# Create a length.vdr after mounting the dvd for the played recording. 1 = yes, 0 = no.
+# Only for non-vfat and with index.vdr only on dvd.
+GETLENGTH=1
+
+# Put debug infos in file $DEBUGLOG. Only if $DEBUG=1.
+DEBUG=0
+DEBUGLOG="/tmp/dvdarchive.sh-debug.log"
+
diff --git a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
new file mode 100644
index 000000000000..88635193eff2
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
@@ -0,0 +1,128 @@
+#
+# 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.
+
+PLUGIN = extrecmenu
+
+### 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)"'
+
+ifdef USE_PINPLUGIN
+DEFINES += -DUSE_PINPLUGIN
+endif
+
+DEFINES += -DUSE_VDR_CUTTER
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o mymenurecordings.o mymenueditrecording.o myreplaycontrol.o mymenucommands.o mymenusetup.o tools.o
+
+### The main target:
+
+all: $(SOFILE) i18n
+
+### 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='<see README>' -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:
+
+$(SOFILE): $(OBJS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+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 $(TMPDIR) $(ARCHIVE)
+ @-rm -rf $(TMPDIR)/$(ARCHIVE)
+ @echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff b/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
new file mode 100644
index 000000000000..7da091713d57
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
@@ -0,0 +1,98 @@
+diff -Naur extrecmenu-1.2.1.orig/mymenueditrecording.c extrecmenu-1.2.1/mymenueditrecording.c
+--- extrecmenu-1.2.1.orig/mymenueditrecording.c 2012-04-07 09:48:21.000000000 +0200
++++ extrecmenu-1.2.1/mymenueditrecording.c 2012-04-07 09:52:03.000000000 +0200
+@@ -500,8 +500,8 @@
+ myMenuRecordingDetails::myMenuRecordingDetails(cRecording *Recording):cOsdMenu(tr("Details"),12)
+ {
+ recording=Recording;
+- priority=recording->priority;
+- lifetime=recording->lifetime;
++ priority=recording->Priority();
++ lifetime=recording->Lifetime();
+
+ Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY));
+ Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME));
+@@ -514,7 +514,10 @@
+ {
+ if(Key==kOk)
+ {
+- if((priority!=recording->priority)||(lifetime!=recording->lifetime))
++ int old_priority = recording->Priority();
++ int old_lifetime = recording->Lifetime();
++ if((priority!=old_priority)||(lifetime!=old_lifetime))
++// if((priority!=recording->priority)||(lifetime!=recording->lifetime))
+ {
+ #if VDRVERSNUM > 10713
+ if(recording->IsPesRecording())
+diff -Naur extrecmenu-1.2.1.orig/tools.c extrecmenu-1.2.1/tools.c
+--- extrecmenu-1.2.1.orig/tools.c 2012-04-07 09:48:21.000000000 +0200
++++ extrecmenu-1.2.1/tools.c 2012-04-07 09:56:33.000000000 +0200
+@@ -456,7 +456,7 @@
+ if(!(fromfile=fromfilename->Open()) || !(tofile=tofilename->Open()))
+ return;
+ fromfile->SetReadAhead(MEGABYTE(20));
+- index=mark->position;
++ index=mark->Position();
+ mark=frommarks.Next(mark);
+ tomarks.Add(0);
+ tomarks.Save();
+@@ -542,8 +542,8 @@
+ filesize+=length;
+ if(!lastiframe)
+ lastiframe=toindex->Last();
+-
+- if(mark && index >= mark->position)
++
++ if(mark && index >= mark->Position())
+ {
+ mark=frommarks.Next(mark);
+ tomarks.Add(lastiframe);
+@@ -552,7 +552,7 @@
+ tomarks.Save();
+ if(mark)
+ {
+- index=mark->position;
++ index=mark->Position();
+ mark=frommarks.Next(mark);
+ currentfilenumber=0;
+ cutin=true;
+diff -Naur extrecmenu-1.2.1.orig/mymenurecordings.c extrecmenu-1.2.1/mymenurecordings.c
+--- extrecmenu-1.2.1.orig/mymenurecordings.c 2012-04-07 10:08:35.000000000 +0200
++++ extrecmenu-1.2.1/mymenurecordings.c 2012-04-07 10:17:19.000000000 +0200
+@@ -66,7 +66,9 @@
+ else
+ {
+ stringstream text;
+- text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
++// text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
++ time_t start = recording->Start();
++ text << *DateString(start) << ", " << *TimeString(start) << "\n\n";
+
+ if(recording->Info()->Title())
+ {
+@@ -95,8 +97,12 @@
+ else
+ text << tr("Size") << ": " << recmb << " MB\n";
+
+- text << trVDR("Priority") << ": " << recording->priority << "\n";
+- text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
++// text << trVDR("Priority") << ": " << recording->priority << "\n";
++// text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
++ int prio = recording->Priority();
++ int lft = recording->Lifetime();
++ text << trVDR("Priority") << ": " << prio << "\n";
++ text << trVDR("Lifetime") << ": " << lft << "\n";
+
+ DisplayMenu()->SetText(text.str().c_str(),false);
+ cStatus::MsgOsdTextItem(text.str().c_str());
+@@ -192,7 +198,9 @@
+
+ // date and time of recording
+ struct tm tm_r;
+- struct tm *t=localtime_r(&Recording->start,&tm_r);
++// struct tm *t=localtime_r(&Recording->start,&tm_r);
++ time_t start = Recording->Start();
++ struct tm *t=localtime_r(&start,&tm_r);
+
+ idbuffer << t->tm_mday << t->tm_mon << t->tm_year
+ << t->tm_hour << t->tm_min;
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
new file mode 100644
index 000000000000..b1f4d391a44a
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff
@@ -0,0 +1,167 @@
+diff -Naur extrecmenu-1.2.2.orig/mymenueditrecording.c extrecmenu-1.2.2/mymenueditrecording.c
+--- extrecmenu-1.2.2.orig/mymenueditrecording.c 2013-10-23 13:14:38.010071212 +0200
++++ extrecmenu-1.2.2/mymenueditrecording.c 2013-10-23 13:21:12.560096164 +0200
+@@ -76,7 +76,11 @@
+
+ if(isdir)
+ {
++#if APIVERSNUM > 20101
++ if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),tmppath?"/":"",dirbase?dirbase:"",dirname))
++#else
+ if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,tmppath?"/":"",dirbase?dirbase:"",dirname))
++#endif
+ oldname=NULL;
+ }
+ else
+@@ -84,7 +88,11 @@
+
+ if(oldname)
+ {
++#if APIVERSNUM > 20101
++ if(-1==asprintf(&newname,"%s%s%s/%s%s",cVideoDirectory::Name(),tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
++#else
+ if(-1==asprintf(&newname,"%s%s%s/%s%s",VideoDirectory,tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/')))
++#endif
+ newname=NULL;
+
+ if(newname)
+@@ -305,7 +313,11 @@
+
+ if(dirname)
+ {
++#if APIVERSNUM > 20101
++ if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
++#else
+ if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname))
++#endif
+ oldname=NULL;
+ }
+ else
+@@ -357,7 +369,11 @@
+ if(dir)
+ dir=ExchangeChars(dir,true);
+
++#if APIVERSNUM > 20101
++ if(-1==asprintf(&_newname,"%s%s%s%s",cVideoDirectory::Name(),dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
++#else
+ if(-1==asprintf(&_newname,"%s%s%s%s",VideoDirectory,dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/')))
++#endif
+ _newname=NULL;
+
+ if(_newname)
+@@ -424,7 +440,11 @@
+ {
+ if(!strncmp(oldname,rec->FileName(),strlen(oldname)))
+ {
++#if APIVERSNUM > 20101
++ char *_buf=ExchangeChars(strdup(oldname+strlen(cVideoDirectory::Name())+1),false);
++#else
+ char *_buf=ExchangeChars(strdup(oldname+strlen(VideoDirectory)+1),false);
++#endif
+
+ if(strcmp(rec->Name(),_buf))
+ {
+diff -Naur extrecmenu-1.2.2.orig/mymenurecordings.c extrecmenu-1.2.2/mymenurecordings.c
+--- extrecmenu-1.2.2.orig/mymenurecordings.c 2013-10-23 13:14:38.010071212 +0200
++++ extrecmenu-1.2.2/mymenurecordings.c 2013-10-23 13:27:17.916785937 +0200
+@@ -590,7 +590,11 @@
+ {
+ if(mysetup.FileSystemFreeMB)
+ {
++#if APIVERSNUM > 20101
++ string path=cVideoDirectory::Name();
++#else
+ string path=VideoDirectory;
++#endif
+ path+="/";
+ char *tmpbase=base?ExchangeChars(strdup(base),true):NULL;
+ if(base)
+@@ -634,7 +638,11 @@
+ else
+ {
+ int freemb;
++#if APIVERSNUM > 20101
++ cVideoDirectory::VideoDiskSpace(&freemb);
++#else
+ VideoDiskSpace(&freemb);
++#endif
+ return freemb;
+ }
+
+@@ -747,7 +755,11 @@
+ for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording))
+ list->Add(new myRecListItem(recording));
+ // sort my recordings list
++#if APIVERSNUM > 20101
++ string path=cVideoDirectory::Name();
++#else
+ string path=VideoDirectory;
++#endif
+ path+="/";
+ if(base)
+ path+=base;
+@@ -1211,7 +1223,11 @@
+ {
+ char *strBase=base?ExchangeChars(strdup(base), true):NULL;
+ char *strName=ExchangeChars(strdup(item->Name()), true);
++#if APIVERSNUM > 20101
++ if(-1==asprintf(&parameter,"\"%s/%s/%s\"",cVideoDirectory::Name(),strBase?strBase:"", strName))
++#else
+ if(-1==asprintf(&parameter,"\"%s/%s/%s\"",VideoDirectory,strBase?strBase:"", strName))
++#endif
+ parameter=NULL;
+ free(strBase);
+ free(strName);
+@@ -1235,7 +1251,11 @@
+ // change sorting
+ eOSState myMenuRecordings::ChangeSorting()
+ {
++#if APIVERSNUM > 20101
++ string path=cVideoDirectory::Name();
++#else
+ string path=VideoDirectory;
++#endif
+ path+="/";
+ if(base)
+ path+=base;
+diff -Naur extrecmenu-1.2.2.orig/tools.c extrecmenu-1.2.2/tools.c
+--- extrecmenu-1.2.2.orig/tools.c 2013-10-23 13:14:38.010071212 +0200
++++ extrecmenu-1.2.2/tools.c 2013-10-23 13:36:56.026822499 +0200
+@@ -152,7 +152,11 @@
+ {
+ if(!strncmp(OldName,item->recording->FileName(),strlen(OldName)))
+ {
++#if APIVERSNUM > 20101
++ buf=strdup(OldName+strlen(cVideoDirectory::Name())+1);
++#else
+ buf=strdup(OldName+strlen(VideoDirectory)+1);
++#endif
+ if(buf)
+ {
+ buf=ExchangeChars(buf,false);
+@@ -240,8 +244,13 @@
+ {
+ myRecListItem *item=(myRecListItem*)&ListObject;
+
++#if APIVERSNUM > 20101
++ char *s1=StripEpisodeName(strdup(filename+strlen(cVideoDirectory::Name())));
++ char *s2=StripEpisodeName(strdup(item->filename+strlen(cVideoDirectory::Name())));
++#else
+ char *s1=StripEpisodeName(strdup(filename+strlen(VideoDirectory)));
+ char *s2=StripEpisodeName(strdup(item->filename+strlen(VideoDirectory)));
++#endif
+
+ int compare;
+ if(mysetup.DescendSorting)
+@@ -699,7 +708,11 @@
+
+ isyslog("[extrecmenu] moving canceled");
+
++#if APIVERSNUM > 20101
++ cVideoDirectory::RemoveVideoFile(To.c_str());
++#else
+ RemoveVideoFile(To.c_str());
++#endif
+
+ return true;
+ }
diff --git a/media-plugins/vdr-extrecmenu/metadata.xml b/media-plugins/vdr-extrecmenu/metadata.xml
new file mode 100644
index 000000000000..4c7ba1e416d5
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-tv</herd>
+ <maintainer>
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
+ </maintainer>
+ <longdescription>VDR plugin to rename records on OSD</longdescription>
+</pkgmetadata>
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..5f01ab76d478
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="936" #every bump, new version
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="VDR Plugin: Extended recordings menu"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
+ mirror://gentoo/${DVDARCHIVE}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
+
+ cd "${S}"
+ if grep -q fskProtection /usr/include/vdr/timers.h; then
+ einfo "Enabling parentalrating option"
+ sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
+ fi
+
+ vdr-plugin-2_src_prepare
+
+ if has_version ">=media-video/vdr-1.7.28"; then
+ sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c
+ fi
+
+ if has_version ">=media-video/vdr-1.7.32"; then
+ export EXTRECMENU_USE_VDR_CUTTER=1
+ einfo "disabled plugin cutter"
+ einfo "plugin use now the vdr included cutter"
+ fi
+
+ epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
+}
+
+src_install() {
+ vdr-plugin-2_src_install
+
+ cd "${WORKDIR}"
+ newbin ${DVDARCHIVE} dvdarchive.sh
+
+ insinto /etc/vdr
+ doins "${FILESDIR}"/dvdarchive.conf
+}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild
new file mode 100644
index 000000000000..1168f1ba6ac8
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1783" #every bump, new version
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="VDR Plugin: Extended recordings menu"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
+ mirror://gentoo/${DVDARCHIVE}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+ cp "${FILESDIR}"/extrecmenu.mk "${S}"/Makefile
+
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
+
+ vdr-plugin-2_src_prepare
+}
+
+src_install() {
+ vdr-plugin-2_src_install
+
+ cd "${WORKDIR}"
+ newbin ${DVDARCHIVE} dvdarchive.sh
+
+ insinto /etc/vdr
+ doins "${FILESDIR}"/dvdarchive.conf
+}