summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2013-10-23 12:02:49 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2013-10-23 12:02:49 +0000
commitf619cf4c522e1555888b9e7d7bc83ac06df46e36 (patch)
treec7a1f56c05317a282cf3f1a1e0fd352e18e29d09
parentStable for AMD64 x86 too. (diff)
downloadgentoo-2-f619cf4c522e1555888b9e7d7bc83ac06df46e36.tar.gz
gentoo-2-f619cf4c522e1555888b9e7d7bc83ac06df46e36.tar.bz2
gentoo-2-f619cf4c522e1555888b9e7d7bc83ac06df46e36.zip
revision -r2 with vdr-2.1.2 compile fix
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
-rw-r--r--media-plugins/vdr-extrecmenu/ChangeLog8
-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/vdr-extrecmenu-1.2.2-r2.ebuild60
3 files changed, 234 insertions, 1 deletions
diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index 59a22619f232..d088a845301f 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-plugins/vdr-extrecmenu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.42 2013/03/25 20:41:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.43 2013/10/23 12:02:49 hd_brummy Exp $
+
+*vdr-extrecmenu-1.2.2-r2 (23 Oct 2013)
+
+ 23 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+ +vdr-extrecmenu-1.2.2-r2.ebuild, +files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff:
+ revision -r2 with vdr-2.1.2 compile fix
25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> vdr-extrecmenu-1.2.2-r1.ebuild:
Stable for x86, wrt bug #457390
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/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..6f5bb2dae460
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild,v 1.1 2013/10/23 12:02:49 hd_brummy Exp $
+
+EAPI="5"
+
+inherit vdr-plugin-2
+
+VERSION="936" #every bump, new version
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
+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
+}