+++ /dev/null
-# ChangeLog for media-plugins/vdr-setup
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.31 2014/02/23 20:48:32 hd_brummy Exp $
-
- 23 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
- -vdr-setup-0.3.1-r1.ebuild, -vdr-setup-0.3.1-r4.ebuild:
- cleanup old
-
- 16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> vdr-setup-0.3.1-r5.ebuild:
- Stable for x86, wrt bug #441388
-
- 08 Dec 2012; <ago@gentoo.org> vdr-setup-0.3.1-r5.ebuild:
- Stable for amd64, wrt bug #441388
-
-*vdr-setup-0.3.1-r5 (23 Sep 2012)
-
- 23 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
- +vdr-setup-0.3.1-r5.ebuild:
- removed i18n handling, only english language is now available on OSD, see bug
- 414177 414915
-
- 16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1-r4.ebuild:
- stable x86 amd64
-
- 24 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1-r4.ebuild:
- keyworded ~arm
-
-*vdr-setup-0.3.1-r4 (23 Oct 2011)
-
- 23 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
- +vdr-setup-0.3.1-r4.ebuild, +files/090-vdr-setup-0.3.1_extern-tinyxml.diff:
- use now externel tinyxml lib, keyword ~arm droped
-
- 22 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1-r1.ebuild:
- keyworded ~arm
-
- 03 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdr-menu.de.xml,
- files/vdr-menu.en.xml:
- added tag to .xml file, fix for missing entry in OSD; thx to Fugee @ IRC
- gentoo-vdr
-
- 22 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1-r1.ebuild:
- Stable amd64; eapi=2, removed use-flag diffrents for old vdr version
-
- 12 Jan 2008; Matthias Schwarzott <zzam@gentoo.org>
- -vdr-setup-0.3.1.ebuild, vdr-setup-0.3.1-r1.ebuild:
- Removed old ebuild. Fixed quoting.
-
- 11 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>
- vdr-setup-0.3.1-r1.ebuild:
- Improved error message for unpatched vdr.
-
- 21 Oct 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1-r1.ebuild:
- fixed message for needed use-flag on diffrent vdr version
-
- 11 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
- vdr-setup-0.3.1-r1.ebuild:
- Marked stable on x86.
-
-*vdr-setup-0.3.1-r1 (30 Jul 2007)
-
- 30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> +files/vdr-menu.de.xml,
- +files/vdr-menu.en.xml, +files/vdr-setup.en.xml,
- +vdr-setup-0.3.1-r1.ebuild:
- Added partly translated vdr-setup file, moved vdr-menu.xml from vdr to here.
- Try to guess language for conf-files from LINGUAS, Bug #183863.
-
- 30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
- +files/vdr-setup.de.xml, -files/vdr-setup.xml, vdr-setup-0.3.1.ebuild:
- Renamed setup-file inside FILESDIR.
-
- 29 Jul 2007; Joseph Jezak <josejx@gentoo.org> vdr-setup-0.3.1.ebuild:
- Marked ~ppc for zzam.
-
- 01 Apr 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- files/vdr-setup-0.3.1-vdr-1.5.0.diff:
- txpo in 1.5.1 diff fixed
-
- 25 Mar 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- +files/vdr-setup-0.3.1-vdr-1.5.0.diff:
- patch added; ready for VDR 1.5.x
-
- 05 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-setup-0.3.1.ebuild:
- einfo converted to elog
-
- 30 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
- Marked stable on x86.
-
- 30 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
- -files/vdr-setup-0.2.3-gentoo.diff, -vdr-setup-0.2.3.ebuild:
- Cleanup of older ebuilds.
-
- 05 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
- +files/vdr-setup-0.3.1-gcc-4.x.diff:
- added patch to fix compile problems on gcc-4.x
-
- 15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
- Assigned to Gentoo VDR Project.
-
- 15 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
- Do not grep nonexisting file in check for vdr-support.
-
- 21 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
- changed depend - works with vdr-1.3.36
-
- 15 Mar 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-setup-0.3.1.ebuild:
- modified check for patched version to not be confused when vdr is patched
- without setup-plugin but with submenu
-
- 13 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
- +files/vdr-setup-0.3.1-lang.diff, vdr-setup-0.3.1.ebuild:
- language fix added; added more info, error fixes, setup handling in postinst
-
-*vdr-setup-0.3.1 (11 Mar 2006)
-
- 11 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
- +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 <hd_brummy@gentoo.org> files/vdr-setup.xml,
- vdr-setup-0.2.3.ebuild:
- changed to use pgk_preinst, comment and warnig by use channellist in
- vdr-setup.xml
-
-*vdr-setup-0.2.3 (05 Feb 2006)
-
- 05 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
- +files/vdr-setup-0.2.3-gentoo.diff, +files/vdr-setup.xml, +metadata.xml,
- +vdr-setup-0.2.3.ebuild:
- initial ebuild, written by zzam and myself
+++ /dev/null
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 090-vdr-setup-0.3.1_extern-tinyxml.diff 3496 SHA256 09b098f0769eb7572539de9a9372a694713dafa78773c176399f4e47c670da92 SHA512 aa1ef2f9e89f18da8ba76db985cd9dad57291ae79b0f8c4bfdc267241aaa7a5c4f0f08e76eb20d0866b5b4713978a97b1990f0ac6959ab5064d2f22e53bd5587 WHIRLPOOL 4c649001666c39873b20d44bb7b4bcc090872065065d891e3a93c9446ea67c4bbad40883fb1584d6ba131636c1ce00848be6cf265f726eb9d72ef0062f55b115
-AUX vdr-menu.de.xml 2908 SHA256 2ad476894cac88bbcf085927e2be26c39fbe94f79a99c3e3edc5abfe9cc0720c SHA512 2d7807401589869c08f87b2362d65b01371de9859551e5060fe66add2ff951798c470618dcf506c37081ff3937744452921143aee86eaf274ff48236b54feee2 WHIRLPOOL 2c4793b7eb2f4060ed5e7034cff1fb5672aea19be60e58acfdd24bfe9102001f82da5b32f0413babf2d05460fb4df360c2ecbf45cf64ad420abd1dd82fb3bd55
-AUX vdr-menu.en.xml 2913 SHA256 59c34d547a943d7056a050c6cca42f5dcc235475ea815918af1f3cb17172bd8b SHA512 b67d2031a68b70519eec3fdfac7d4850be91ff4f741083e3458da3209a8d922808822b5232f913bea2281392099c8933f6b7901b8d35741e340ae36516869bf3 WHIRLPOOL ac374d82b013d65a818eae2c021f413b6d4646626a63419aee4cac7a3c4d11686bb818bfdccefb97f3fe83faa6cab1ee644d7de69a1a5333fd9b3ed7ce25cbf9
-AUX vdr-setup-0.3.1-gcc-4.x.diff 2560 SHA256 fe8595e8965977f0df4aa1816607eb2f824bd5b8c72c5d885efd26b22eae8b88 SHA512 b4f9eb689d41c88417879a15f0157fa6e1e2d69c514c090dd0d7eb5c0fedf34d46cd5fc1d3bfcfe6e3c75c2fadbd5362bdc2ea0a5d2ff812cdf91374df21fa95 WHIRLPOOL 3311aef161c7f95ef923242f03bf72e8b67570e3dc0fb99dd952538170d3422744eb1eb21cd0e37b93c82bb8e4418920cd386eb2a17967570adb930fbe96fa8a
-AUX vdr-setup-0.3.1-gentoo.diff 6469 SHA256 d705d996f2375b00e1ddbdc3e56ac5db73310491adbc6657c7760d2e397d81b9 SHA512 7a7725aedbcaaa5239e462c074fe76d9b73fa29b04419fec279e1afd30be392b762e5ea7b2db42df37fabfc97ba678dd3fbc484914028bd1a57cbaab48a3d430 WHIRLPOOL e813331c0d89250c72232318efdddbf25016aa8d9b50f5a2b8645578bf4f2171295f9063cd91940284eba6d89818a7dd882176b2ec32f6a0c08c3d55a34d40a7
-AUX vdr-setup-0.3.1-lang.diff 6546 SHA256 d0beebd8e3512f453fd54e4acda3a3eeacf2d968c27f2430834bd415489ff151 SHA512 a5e809ef48497af03a91a0df6476d5ab1a9e4f569dfcdd231f369fb0f4d8a2eddfa428f21bdef04997ac500c1029f7aac15126c6e7d339c1c48b8b31a9eb454f WHIRLPOOL fd9272f812a4232264201d9bb421d3d44f0607e7c5fb67088e66b1451941fd2536c834efaaaf63a30c3905c5672a3e6d4b4a32526ce213cdcc4ca0a628cd2b1d
-AUX vdr-setup-0.3.1-timers.diff 312 SHA256 58e98fd4677aaf80d02082cb9353592ffc445a96e71d9e580cbede5943fa78c0 SHA512 ef05b870509a3f071df8f8c1f8ca9d4abc0ec04dbcd848d7b63ea51e34b3fccf91daac9f4e5e4c20090a6bee7a6300e746763df5ba4260d2c367a1220e74031f WHIRLPOOL 5319a06d10103d41261377acff622ce185517db342de32c972c7c0fa117825c52ff05f9f5e581926287d41e27a3ea1f180ad2a938368d4eb2614b5eba7dfb3d6
-AUX vdr-setup-0.3.1-vdr-1.5.0.diff 1418 SHA256 d31b9ab9dcf0086c53519d31abf82404d59ed34c76079d5bf402bbbfc8c30e41 SHA512 d1a02e8b47c1ce7fbe1843fb028079265b3ad0d6b83118e1161029391fcef21447f9cfb4cc931f711d21670b7a93facc4dcfa64d84001c6686de0451ab45d17d WHIRLPOOL 45510ef46db9a9765c42602c3fc6a3d91022ab8ee0c7dbfedf7ca328c5b0546fe024d1e0cb304c38421722d578897de7a39a9a56a623852b81cab57b9713c2ff
-AUX vdr-setup.de.xml 8338 SHA256 5860b6d6d4a4cc2756bd5fe8fcc02172e39db523d06717f24edb0aeb498dc0cb SHA512 830e2b339f8fe6c69ec4d4f19c1eea16d69150afe20efd4279b9a09dcf61c3c2627b095f93e893ccd2f7ffadb6db16c7901ae2f258b6a25d9fbeec574e3dac29 WHIRLPOOL 94718ef1ad2b24c537a62a5a636d963316feb51b9df6d59291049902c46bd3317678b2d0ad36b63f79f91144fa7b799bad8ec2953419e4a5072c0da94ac1ab60
-AUX vdr-setup.en.xml 8328 SHA256 496a5ddf8b5f47dd1592cf73f108d7dc7504a8c30c7f0049282572ef5321a0a5 SHA512 a4def712297072a9ac63bef1d7dd1fd19db78087cbb714cf558fd1e4535edfc9612c7681f179a26c1b82f8089fe92ce76f8a02a92e2a7fd846ce2cd418bac4ec WHIRLPOOL e6bad0f12a9a227f623bca07837799ab545c51bebcc98161ed83502bbba02dbca1905d34b71922940d39e79a1ecf9ccef11690b8b2751060d6fb62d18452ce6a
-DIST vdr-setup-0.3.1.tgz 89366 SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392 SHA512 255377832e6129cd221df43597becea59d45798d6c9ea342565be0a34e0c6f0c4c4813af845e164c2c9647cfc26de8b4d4dbdb4bb1d1793f355f132b84d5b575 WHIRLPOOL 5e41b73affa0acc6af291ade13c0347eef1c0cbd0a91c38128881be68dc50116f4a98308bb6c9d64296b131aa4a8e240f16806e2d4e360e92833c11d5c8d71f2
-EBUILD vdr-setup-0.3.1-r5.ebuild 2383 SHA256 0a089969f252d6bbc8edad5ad5b91688336c0cbbcf000e0f9d30a847e832ac9f SHA512 585cb565d5c7f977b7e47d89a1df46252de2ac972140e646354796b10c69426f0363c11f9b2653a684c013066c0ea144d1b010df94726afa65b7e9214d372c76 WHIRLPOOL 79108e1747608927bf345bcf7f457c228873f07c8f8b4152dc097db2423359e1f178a831ba9aafe761ab0945eed4182a67320f7055a10a834e99a157744617ff
-MISC ChangeLog 4904 SHA256 418d23fbe82a1c463a05ea70cf4237443eacf49f64fb94925c2f56fec9c97b0a SHA512 75414847362831341a4f1d1f673d6b6a2b0c4fc22fe7557dd338a19bb6db2c90e33e3034f16a2b91177a904594412538d3ab8005e3326ecabbf8f4c6f46d2a5b WHIRLPOOL 77695454248f187906ef235b43e8cce6b7bfce5afb17c0be9d0a0948836a479bb1589882aaa8aabee44111081dd34d61131d372f6eeb032166abc983b5778c51
-MISC metadata.xml 540 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233 SHA512 22635f01a515d78d79ee8d8f6aec50e6110ec49b76db3163d9a5585fba0a56caedf8dc6dd6d567c2c3f27bfde816fbd64b873319cd85d5d68fe0baefcf3609f5 WHIRLPOOL 1c7205248bb50ca5bfa03c60d6e404f26f7f87f04acf0ba8db7f21708aa4fd7f9ebea07222bfef8d08969970050295cb4883bf26c58716331f38b14063bd4b3f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFTCl6hdn07HTTCgIoRCAfQAJ97gZ7DTqOAP01oUApdSXrGhsCydgCff39P
-ehzNOTPdye2bDEkeXWMrxTE=
-=weDk
------END PGP SIGNATURE-----
+++ /dev/null
-diff -Naur setup-0.3.1.orig/config.cpp setup-0.3.1/config.cpp
---- setup-0.3.1.orig/config.cpp 2010-10-02 18:16:25.000000000 +0200
-+++ setup-0.3.1/config.cpp 2010-10-02 18:18:52.000000000 +0200
-@@ -13,7 +13,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include "vdr/plugin.h"
--#include "vdr/tinystr.h"
-+#include <tinystr.h>
- #include "config.h"
- #include "sysconfig.h"
- #include "plugins.h"
-diff -Naur setup-0.3.1.orig/config.h setup-0.3.1/config.h
---- setup-0.3.1.orig/config.h 2010-10-02 18:16:25.000000000 +0200
-+++ setup-0.3.1/config.h 2010-10-02 18:19:06.000000000 +0200
-@@ -11,7 +11,7 @@
-
- #ifndef CONFIG_H
- #define CONFIG_H
--#include "vdr/tinystr.h"
-+#include <tinystr.h>
- #include "plugins.h"
- #include "sysconfig.h"
- #include "menus.h"
-diff -Naur setup-0.3.1.orig/Makefile setup-0.3.1/Makefile
---- setup-0.3.1.orig/Makefile 2010-10-02 18:16:25.000000000 +0200
-+++ setup-0.3.1/Makefile 2010-10-02 18:18:21.000000000 +0200
-@@ -46,7 +46,9 @@
- INCLUDES += -I$(VDRDIR)
-
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVDRVERSION="\"$(VDRVERSION)\""
-+DEFINES += -DTIXML_USE_STL
-
-+LIBS += -ltinyxml
-
- ifdef BIGPATCH_INSTALLED
- DEFINES += -DBIGPATCH_INSTALLED
-@@ -81,7 +83,7 @@
-
-
- libvdr-$(PLUGIN).so: setupsystemmenu.cpp $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
- @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-
- setupsystemmenu.cpp: /usr/share/vdr/setup/menu.c
-diff -Naur setup-0.3.1.orig/menus.cpp setup-0.3.1/menus.cpp
---- setup-0.3.1.orig/menus.cpp 2010-10-02 18:16:25.000000000 +0200
-+++ setup-0.3.1/menus.cpp 2010-10-02 18:20:06.000000000 +0200
-@@ -344,11 +344,11 @@
- bool ok = true;
- TiXmlElement *elem = NULL;
-
-- if(xmlNode != NULL && xmlNode->Type() == TiXmlNode::ELEMENT)
-+ if(xmlNode != NULL && xmlNode->Type() == TiXmlNode::TINYXML_ELEMENT)
- {
- do
- {
-- if(xmlNode->Type() == TiXmlNode::ELEMENT)
-+ if(xmlNode->Type() == TiXmlNode::TINYXML_ELEMENT)
- {
- elem = xmlNode->ToElement ();
- if( strcmp(xmlNode->Value(), "menu")== 0)
-@@ -810,7 +810,7 @@
- }
- }
- else
-- if( node != NULL && node->Type() == TiXmlNode::ELEMENT)
-+ if( node != NULL && node->Type() == TiXmlNode::TINYXML_ELEMENT)
- {
- do
- {
-@@ -991,7 +991,7 @@
- bool ok = true;
- TiXmlElement *elem = NULL;
-
-- if(node != NULL && node->Type() == TiXmlNode::ELEMENT)
-+ if(node != NULL && node->Type() == TiXmlNode::TINYXML_ELEMENT)
- {
-
- elem = node->ToElement ();
-@@ -1183,11 +1183,11 @@
- {
- bool ok = true;
- TiXmlElement *elem = NULL;
-- if(node != NULL && node->Type() == TiXmlNode::ELEMENT && (node=node->FirstChild())!=NULL)
-+ if(node != NULL && node->Type() == TiXmlNode::TINYXML_ELEMENT && (node=node->FirstChild())!=NULL)
- {
- do
- {
-- if(node->Type() == TiXmlNode::ELEMENT && strcmp(node->Value(), "menu")== 0)
-+ if(node->Type() == TiXmlNode::TINYXML_ELEMENT && strcmp(node->Value(), "menu")== 0)
- {
- elem = node->ToElement ();
- const char* name = elem->Attribute("name");
-diff -Naur setup-0.3.1.orig/menus.h setup-0.3.1/menus.h
---- setup-0.3.1.orig/menus.h 2010-10-02 18:16:25.000000000 +0200
-+++ setup-0.3.1/menus.h 2010-10-02 18:20:42.000000000 +0200
-@@ -13,7 +13,7 @@
- #define MENUS_H
- #include <vdr/tools.h>
- #include "util.h"
--#include "vdr/tinystr.h"
-+#include <tinyxml.h>
- #include "sysconfig.h"
-
-
+++ /dev/null
-<!--
-- VDR Menu-Configuration File
--
--
-- Example:
--
- <menus>
- <system name="Schedule" />
- <system name="Channels" />
- <system name="Timers" />
- <system name="Recordings" />
- <menu name="System">
- <system name="Setup" />
- <system name="Commands" />
- <plugin name="setup" />
- <command name="myCommand1" execute="/usr/bin/mycommand1" />
- <command name="myCommand2" execute="/usr/bin/mycommand2" confirm="yes" />
- <plugin name="epgsearch" />
- <menu name="mySubSubMenu">
- ...
- </menu>
- </menu>
- <menu name="Suche">
- <plugin name="epgsearch" />
- ...
- </menu>
- </menus>
--->
-<menus>
- <system name="Schedule" />
- <system name="Channels" />
- <system name="Timers" />
- <system name="Recordings" />
- <menu name="Video/Audio">
- <plugin name="radio" />
- <plugin name="playlist" />
- <plugin name="mp3" />
- <plugin name="mp3ng" />
- <plugin name="mplayer" />
- <menu name="CD/DVD">
- <plugin name="burn" />
- <plugin name="dvdselect" />
- <plugin name="dvdswitch" />
- <plugin name="dvd" />
- <plugin name="vdrcd" />
- <plugin name="vcd" />
- </menu>
- <menu name="Bilder">
- <plugin name="image" />
- <plugin name="osdimage" />
- <plugin name="screenshot" />
- </menu>
- </menu>
- <menu name="Suche/Info">
- <plugin name="epgsearch" />
- <plugin name="pilot" />
- <plugin name="newsticker" />
- <plugin name="tvtv" />
- <plugin name="tvonscreen" />
- <plugin name="yaepg" />
- <plugin name="nordlichtsepg" />
- <plugin name="osdpip" />
- <plugin name="timeline" />
- <plugin name="osdteletext" />
- <plugin name="prefermenu" />
- <plugin name="director" />
- <plugin name="weatherng" />
- </menu>
- <menu name="Timer">
- <plugin name="autotimeredit" />
- <plugin name="xxvautotimer" />
- <plugin name="sleeptimer" />
- <plugin name="eggtimer" />
- </menu>
- <menu name="Spiele">
- <plugin name="games" />
- <plugin name="sudoku" />
- <plugin name="solitaire" />
- <plugin name="freecell" />
- </menu>
- <menu name="Sonstiges">
- <plugin name="clock" />
- <plugin name="vbox" />
- <plugin name="pim" />
- <plugin name="taste" />
- <plugin name="undelete" />
- </menu>
- <menu name="System">
- <plugin name="setup" />
- <systen name="Setup" />
- <system name="Commands" />
- <plugin name="vdrc" />
- <plugin name="text2skin" />
- <plugin name="graphlcd" />
- <plugin name="sysinfo" />
- <plugin name="console" />
- <plugin name="femon" />
- <plugin name="rotor" />
- <plugin name="streamdev-server" />
- </menu>
-</menus>
+++ /dev/null
-<!--
-- VDR Menu-Configuration File
--
--
-- Example:
--
- <menus>
- <system name="Schedule" />
- <system name="Channels" />
- <system name="Timers" />
- <system name="Recordings" />
- <menu name="System">
- <system name="Setup" />
- <system name="Commands" />
- <plugin name="setup" />
- <command name="myCommand1" execute="/usr/bin/mycommand1" />
- <command name="myCommand2" execute="/usr/bin/mycommand2" confirm="yes" />
- <plugin name="epgsearch" />
- <menu name="mySubSubMenu">
- ...
- </menu>
- </menu>
- <menu name="Search">
- <plugin name="epgsearch" />
- ...
- </menu>
- </menus>
--->
-<menus>
- <system name="Schedule" />
- <system name="Channels" />
- <system name="Timers" />
- <system name="Recordings" />
- <menu name="Video/Audio">
- <plugin name="radio" />
- <plugin name="playlist" />
- <plugin name="mp3" />
- <plugin name="mp3ng" />
- <plugin name="mplayer" />
- <menu name="CD/DVD">
- <plugin name="burn" />
- <plugin name="dvdselect" />
- <plugin name="dvdswitch" />
- <plugin name="dvd" />
- <plugin name="vdrcd" />
- <plugin name="vcd" />
- </menu>
- <menu name="Pictures">
- <plugin name="image" />
- <plugin name="osdimage" />
- <plugin name="screenshot" />
- </menu>
- </menu>
- <menu name="Search/Info">
- <plugin name="epgsearch" />
- <plugin name="pilot" />
- <plugin name="newsticker" />
- <plugin name="tvtv" />
- <plugin name="tvonscreen" />
- <plugin name="yaepg" />
- <plugin name="nordlichtsepg" />
- <plugin name="osdpip" />
- <plugin name="timeline" />
- <plugin name="osdteletext" />
- <plugin name="prefermenu" />
- <plugin name="director" />
- <plugin name="weatherng" />
- </menu>
- <menu name="Timer">
- <plugin name="autotimeredit" />
- <plugin name="xxvautotimer" />
- <plugin name="sleeptimer" />
- <plugin name="eggtimer" />
- </menu>
- <menu name="Games">
- <plugin name="games" />
- <plugin name="sudoku" />
- <plugin name="solitaire" />
- <plugin name="freecell" />
- </menu>
- <menu name="Other stuff">
- <plugin name="clock" />
- <plugin name="vbox" />
- <plugin name="pim" />
- <plugin name="taste" />
- <plugin name="undelete" />
- </menu>
- <menu name="System">
- <plugin name="setup" />
- <system name="Setup" />
- <system name="Commands" />
- <plugin name="vdrc" />
- <plugin name="text2skin" />
- <plugin name="graphlcd" />
- <plugin name="sysinfo" />
- <plugin name="console" />
- <plugin name="femon" />
- <plugin name="rotor" />
- <plugin name="streamdev-server" />
- </menu>
-</menus>
+++ /dev/null
-Patch will fix compile problems with gcc-4.1.1
-Joerg Bornkessel hd_brummy@gentoo.org
-05 Sep 2006
-
-written with help of LordJaxom
-
-diff -Naur setup-0.3.1.orig/menus.h setup-0.3.1/menus.h
---- setup-0.3.1.orig/menus.h 2006-09-05 20:35:37.941397850 +0200
-+++ setup-0.3.1/menus.h 2006-09-05 20:39:08.866579848 +0200
-@@ -101,7 +101,7 @@
- public:
- MenuEntryValueList();
- ~MenuEntryValueList();
-- MenuEntryValueList const &MenuEntryValueList::operator =(MenuEntryValueList const &right );
-+ MenuEntryValueList const &operator =(MenuEntryValueList const &right );
- void copy(MenuEntryValueList const &other);
- void destroy();
- void Add(const char *value);
-@@ -132,9 +132,9 @@
- MenuEntry();
- ~MenuEntry();
- void destroy();
-- bool MenuEntry::AddEntry( TiXmlNode *node );
-- bool MenuEntry::AddSubEntry( TiXmlNode *node );
-- bool MenuEntry::AddSelectionValues( TiXmlNode *node, const char *selection);
-+ bool AddEntry( TiXmlNode *node );
-+ bool AddSubEntry( TiXmlNode *node );
-+ bool AddSelectionValues( TiXmlNode *node, const char *selection);
- TiXmlNode *SaveXml( );
- void SetSysconfigName(const char* nam);
- const char*GetSysconfigName();
-diff -Naur setup-0.3.1.orig/plugins.h setup-0.3.1/plugins.h
---- setup-0.3.1.orig/plugins.h 2006-09-05 20:35:37.953398599 +0200
-+++ setup-0.3.1/plugins.h 2006-09-05 20:36:53.458117352 +0200
-@@ -33,20 +33,20 @@
- bool operator< (Plugin ¶m);
- bool operator> (Plugin ¶m);
- void Print();
-- const char* Plugin::GetName();
-- const char* Plugin::GetInfo();
-- const char* Plugin::GetParameter();
-- void Plugin::SetName(const char* name);
-- void Plugin::SetInfo(const char* info);
-- void Plugin::SetParameter(const char* parameter);
-- void Plugin::SetActive(int flag);
-- void Plugin::SetProtect(bool protect);
-- int Plugin::GetActive();
-- int *Plugin::GetActiveRef();
-- void Plugin::SetInSystem(bool flag);
-- bool Plugin::GetInSystem();
-- bool Plugin::GetProtect();
-- const char* Plugin::GetActiveString();
-+ const char* GetName();
-+ const char* GetInfo();
-+ const char* GetParameter();
-+ void SetName(const char* name);
-+ void SetInfo(const char* info);
-+ void SetParameter(const char* parameter);
-+ void SetActive(int flag);
-+ void SetProtect(bool protect);
-+ int GetActive();
-+ int *GetActiveRef();
-+ void SetInSystem(bool flag);
-+ bool GetInSystem();
-+ bool GetProtect();
-+ const char* GetActiveString();
- };
-
- class Plugins : public cList<Plugin>
+++ /dev/null
-written by Joerg Bornkessel <hd_brumm@gentoo.org>
-
-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 <sys/types.h>
- #include <dirent.h>
- #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\
- - <plugins sysconfig=\"PLUGINLIST\">\n\
--- <plugin name=\"setup\" info=\"Minivdr-Setup\" active=\"yes\" />\n\
-+- <plugin name=\"setup\" info=\"Gentoo-VDR-Setup\" active=\"yes\" />\n\
- - <plugin name=\"vdrcd\" param=\"-c /dev/dvd -c /media/dvd -c /media/cdfs\" info=\"VDR CD\"/>\n\
- - ...\n\
- - </plugin>\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-"(.*)"-<vdr/\1>-;
- 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 <vdrdir>/plugins/channels
-+ Kanallisten müssen in den Verzeichnis <vdrdir>/plugins/channels.d
- mit der Endung *.conf abgelegt werden. Das Setup-Plugin linkt
- dann die ausgewählte Kanalliste nach <vdrdir>/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 <vdr/tools.h>
- #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);
-
+++ /dev/null
-diff -Naur setup-0.3.1-orig/i18n.cpp setup-0.3.1/i18n.cpp
---- setup-0.3.1-orig/i18n.cpp 2006-03-13 14:03:16.420823500 +0100
-+++ setup-0.3.1/i18n.cpp 2006-03-13 14:33:37.790652000 +0100
-@@ -12,24 +12,28 @@
-
- const tI18nPhrase Phrases[] = {
- {
-- "Setup - VDR",
-- "Setup - VDR",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-- "",
-+ "Setup - VDR", // English
-+ "Setup - VDR", // Deutsch
-+ "", // Slovenski
-+ "", // Italiano
-+ "", // Nederlands
-+ "", // Portugus
-+ "", //
-+ "", // Norsk
-+ "", // suomi
-+ "", // Polski
-+ "", //
-+ "", // // svenska
-+ "", // Romaneste
-+ "", // Magyar
-+ "", //
-+ "", // Catal`
-+ "", // Croatian
-+ "", // Eesti
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Activate Plugins",
-@@ -50,6 +54,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -71,6 +79,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "no",
-@@ -91,6 +103,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "yes",
-@@ -111,6 +127,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Move",
-@@ -131,6 +151,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Create",
-@@ -151,6 +175,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Edit",
-@@ -171,6 +199,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Create Menu",
-@@ -191,6 +223,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Edit Menu",
-@@ -211,6 +247,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Delete Menu?",
-@@ -231,6 +271,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "change menu name",
-@@ -251,6 +295,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Delete",
-@@ -271,6 +319,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -292,6 +344,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -313,6 +369,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "After",
-@@ -333,6 +393,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Into",
-@@ -353,6 +417,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "sort asc",
-@@ -373,6 +441,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "sort desc",
-@@ -393,6 +465,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -414,6 +490,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Plugins activate / deactivate",
-@@ -434,6 +514,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Save",
-@@ -454,6 +538,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Reboot",
-@@ -474,10 +562,14 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Restart VDR",
-- "Starte VDR",
-+ "Restarte VDR",
- "",
- "",
- "",
-@@ -494,6 +586,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "protected",
-@@ -514,6 +610,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -535,6 +635,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -556,11 +660,15 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
- "Error in configuration files",
-- "Fehler in MiniVDR-Konfigration",
-+ "Fehler in VDR-Konfigration",
- "",
- "",
- "",
-@@ -577,6 +685,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -598,6 +710,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -619,6 +735,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -640,6 +760,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -661,6 +785,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Execute",
-@@ -681,6 +809,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- // Standard VDR Setup pages:
-@@ -935,6 +1067,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -956,6 +1092,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
-
-@@ -978,6 +1118,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- {
-@@ -999,6 +1143,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Up/Dn for new location - color key to move",
-@@ -1019,6 +1167,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
- {
- "Help",
-@@ -1039,6 +1191,10 @@
- "",
- "",
- "",
-+ "", // Dansk
-+#if VDRVERSNUM >= 10342
-+ "", // Czech
-+#endif
- },
-
- { "Really restart?",
-@@ -1084,6 +1240,26 @@
- "Reboot?",
- "",
- },
--
-+{ "Setup - Gentoo-VDR",
-+ "Setup - Gentoo-VDR",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "Setup - Gentoo-VDR",
-+ "",
-+},
- { NULL }
- };
+++ /dev/null
-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();
- }
+++ /dev/null
-fix for shutdown up from vdr-1.5.x
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 25 Mar 2007
-diff -Naur setup-0.3.1.orig/setupmenu.cpp setup-0.3.1/setupmenu.cpp
---- setup-0.3.1.orig/setupmenu.cpp 2007-03-25 22:02:45.214194576 +0200
-+++ setup-0.3.1/setupmenu.cpp 2007-03-25 22:09:43.522111889 +0200
-@@ -11,6 +11,9 @@
-
- #include <stdlib.h>
- #include <vdr/menuitems.h>
-+#if APIVERSNUM > 10500
-+#include <vdr/shutdown.h>
-+#endif
- #include <string>
-
- #include "setupmenu.h"
-@@ -856,7 +859,11 @@
- case kYellow:
- if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?")))
- {
-+#if APIVERSNUM > 10500
-+ ShutdownHandler.RequestEmergencyExit();
-+#else
- cThread::EmergencyExit(true);
-+#endif
- return osEnd;
- }
- return osContinue;
-@@ -864,7 +871,11 @@
- case kBlue:
- if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really reboot?")))
- {
-+#if APIVERSNUM > 10500
-+ ShutdownHandler.RequestEmergencyExit();
-+#else
- cThread::EmergencyExit(true);
-+#endif
- system(_config->GetBootLinux());
- }
- return osContinue;
+++ /dev/null
-<!--
- - Mini-VDR Configuration File
- - (c) Ralf Dotzert
- -
- -
- - Example:
- -
- - <setup sysconfigFile="/etc/sysconfig">
- - bootLinux="/sbin/reboot"
- - VDRlibDir="/usr/lib/vdr/plugins"
- - <plugins sysconfig="PLUGINLIST">
- - <plugin name="setup" info="Minivdr-Setup" active="yes" />
- - <plugin name="vdrcd" param="-c /dev/dvd -c /media/dvd -c /media/cdfs" info="VDR CD"/>
- - ...
- - </plugin>
- - <menus>
- - <menu name="VDR-Einstellungen">
- - <menu name="Edit VDR-Menü" system="VDRMenu" help1="VDR Menü bearbeiten" />
- - <menu name="OSD" system="OSD" help1="Einstellungen zum On Screen Display" />
- - <menu name="EPG" system="EPG" />
- - <menu name="DVB" system="DVB" />
- - <menu name="LNB" system="LNB" />
- - <menu name="CICAM" system="CICAM" />
- - <menu name="Aufnahme" system="Record" />
- - <menu name="Wiedergabe" system="Replay" />
- - <menu name="Sonstiges" system="Misc" />
- - <menu name="Plugins-Setup" system="Plugins" />
- - <menu name="Aktiviere Plugins" system="ActPlugins" />
- - <menu name="BigPatch-Setup" system="BigPatch" /> -- Wenn der Bigpatch angwendet wurde --
- - <menu name="LiveBuffer-Setup" system="LiveBuffer" /> -- Wenn der LiveBuffer-Patch angewendet wurde --
- - </menu>
- - <menu name="Netzwerk" help1="Netzwerkeinstellungen" command="/etc/init.d/network restart">
- - <entry name="Benutze DHCP" sysconfig="USE_DHCP" type="bool" value="true" command="/etc/init.d/network restart/>
- - <entry name="IP-Adresse" sysconfig="IP" type="text" value="192.168.0.111" />
- - ...
- - </menu>
- - <menu name="Sonstiges">
- - <entry name="Ramddisk im MB" sysconfig="RAMDISK" type="number" value="16" />
- - <menu name="SubMenu">
- - <entry ... />
- - </menu>
- - </menu>
- - </menus>
- -</setup>
--->
-<setup sysconfigFile="/var/vdr/sysconfig-setup" bootLinux="/sbin/reboot" VDRlibDir="/usr/lib/vdr/plugins">
- <plugins sysconfig="PLUGINLIST">
- <plugin name="alcd" info="Activy300 LCD Display" active="no" />
- <plugin name="lcdproc" info="Alphanummerische Displays" active="no" />
- <plugin name="vbox" info="Anrufbeantworter Plugin" active="yes" />
- <plugin name="rotor" info="Ansteuerung Rotor" active="yes" />
- <plugin name="femon" info="Anzeige Signalstärke/Qualität" active="yes" />
- <plugin name="vdrcd" param="-c /dev/dvd -c /media/dvd -c /media/cdfs" info="AutoPlay Funktion" active="yes" />
- <plugin name="autotimeredit" param="-f /etc/vdradmin/vdradmind.at -p" info="Autotimer-Edit" active="yes" />
- <plugin name="prefermenu" info="Bevorzugte Kanäle" active="yes" />
- <plugin name="osdpip" info="Bild in Bild" active="yes" />
- <plugin name="image" param="-C /usr/bin/imageplugin.sh -m /usr/bin/mount.sh" info="Bildbetrachter Plugin" active="yes" />
- <plugin name="osdimage" param="--directory /video0/media/photos/vdr" info="Bildern über OSD" active="yes" />
- <plugin name="burn" param="-D /dev/sr0 -d /video0 -i /video0/convert/dvd/" info="Brennt Filme auf DVD" active="yes" />
- <plugin name="remote" info="DVB Karten Fernbedienung" active="no" protected="yes" />
- <plugin name="dvdselect" info="DVD Laufwerke einhängen" active="yes" />
- <plugin name="dvd" info="DVD Spieler Plugin" active="yes" />
- <plugin name="freecell" info="Das Kartenspiel Freecell" active="yes" />
- <plugin name="osddemo" info="Demo On-Screen-Display" active="no" />
- <plugin name="tvonscreen" param="-v /etc/vdradmin/vdradmind.at" info="EPG Programmzeitschrift" active="yes" />
- <plugin name="epgsearch" info="EPG zeigt Wiederholungen" active="yes" />
- <plugin name="hello" info="Ein 'hello' Plugin" active="no" />
- <plugin name="screenshot" info="Erstellt Screenshots" active="yes" />
- <plugin name="graphlcd" param="-d ks0108" info="GraphLCD" active="yes" />
- <plugin name="graphtft" param="-d /dev/fb0" info="GraphTFT" active="no" />
- <plugin name="radio" info="Hintergrundbild für Radiosender" active="yes" />
- <plugin name="chanorg" info="Kanäle sortieren" active="yes" />
- <plugin name="solitaire" info="Kartenspiel Solitaire" active="yes" />
- <plugin name="vdrc" info="Linux Commander OSD" active="yes" />
- <plugin name="setup" info="Minivdr-Setup" active="yes" protected="yes" />
- <plugin name="sky" info="Mpeg2 Encoder Plugin" active="yes" />
- <plugin name="newsticker" info="Newsticker" active="yes" />
- <plugin name="status" info="Osd-Status" active="no" />
- <plugin name="pim" info="PIM-Kalender Plugin" active="yes" />
- <plugin name="channelscan" info="Sender Suchlauf" active="yes" />
- <plugin name="taste" info="Sendungen-Keywords sperren" active="yes" />
- <plugin name="sleeptimer" info="Shutdown" active="yes" />
- <plugin name="mlcd" info="Siemens Multitainer LC-Display" active="no" />
- <plugin name="text2skin" info="Skin-Plugin für VDR" active="yes" />
- <plugin name="mp3" info="Spielt MP3-Dateien ab" active="yes" />
- <plugin name="mplayer" info="Spielt diverse Videoformate" active="yes" />
- <plugin name="streamdev-client" info="Streaming Client" active="no" />
- <plugin name="streamdev-server" info="Streaming Server" active="yes" />
- <plugin name="sysinfo" info="Systeminformationen" active="yes" />
- <plugin name="osdteletext" info="Teletext Dekoder für das OSD" active="yes" />
- <plugin name="console" info="Textkonsole auf dem Fernseher" active="yes" />
- <plugin name="tvtv" info="TvTv im OSD" active="yes" />
- <plugin name="clock" info="Uhr" active="yes" />
- <plugin name="skincurses" info="VDR-Skin für Konsole" active="yes" />
- <plugin name="games" info="Verschiedene Spiele" active="yes" />
- <plugin name="playlist" info="Verw.von Playlisten" active="yes" />
- <plugin name="vcd" param="--vcd=/dev/dvd" info="VideoCD Plugin" active="yes" />
- <plugin name="yaepg" info="Weitere EPG-Ansicht" active="yes" />
- <plugin name="undelete" info="Wiederh. gelöschter Aufnahmen" active="yes" />
- <plugin name="pilot" info="Zapping Co-Pilot" active="yes" />
- <plugin name="director" info="Zeigt Multifeed Kanäle" active="yes" />
- <plugin name="timeline" info="Zeitleiste" active="yes" />
- <plugin name="admin" info="admin" active="no" />
- <plugin name="wapd" info="wapd" active="yes" />
- </plugins>
- <menus>
- <menu name="VDR-Einstellungen">
- <menu name="OSD" system="OSD" help1="Einstellungen zum On Screen Display" help2="setup_osd.hlp"/>
- <menu name="EPG" system="EPG" help1="Einstellungen zum Electronic Prgramming Guide" help2="setup_epg.hlp"/>
- <menu name="DVB" system="DVB" help1="Einstellungen zur DVB-Karte" help2="setup_dvb.hlp"/>
- <menu name="LNB" system="LNB" help2="setup_lnb.hlp"/>
- <menu name="CICAM" system="CICAM" help2="setup_cicam.hlp"/>
- <menu name="Aufnahme" system="Record" help2="setup_record.hlp"/>
- <menu name="Wiedergabe" system="Replay" help2="setup_replay.hlp"/>
- <menu name="Sonstiges" system="Misc" help2="setup_misc.hlp"/>
- <menu name="Plugins-Setup" system="Plugins" help1="Plugins konfigurieren"/>
- <menu name="LiveBuffer" system="LiveBuffer" />
- <menu name="BigPatch" system="BigPatch" />
- </menu>
- <menu name="Sonstiges">
- <menu name="Edit VDR-Menü" system="VDRMenu" help1="VDR Menü bearbeiten" help2="setup_editmenu.hlp"/>
-<!-- - Warning! On use the Entry Channellist; by switch between diffrent Channellist, seted Timer will be distroyed
- - to use the entry, remove the comment signs on beginning and end of line -->
-<!-- <entry name="Kanalliste" sysconfig="CHANNELLIST" type="selection" setup="channellist" value="DVB-s_MiniVDR" /> -->
- </menu>
- <menu name="Kindersicherung">
- <entry name="Geheimcode (0000=AUS)" sysconfig="CHILDLOCK" type="numtext" setup="childlock" value="0000" />
- </menu>
- </menus>
-</setup>
+++ /dev/null
-<!--
- - Mini-VDR Configuration File
- - (c) Ralf Dotzert
- -
- -
- - Example:
- -
- - <setup sysconfigFile="/etc/sysconfig">
- - bootLinux="/sbin/reboot"
- - VDRlibDir="/usr/lib/vdr/plugins"
- - <plugins sysconfig="PLUGINLIST">
- - <plugin name="setup" info="Minivdr-Setup" active="yes" />
- - <plugin name="vdrcd" param="-c /dev/dvd -c /media/dvd -c /media/cdfs" info="VDR CD"/>
- - ...
- - </plugin>
- - <menus>
- - <menu name="VDR-Einstellungen">
- - <menu name="Edit VDR-Menü" system="VDRMenu" help1="VDR Menü bearbeiten" />
- - <menu name="OSD" system="OSD" help1="Einstellungen zum On Screen Display" />
- - <menu name="EPG" system="EPG" />
- - <menu name="DVB" system="DVB" />
- - <menu name="LNB" system="LNB" />
- - <menu name="CICAM" system="CICAM" />
- - <menu name="Aufnahme" system="Record" />
- - <menu name="Wiedergabe" system="Replay" />
- - <menu name="Sonstiges" system="Misc" />
- - <menu name="Plugins-Setup" system="Plugins" />
- - <menu name="Aktiviere Plugins" system="ActPlugins" />
- - <menu name="BigPatch-Setup" system="BigPatch" /> -- Wenn der Bigpatch angwendet wurde --
- - <menu name="LiveBuffer-Setup" system="LiveBuffer" /> -- Wenn der LiveBuffer-Patch angewendet wurde --
- - </menu>
- - <menu name="Netzwerk" help1="Netzwerkeinstellungen" command="/etc/init.d/network restart">
- - <entry name="Benutze DHCP" sysconfig="USE_DHCP" type="bool" value="true" command="/etc/init.d/network restart/>
- - <entry name="IP-Adresse" sysconfig="IP" type="text" value="192.168.0.111" />
- - ...
- - </menu>
- - <menu name="Sonstiges">
- - <entry name="Ramddisk im MB" sysconfig="RAMDISK" type="number" value="16" />
- - <menu name="SubMenu">
- - <entry ... />
- - </menu>
- - </menu>
- - </menus>
- -</setup>
--->
-<setup sysconfigFile="/var/vdr/sysconfig-setup" bootLinux="/sbin/reboot" VDRlibDir="/usr/lib/vdr/plugins">
- <plugins sysconfig="PLUGINLIST">
- <plugin name="alcd" info="Activy300 LCD Display" active="no" />
- <plugin name="lcdproc" info="Alphanummerische Displays" active="no" />
- <plugin name="vbox" info="Anrufbeantworter Plugin" active="yes" />
- <plugin name="rotor" info="Ansteuerung Rotor" active="yes" />
- <plugin name="femon" info="Anzeige Signalstärke/Qualität" active="yes" />
- <plugin name="vdrcd" param="-c /dev/dvd -c /media/dvd -c /media/cdfs" info="AutoPlay Funktion" active="yes" />
- <plugin name="autotimeredit" param="-f /etc/vdradmin/vdradmind.at -p" info="Autotimer-Edit" active="yes" />
- <plugin name="prefermenu" info="Bevorzugte Kanäle" active="yes" />
- <plugin name="osdpip" info="Bild in Bild" active="yes" />
- <plugin name="image" param="-C /usr/bin/imageplugin.sh -m /usr/bin/mount.sh" info="Bildbetrachter Plugin" active="yes" />
- <plugin name="osdimage" param="--directory /video0/media/photos/vdr" info="Bildern über OSD" active="yes" />
- <plugin name="burn" param="-D /dev/sr0 -d /video0 -i /video0/convert/dvd/" info="Brennt Filme auf DVD" active="yes" />
- <plugin name="remote" info="DVB Karten Fernbedienung" active="no" protected="yes" />
- <plugin name="dvdselect" info="DVD Laufwerke einhängen" active="yes" />
- <plugin name="dvd" info="DVD Spieler Plugin" active="yes" />
- <plugin name="freecell" info="Das Kartenspiel Freecell" active="yes" />
- <plugin name="osddemo" info="Demo On-Screen-Display" active="no" />
- <plugin name="tvonscreen" param="-v /etc/vdradmin/vdradmind.at" info="EPG Programmzeitschrift" active="yes" />
- <plugin name="epgsearch" info="EPG zeigt Wiederholungen" active="yes" />
- <plugin name="hello" info="Ein 'hello' Plugin" active="no" />
- <plugin name="screenshot" info="Erstellt Screenshots" active="yes" />
- <plugin name="graphlcd" param="-d ks0108" info="GraphLCD" active="yes" />
- <plugin name="graphtft" param="-d /dev/fb0" info="GraphTFT" active="no" />
- <plugin name="radio" info="Hintergrundbild für Radiosender" active="yes" />
- <plugin name="chanorg" info="Kanäle sortieren" active="yes" />
- <plugin name="solitaire" info="Kartenspiel Solitaire" active="yes" />
- <plugin name="vdrc" info="Linux Commander OSD" active="yes" />
- <plugin name="setup" info="Minivdr-Setup" active="yes" protected="yes" />
- <plugin name="sky" info="Mpeg2 Encoder Plugin" active="yes" />
- <plugin name="newsticker" info="Newsticker" active="yes" />
- <plugin name="status" info="Osd-Status" active="no" />
- <plugin name="pim" info="PIM-Kalender Plugin" active="yes" />
- <plugin name="channelscan" info="Sender Suchlauf" active="yes" />
- <plugin name="taste" info="Sendungen-Keywords sperren" active="yes" />
- <plugin name="sleeptimer" info="Shutdown" active="yes" />
- <plugin name="mlcd" info="Siemens Multitainer LC-Display" active="no" />
- <plugin name="text2skin" info="Skin-Plugin für VDR" active="yes" />
- <plugin name="mp3" info="Spielt MP3-Dateien ab" active="yes" />
- <plugin name="mplayer" info="Spielt diverse Videoformate" active="yes" />
- <plugin name="streamdev-client" info="Streaming Client" active="no" />
- <plugin name="streamdev-server" info="Streaming Server" active="yes" />
- <plugin name="sysinfo" info="Systeminformationen" active="yes" />
- <plugin name="osdteletext" info="Teletext Dekoder für das OSD" active="yes" />
- <plugin name="console" info="Textkonsole auf dem Fernseher" active="yes" />
- <plugin name="tvtv" info="TvTv im OSD" active="yes" />
- <plugin name="clock" info="Uhr" active="yes" />
- <plugin name="skincurses" info="VDR-Skin für Konsole" active="yes" />
- <plugin name="games" info="Verschiedene Spiele" active="yes" />
- <plugin name="playlist" info="Verw.von Playlisten" active="yes" />
- <plugin name="vcd" param="--vcd=/dev/dvd" info="VideoCD Plugin" active="yes" />
- <plugin name="yaepg" info="Weitere EPG-Ansicht" active="yes" />
- <plugin name="undelete" info="Wiederh. gelöschter Aufnahmen" active="yes" />
- <plugin name="pilot" info="Zapping Co-Pilot" active="yes" />
- <plugin name="director" info="Zeigt Multifeed Kanäle" active="yes" />
- <plugin name="timeline" info="Zeitleiste" active="yes" />
- <plugin name="admin" info="admin" active="no" />
- <plugin name="wapd" info="wapd" active="yes" />
- </plugins>
- <menus>
- <menu name="VDR-Settings">
- <menu name="OSD" system="OSD" help1="Einstellungen zum On Screen Display" help2="setup_osd.hlp"/>
- <menu name="EPG" system="EPG" help1="Einstellungen zum Electronic Prgramming Guide" help2="setup_epg.hlp"/>
- <menu name="DVB" system="DVB" help1="Einstellungen zur DVB-Karte" help2="setup_dvb.hlp"/>
- <menu name="LNB" system="LNB" help2="setup_lnb.hlp"/>
- <menu name="CICAM" system="CICAM" help2="setup_cicam.hlp"/>
- <menu name="Aufnahme" system="Record" help2="setup_record.hlp"/>
- <menu name="Wiedergabe" system="Replay" help2="setup_replay.hlp"/>
- <menu name="Sonstiges" system="Misc" help2="setup_misc.hlp"/>
- <menu name="Plugins-Setup" system="Plugins" help1="Plugins konfigurieren"/>
- <menu name="LiveBuffer" system="LiveBuffer" />
- <menu name="BigPatch" system="BigPatch" />
- </menu>
- <menu name="Others">
- <menu name="Edit VDR-Menu" system="VDRMenu" help1="changing VDR Menu" help2="setup_editmenu.hlp"/>
-<!-- - Warning! On use the Entry Channellist; by switch between diffrent Channellist, seted Timer will be distroyed
- - to use the entry, remove the comment signs on beginning and end of line -->
-<!-- <entry name="Kanalliste" sysconfig="CHANNELLIST" type="selection" setup="channellist" value="DVB-s_MiniVDR" /> -->
- </menu>
- <menu name="Childprotection">
- <entry name="Geheimcode (0000=AUS)" sysconfig="CHILDLOCK" type="numtext" setup="childlock" value="0000" />
- </menu>
- </menus>
-</setup>
+++ /dev/null
-<?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>
- <description>
- Please contacts maintainer before you something change.
- </description>
- </maintainer>
- <longdescription lang="en">
- The "Setup Plugin" can be used to to setup all or most configuration parameters
- of VDR distributions via the OSD.
- </longdescription>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2012 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-r5.ebuild,v 1.3 2012/12/16 13:50:55 ago Exp $
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR 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="amd64 ~arm ~ppc x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0_p2-r7[setup]
- >=dev-libs/tinyxml-2.6.1[stl]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.x.diff"
- "${FILESDIR}/${P}-gentoo.diff"
- "${FILESDIR}/${P}-lang.diff"
- "${FILESDIR}/${P}-timers.diff"
- "${FILESDIR}/${P}-vdr-1.5.0.diff"
- "${FILESDIR}/090-${P}_extern-tinyxml.diff" )
-
-LANGS="en de"
-
-for X in ${LANGS}; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare(){
- vdr-plugin-2_src_prepare
-
- sed -e "s:#include \"i18n.h\"::" -i setup.cpp -i setupmenu.cpp -i i18n.cpp
- sed -e "s:RegisterI18n://RegisterI18n:" -i setup.cpp
-}
-
-src_install() {
- vdr-plugin-2_src_install
-
- keepdir /etc/vdr/channels.d
-
- insinto /var/vdr
- newins "${S}"/Examples/sysconfig sysconfig-setup
- fowners vdr:vdr /var/vdr/sysconfig-setup
-
- local lang
- use linguas_de && lang="de"
- [[ -z ${lang} ]] && lang="en"
-
- insinto /etc/vdr/plugins/setup
- newins "${FILESDIR}"/vdr-menu.${lang}.xml vdr-menu.xml
- newins "${FILESDIR}"/vdr-setup.${lang}.xml 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 "${D}"/etc/vdr/channels.d/channels.conf.bak
- cp "${ROOT}"/etc/vdr/channels.conf "${D}"/etc/vdr/channels.d/channels.conf
- fowners vdr:vdr /etc/vdr/channels.d/{channels.conf,channels.conf.bak}
- fi
-}
-
-pkg_postinst() {
- vdr-plugin-2_pkg_postinst
-
- echo
- elog "Edit /etc/vdr/plugins/setup/*"
- echo
- eerror "vdr-setup is very sensible on Error's in your setup.conf"
- elog "Best way to fix this: Stop (at first) VDR , move setup.conf to setup.conf.bak"
- elog "and let create VDR a new setup.conf on next Start automatically"
- echo
- ewarn "Setup-Plugin will change the path of your channels.conf"
- elog "You will find a backup copy on /etc/vdr/channels/channels.conf.bak"
- echo
-}
projects / gentoo.git / commitdiff