From: Joerg Bornkessel Date: Sat, 11 Mar 2006 20:35:57 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f511702e54c384bce7f2c06ed7847a96fd1f600;p=gentoo.git version bump Package-Manager: portage-2.0.54 --- diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog index ee0a6339d76e..bf84a0b504f8 100644 --- a/media-plugins/vdr-setup/ChangeLog +++ b/media-plugins/vdr-setup/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-setup # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.2 2006/02/19 23:06:29 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.3 2006/03/11 20:35:57 hd_brummy Exp $ + +*vdr-setup-0.3.1 (11 Mar 2006) + + 11 Mar 2006; Joerg Bornkessel + +files/vdr-setup-0.3.1-gentoo.diff, +files/vdr-setup-0.3.1-timers.diff, + +vdr-setup-0.3.1.ebuild: + version bump 19 Feb 2006; Joerg Bornkessel files/vdr-setup.xml, vdr-setup-0.2.3.ebuild: diff --git a/media-plugins/vdr-setup/Manifest b/media-plugins/vdr-setup/Manifest index 48688d2c5b65..d0c06405e380 100644 --- a/media-plugins/vdr-setup/Manifest +++ b/media-plugins/vdr-setup/Manifest @@ -1,17 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 2a52bbfcb833714728eac978f4e7bfb6 ChangeLog 647 +MD5 1799e1639fa8ecedecdea56566ed2579 ChangeLog 851 MD5 7e7798b807c8766b6331d33684ac3b98 files/digest-vdr-setup-0.2.3 63 +MD5 3675ed9249bf7584ce1c4331fa2fbf42 files/digest-vdr-setup-0.3.1 63 MD5 4dd1e551d51e11df975e6743ea2ead01 files/vdr-setup-0.2.3-gentoo.diff 6713 +MD5 41cf39f874c71c97dbe151092e736715 files/vdr-setup-0.3.1-gentoo.diff 6469 +MD5 92ddb2fe7e0e61f6cace4ca8ff84dedd files/vdr-setup-0.3.1-timers.diff 312 MD5 13134d72f70ed4077f1783e4b9640e0c files/vdr-setup.xml 8338 MD5 b76f00a750adf92ee7defa4febc4b88d metadata.xml 544 MD5 8f022e87ee9ece56950ef705e7780109 vdr-setup-0.2.3.ebuild 1797 +MD5 56c82b72f1774b4e9d0f078b7fdfef8b vdr-setup-0.3.1.ebuild 1785 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: no further Information -iD8DBQFD+PoIdn07HTTCgIoRAjzzAKCf/7aSMErnGj0RtCzYei6g3zm+BgCfWlJv -BwbmKRJNJrtRMaEdLRCHsQE= -=82ey +iD8DBQFEEzS9dn07HTTCgIoRAkErAJsFyKBBQHvXQnoWONus8556tRg2ggCeIhbW +ojWwmkR/0Lzwv1xLMM9nQmQ= +=e+Iw -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1 b/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1 new file mode 100644 index 000000000000..231e3e58ab20 --- /dev/null +++ b/media-plugins/vdr-setup/files/digest-vdr-setup-0.3.1 @@ -0,0 +1 @@ +MD5 3cc4a91219dfb671ba9fd75edadfb56b vdr-setup-0.3.1.tgz 89366 diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gentoo.diff b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gentoo.diff new file mode 100644 index 000000000000..640fc1ac5357 --- /dev/null +++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-gentoo.diff @@ -0,0 +1,175 @@ +written by Joerg Bornkessel + +diff -Naur setup-0.3.1.orig/config.cpp setup-0.3.1/config.cpp +--- setup-0.3.1.orig/config.cpp 2006-03-11 18:26:42.912352500 +0100 ++++ setup-0.3.1/config.cpp 2006-03-11 18:30:07.597144500 +0100 +@@ -13,7 +13,7 @@ + #include + #include + #include "vdr/plugin.h" +-#include "tinystr.h" ++#include "vdr/tinystr.h" + #include "config.h" + #include "sysconfig.h" + #include "plugins.h" +@@ -148,7 +148,7 @@ + - bootLinux=\"/sbin/reboot\" \n\ + - VDRlibDir=\"/usr/lib/vdr/plugins\" \n\ + - \n\ +-- \n\ ++- \n\ + - \n\ + - ...\n\ + - \n\ +diff -Naur setup-0.3.1.orig/config.h setup-0.3.1/config.h +--- setup-0.3.1.orig/config.h 2006-03-11 18:26:42.912352500 +0100 ++++ setup-0.3.1/config.h 2006-03-11 18:30:28.766467500 +0100 +@@ -11,7 +11,7 @@ + + #ifndef CONFIG_H + #define CONFIG_H +-#include "tinystr.h" ++#include "vdr/tinystr.h" + #include "plugins.h" + #include "sysconfig.h" + #include "menus.h" +diff -Naur setup-0.3.1.orig/debug.h setup-0.3.1/debug.h +--- setup-0.3.1.orig/debug.h 2006-03-11 18:26:42.908352250 +0100 ++++ setup-0.3.1/debug.h 2006-03-11 18:31:04.176680500 +0100 +@@ -31,6 +31,6 @@ + #define DEBUG7(p1, p2, p3, p4, p5, p6, p7) esyslog(p1, p2, p3, p4, p5, p6, p7) + + #endif +-#define DBG_PREFIX "ERROR: Minivdr-Setup" ++#define DBG_PREFIX "ERROR: Gentoo-VDR-Setup" + + #endif /* DEBUG_H */ +diff -Naur setup-0.3.1.orig/getVdrSetupMenu.pl setup-0.3.1/getVdrSetupMenu.pl +--- setup-0.3.1.orig/getVdrSetupMenu.pl 2006-03-11 18:26:42.912352500 +0100 ++++ setup-0.3.1/getVdrSetupMenu.pl 2006-03-11 18:32:11.248872250 +0100 +@@ -35,6 +35,7 @@ + if (/^\s*#include/) + { + #printf(OUTPUT $_); ++ s-"(.*)"--; + push @headers, $_; + } + if (/^\s*class\s+\w+MenuSetupBase/) +diff -Naur setup-0.3.1.orig/i18n.cpp setup-0.3.1/i18n.cpp +--- setup-0.3.1.orig/i18n.cpp 2006-03-11 18:26:42.912352500 +0100 ++++ setup-0.3.1/i18n.cpp 2006-03-11 18:33:13.488762000 +0100 +@@ -12,8 +12,8 @@ + + const tI18nPhrase Phrases[] = { + { +- "Setup - designed for minivdr.de (c)", +- "Setup - designed for minivdr.de (c)", ++ "Setup - VDR", ++ "Setup - VDR", + "", + "", + "", +@@ -643,8 +643,8 @@ + }, + + { +- "missing channels/*.conf", +- "fehlende channels/*.conf", ++ "missing channels.d/*.conf", ++ "fehlende channels.d/*.conf", + "", + "", + "", +diff -Naur setup-0.3.1.orig/Makefile setup-0.3.1/Makefile +--- setup-0.3.1.orig/Makefile 2006-03-11 18:26:42.948354750 +0100 ++++ setup-0.3.1/Makefile 2006-03-11 18:34:34.861847500 +0100 +@@ -84,9 +84,9 @@ + $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ + @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + +-setupsystemmenu.cpp: ../../../menu.c ++setupsystemmenu.cpp: /usr/share/vdr/setup/menu.c + @echo "Extracting class definitions from VDR's menu.c for standard Setup" +- @./getVdrSetupMenu.pl ../../../menu.c ++ @./getVdrSetupMenu.pl /usr/share/vdr/setup/menu.c + + + dist: clean +diff -Naur setup-0.3.1.orig/MANUAL.DE setup-0.3.1/MANUAL.DE +--- setup-0.3.1.orig/MANUAL.DE 2006-03-11 18:26:42.924353250 +0100 ++++ setup-0.3.1/MANUAL.DE 2006-03-11 18:35:32.901474750 +0100 +@@ -206,7 +206,7 @@ + werden in Form von "*" angezeigt. + channellist + setup Erlaubt die Auswahl von vordefinierten Kanallisten. Die +- Kanallisten müssen in den Verzeichnis /plugins/channels ++ Kanallisten müssen in den Verzeichnis /plugins/channels.d + mit der Endung *.conf abgelegt werden. Das Setup-Plugin linkt + dann die ausgewählte Kanalliste nach /channels.conf + networkdriver" +diff -Naur setup-0.3.1.orig/menus.cpp setup-0.3.1/menus.cpp +--- setup-0.3.1.orig/menus.cpp 2006-03-11 18:26:42.908352250 +0100 ++++ setup-0.3.1/menus.cpp 2006-03-11 18:37:43.905662000 +0100 +@@ -840,7 +840,7 @@ + *tmp = '\0'; + + asprintf(&channelFile, "%s/channels.conf",channelDir); +- asprintf(&channelDir, "%s/channels",channelDir); ++ asprintf(&channelDir, "%s/channels.d",channelDir); + + + if( (dirFP = opendir(channelDir))!= NULL) +diff -Naur setup-0.3.1.orig/menus.h setup-0.3.1/menus.h +--- setup-0.3.1.orig/menus.h 2006-03-11 18:26:42.912352500 +0100 ++++ setup-0.3.1/menus.h 2006-03-11 18:38:27.136363750 +0100 +@@ -13,7 +13,7 @@ + #define MENUS_H + #include + #include "util.h" +-#include "tinystr.h" ++#include "vdr/tinystr.h" + #include "sysconfig.h" + + +diff -Naur setup-0.3.1.orig/setup.cpp setup-0.3.1/setup.cpp +--- setup-0.3.1.orig/setup.cpp 2006-03-11 18:26:42.924353250 +0100 ++++ setup-0.3.1/setup.cpp 2006-03-11 18:44:35.183365250 +0100 +@@ -15,8 +15,8 @@ + #include "i18n.h" + + static const char *VERSION = "0.3.1"; +-static const char *DESCRIPTION = "Minivdr-Setup"; +-static const char *MAINMENUENTRY = "Minivdr-Setup"; ++static const char *DESCRIPTION = "Gentoo-VDR-Setup"; ++static const char *MAINMENUENTRY = "Gentoo-VDR-Setup"; + + //holds setup configuration + cSetupSetup setupSetup; +diff -Naur setup-0.3.1.orig/setupmenu.cpp setup-0.3.1/setupmenu.cpp +--- setup-0.3.1.orig/setupmenu.cpp 2006-03-11 18:26:42.924353250 +0100 ++++ setup-0.3.1/setupmenu.cpp 2006-03-11 18:47:33.110485000 +0100 +@@ -537,7 +537,7 @@ + if( e->GetNrOfSelectionValues() == 0 ) + { + char *txt=NULL; +- asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels/*.conf")); ++ asprintf(&txt, "%s:\t%s", nohk(e->GetName()),tr("missing channels.d/*.conf")); + Add(new cOsdItem (txt)); + free(txt); + } +@@ -699,13 +699,13 @@ + //############################################################################################# + + +-cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - designed for minivdr.de (c)")) ++cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - Gentoo-VDR")) + { + char *configFile=NULL; + + SetCols(20); + +- asprintf(&configFile, "%s/setup/minivdr-setup.xml", cPlugin::ConfigDirectory()); ++ asprintf(&configFile, "%s/setup/vdr-setup.xml", cPlugin::ConfigDirectory()); + _config = new Config( configFile ); + free(configFile); + diff --git a/media-plugins/vdr-setup/files/vdr-setup-0.3.1-timers.diff b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-timers.diff new file mode 100644 index 000000000000..fc65b1e52e1d --- /dev/null +++ b/media-plugins/vdr-setup/files/vdr-setup-0.3.1-timers.diff @@ -0,0 +1,11 @@ +taken from http://www.vdr-portal.de/board/thread.php?threadid=46753 + +--- util.cpp.old 2006-03-06 20:16:41.000000000 +0100 ++++ util.cpp 2006-03-08 20:17:06.000000000 +0100 +@@ -319,6 +319,7 @@ + if( tim->Channel() != NULL) + Timers.Add(tim); + } ++ Timers.SetModified(); + myTimers.Clear(); + } diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild new file mode 100644 index 000000000000..a7513a3b66f8 --- /dev/null +++ b/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/vdr-setup-0.3.1.ebuild,v 1.1 2006/03/11 20:35:57 hd_brummy Exp $ + +inherit vdr-plugin + +DESCRIPTION="Video Disk Recorder Plugin - Create Submenus, Configure VDR on OSD" +HOMEPAGE="http://www.vdrtools.de/vdrsetup.html" +SRC_URI="http://www.vdrtools.de/download/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" + +DEPEND=">=media-video/vdr-1.3.44" + +S=${WORKDIR}/setup-${PV} + +PATCHES="${FILESDIR}/${P}-*.diff" + +pkg_setup() { + vdr-plugin_pkg_setup + + if [[ ! -f /usr/include/vdr/submenu.h ]] || [[ ! -f /usr/share/vdr/setup/menu.c ]]; then + echo + eerror "Patched VDR needed" + echo + einfo "reemerge VDR with USE=\"setup-plugin\" " && die "unpack failed, patched VDR needed" + fi +} + +src_install() { + vdr-plugin_src_install + + keepdir /etc/vdr/channels.d + + insinto /var/vdr + newins ${S}/Examples/sysconfig sysconfig-setup + fowners vdr:vdr /var/vdr/sysconfig-setup + + insinto /etc/vdr/plugins/setup + doins ${FILESDIR}/vdr-setup.xml + + insinto /etc/vdr/plugins/setup/help + doins ${S}/Examples/help/*.hlp + + chown -R vdr:vdr ${D}/etc/vdr + + dodoc MANUAL.DE Examples/*.xml +} + +pkg_preinst() { + + if [[ ! -L ${ROOT}/etc/vdr/channels.conf ]]; then + cp ${ROOT}/etc/vdr/channels.conf ${IMAGE}/etc/vdr/channels.d/channels.conf.bak + cp ${ROOT}/etc/vdr/channels.conf ${IMAGE}/etc/vdr/channels.d/channels.conf + fowners vdr:vdr /etc/vdr/channels.d/{channels.conf,channels.conf.bak} + fi +} + +pkg_postinst() { + vdr-plugin_pkg_postinst + + echo + einfo "Edit /etc/vdr/plugins/setup/*" + echo + ewarn "Setup-Plugin will change the path of your channels.conf" + einfo "You will find a backup copy on /etc/vdr/channels/channels.conf.bak" + echo +}