From 0e7005fcc7483c01aa102fbea358c5ac65a48d62 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Apr 2010 16:13:08 +0200 Subject: hello world --- .../patches/p1/solitaire-0.0.2-1.5.4.diff | 19 +++ plugins/solitaire/patches/p1/solitaire-0.0.2.patch | 129 +++++++++++++++++++++ plugins/solitaire/plugin.sh | 54 +++++++++ 3 files changed, 202 insertions(+) create mode 100644 plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff create mode 100644 plugins/solitaire/patches/p1/solitaire-0.0.2.patch create mode 100644 plugins/solitaire/plugin.sh (limited to 'plugins/solitaire') diff --git a/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff b/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff new file mode 100644 index 0000000..f86ff6a --- /dev/null +++ b/plugins/solitaire/patches/p1/solitaire-0.0.2-1.5.4.diff @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 91_solitaire-0.0.2-1.5.4.dpatch by Thomas Günther +## http://toms-cafe.de/vdr/download/solitaire-0.0.2-1.5.4.diff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.4. + +@DPATCH@ +--- solitaire-0.0.2/tools/list.h ++++ solitaire-0.0.2/tools/list.h +@@ -523,7 +523,7 @@ + return neu; + } + +-typedef class cTBList cStringList; ++//typedef class cTBList cStringList; + typedef class cTBList cPtrList; + + // Special Overrides for String lists diff --git a/plugins/solitaire/patches/p1/solitaire-0.0.2.patch b/plugins/solitaire/patches/p1/solitaire-0.0.2.patch new file mode 100644 index 0000000..83db65b --- /dev/null +++ b/plugins/solitaire/patches/p1/solitaire-0.0.2.patch @@ -0,0 +1,129 @@ +diff -ruN solitaire-0.0.2.org/tools/list.h solitaire-0.0.2/tools/list.h +--- solitaire-0.0.2.org/tools/list.h 2004-08-24 00:49:04.000000000 +0200 ++++ solitaire-0.0.2/tools/list.h 2006-02-03 11:35:36.000000000 +0100 +@@ -90,22 +90,22 @@ + T &SetNextCurrent (); + T &SetPrevCurrent (); + +- friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); +- friend cTBList &operator+= <> (cTBList &list, const T &element); ++// friend cTBList &operator+= <> (cTBList &list1, const cTBList &list2); ++// friend cTBList &operator+= <> (cTBList &list, const T &element); + +- friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); +- friend cTBList operator+ <> (const T &element, const cTBList &list); +- friend cTBList operator+ <> (const cTBList &list, const T &element); ++// friend cTBList operator+ <> (const cTBList &list1, const cTBList &list2); ++// friend cTBList operator+ <> (const T &element, const cTBList &list); ++// friend cTBList operator+ <> (const cTBList &list, const T &element); + + /*friend cSource &operator<< <> (cSource &dest, const cTBList &list); +- friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ ++// friend cSource &operator>> <> (cSource &dest, cTBList &list);*/ + }; + + // Template Implementation (inline funcs) + + template + inline int cTBList::Find (const T & i) { +- cTBList::cItem *item = m_First; ++ typename cTBList::cItem *item = m_First; + int index = 0; + + while (item && (item->Data != i)) { +@@ -203,7 +203,7 @@ + + template + typename cTBList::cItem *cTBList::NewItem (cTBList::cItem *pBefore, cTBList::cItem *pAfter) const { +- cTBList::cItem *item = new cTBList::cItem; ++ typename cTBList::cItem *item = new typename cTBList::cItem; + + item->Next = pAfter; + item->Prev = pBefore; +@@ -235,7 +235,7 @@ + if ((int)idx == m_CurPos) + return m_Current; + +- cTBList::cItem *item; ++ typename cTBList::cItem *item; + int dist = idx - m_CurPos; + bool direct; + +@@ -271,7 +271,7 @@ + + template + T &cTBList::Prepend () { +- cTBList::cItem *item = NewItem(NULL, m_First); ++ typename cTBList::cItem *item = NewItem(NULL, m_First); + + m_First = m_Current = item; + if (!m_Last) +@@ -285,7 +285,7 @@ + + template + T &cTBList::Append () { +- cTBList::cItem *item = NewItem(m_Last, NULL); ++ typename cTBList::cItem *item = NewItem(m_Last, NULL); + + m_Last = m_Current = item; + if (!m_First) +@@ -317,13 +317,13 @@ + return true; + } + +- cTBList::cItem *nextItem = Locate(idx); ++ typename cTBList::cItem *nextItem = Locate(idx); + if (!nextItem) + return false; + +- cTBList::cItem *prevItem = nextItem->Prev; ++ typename cTBList::cItem *prevItem = nextItem->Prev; + +- cTBList::cItem *item = NewItem(prevItem, nextItem); ++ typename cTBList::cItem *item = NewItem(prevItem, nextItem); + item->Data = i; + + m_CurPos = idx; +@@ -338,7 +338,7 @@ + if (!m_Current) + return NULL; + +- cTBList::cItem *item = m_Current; ++ typename cTBList::cItem *item = m_Current; + if (item == m_First) { + if (m_First = item->Next) + m_First->Prev = NULL; +@@ -370,7 +370,7 @@ + if (Find(i) == -1) + return false; + +- cTBList::cItem *item = Unlink(); ++ typename cTBList::cItem *item = Unlink(); + if (!item) + return false; + +@@ -383,7 +383,7 @@ + if (!Locate(idx)) + return false; + +- cTBList::cItem *item = Unlink(); ++ typename cTBList::cItem *item = Unlink(); + if (!item) + return false; + +@@ -412,13 +412,13 @@ + + template + void cTBList::Clear () { +- cTBList::cItem *item = m_First; ++ typename cTBList::cItem *item = m_First; + + m_First = m_Last = m_Current = NULL; + m_Count = 0; + m_CurPos = -1; + +- cTBList::cItem *Prev; ++ typename cTBList::cItem *Prev; + while (item) { + Prev = item; + item = item->Next; diff --git a/plugins/solitaire/plugin.sh b/plugins/solitaire/plugin.sh new file mode 100644 index 0000000..cab142a --- /dev/null +++ b/plugins/solitaire/plugin.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis) +# von Marc Wernecke - www.zulu-entertainment.de +# 30.03.2006 +# +# vdr-solitaire + +# defaults +source ./../../x-vdr.conf +source ./../../setup.conf +source ./../../functions +WEB="http://vdr.bluox.org/download/vdr-solitaire/vdr-solitaire-0.0.2.tgz" +VERSION="solitaire-0.0.2" +LINK="solitaire" + +VAR=`basename $WEB` +DIR=`pwd` + +# plugin entfernen +function clean_plugin() { + cd $SOURCEDIR/VDR/PLUGINS/src + rm -rf $LINK* + rm -f $VDRLIBDIR/libvdr-$LINK* + log "cleaning $LINK" +} + +# plugin installieren +function install_plugin() { + download_plugin + extract_plugin + cd $SOURCEDIR/VDR/PLUGINS/src + rm -f $LINK + ln -vfs $VERSION $LINK + patch_plugin + patch_p1_plugin + + ## plugin specials - start ## + # karten kopieren + cp -R $SOURCEDIR/VDR/PLUGINS/src/solitaire/solitaire $VDRCONFDIR/plugins + chown -R $VDRUSER.$VDRGROUP $VDRCONFDIR/plugins/solitaire + ## plugin specials - ende ## +} + +# plugin commands +if [ $# \> 0 ]; then + cmd=$1 + cmd_plugin +else + install_plugin + log "install-plugin fuer $VERSION ist fertig" +fi + +exit 0 -- cgit v1.2.3