diff options
Diffstat (limited to 'media-plugins/vdr-extrecmenu')
7 files changed, 12 insertions, 152 deletions
diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog index 3bf5130a3df3..138bd973887f 100644 --- a/media-plugins/vdr-extrecmenu/ChangeLog +++ b/media-plugins/vdr-extrecmenu/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-extrecmenu -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.31 2011/12/21 09:02:29 phajdan.jr Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.32 2012/02/07 14:22:00 hd_brummy Exp $ + + 07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-extrecmenu-1.2.ebuild, -files/vdr-extrecmenu-1.2-gcc44.patch, + -files/vdr-extrecmenu-1.2_pre1-gcc43.patch, + -files/vdr-extrecmenu-1.2_pre1-gcc44.patch, vdr-extrecmenu-1.2.1.ebuild, + -files/dvdarchive-2.3-beta-configfile.patch: + cleanup, minor fixes 21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> vdr-extrecmenu-1.2.1.ebuild: 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 deleted file mode 100644 index 59130c2ebd57..000000000000 --- a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/vdr-extrecmenu-1.2-gcc44.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2-gcc44.patch deleted file mode 100644 index 96fd9376eb53..000000000000 --- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2-gcc44.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur extrecmenu-1.2.orig/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c ---- extrecmenu-1.2.orig/mymenueditrecording.c 2010-09-22 15:31:27.000000000 +0200 -+++ extrecmenu-1.2/mymenueditrecording.c 2010-09-22 15:36:19.000000000 +0200 -@@ -25,15 +25,15 @@ - - if(recording) - { -- char *p=(char*)strrchr(recording->Name(),'~'); //TODO -+ const char *p=(char*)strrchr(recording->Name(),'~'); //TODO - if(p) - { - strn0cpy(name,++p,sizeof(name)); - strn0cpy(path,recording->Name(),sizeof(path)); - -- p=strrchr(path,'~'); -- if(p) -- *p=0; -+ char *p2 = strrchr(path,'~'); -+ if(p2) -+ *p2=0; - } - else - strn0cpy(name,recording->Name(),sizeof(name)); diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch deleted file mode 100644 index 63af256cb3a5..000000000000 --- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix compile problems on gcc-4.3.x -bug 227093 -diff -ruN extrecmenu-1.2_orig/tools.c extrecmenu-1.2/tools.c ---- extrecmenu-1.2_orig/tools.c 2008-03-22 15:00:12.000000000 +0100 -+++ extrecmenu-1.2/tools.c 2008-06-15 10:54:33.000000000 +0200 -@@ -5,6 +5,7 @@ - #include <string> - #include <fstream> - #include <iostream> -+#include <langinfo.h> - #include <vdr/plugin.h> - #include <vdr/videodir.h> - #include <vdr/recording.h> - diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch deleted file mode 100644 index 3cda48b25805..000000000000 --- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru extrecmenu-1.2-orig/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c ---- extrecmenu-1.2-orig/mymenueditrecording.c 2009-06-15 21:37:04.928136215 +0200 -+++ extrecmenu-1.2/mymenueditrecording.c 2009-06-15 21:40:02.881447945 +0200 -@@ -25,15 +25,15 @@ - - if(recording) - { -- char *p=strrchr(recording->Name(),'~'); -+ const char *p=strrchr(recording->Name(),'~'); - if(p) - { - strn0cpy(name,++p,sizeof(name)); - strn0cpy(path,recording->Name(),sizeof(path)); - -- p=strrchr(path,'~'); -- if(p) -- *p=0; -+ char *p2 = strrchr(path,'~'); -+ if(p2) -+ *p2=0; - } - else - strn0cpy(name,recording->Name(),sizeof(name)); -@@ -307,7 +307,7 @@ - asprintf(&dir,"%s%s%s",base?base:"",base?"~":"",item->Text()); - else // needed for move recording menu - { -- char *p=strrchr(recording->Name(),'~'); -+ const char *p=strrchr(recording->Name(),'~'); - asprintf(&dir,"%s%s%s~%s",base?base:"",base?"~":"",item->Text(),p?p+1:recording->Name()); - } - } -@@ -315,7 +315,7 @@ - { - if(!dirname) - { -- char *p=strrchr(recording->Name(),'~'); -+ const char *p=strrchr(recording->Name(),'~'); - asprintf(&dir,"%s",p?++p:recording->Name()); - } - } -@@ -326,7 +326,7 @@ - asprintf(&dir,"%s",base); - else - { -- char *p=strrchr(recording->Name(),'~'); -+ const char *p=strrchr(recording->Name(),'~'); - asprintf(&dir,"%s~%s",base,p?p:recording->Name()); - } - } diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild index 058792547082..ce878764d033 100644 --- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild +++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.1.ebuild,v 1.4 2011/12/21 09:02:29 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild,v 1.5 2012/02/07 14:22:00 hd_brummy Exp $ EAPI="3" @@ -12,7 +12,7 @@ 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="http://projects.vdr-developer.org/attachments/download/${VERSION}/${P}.tgz +SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz mirror://gentoo/${DVDARCHIVE}.gz" LICENSE="GPL-2" diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild deleted file mode 100644 index e480a275dcfc..000000000000 --- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 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.ebuild,v 1.2 2011/01/28 23:55:46 hd_brummy Exp $ - -EAPI="3" - -inherit vdr-plugin eutils - -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="http://projects.vdr-developer.org/attachments/download/334/${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() { - epatch "${FILESDIR}/${P}-gcc44.patch" - - 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_src_prepare -} - -src_install() { - vdr-plugin_src_install - - cd "${WORKDIR}" - newbin ${DVDARCHIVE} dvdarchive.sh - - insinto /etc/vdr - doins "${FILESDIR}"/dvdarchive.conf -} |