hello world

3 files changed, 253 insertions, 0 deletions

diff --git a/plugins/freecell/patches/p1/freecell-0.0.2-1.5.4.diff b/plugins/freecell/patches/p1/freecell-0.0.2-1.5.4.diff
new file mode 100644
index 0000000..18c2673
--- /dev/null
+++ b/plugins/freecell/patches/p1/freecell-0.0.2-1.5.4.diff
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_freecell-0.0.2-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
+## http://toms-cafe.de/vdr/download/freecell-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@
+--- freecell-0.0.2/tools/list.h
++++ freecell-0.0.2/tools/list.h
+@@ -523,7 +523,7 @@
+ 	return neu;
+ }
+ 
+-typedef class cTBList<cTBString> cStringList;
++//typedef class cTBList<cTBString> cStringList;
+ typedef class cTBList<void*> cPtrList;
+ 
+ // Special Overrides for String lists
diff --git a/plugins/freecell/patches/p1/freecell-0.0.2.diff b/plugins/freecell/patches/p1/freecell-0.0.2.diff
new file mode 100644
index 0000000..ea9c0b0
--- /dev/null
+++ b/plugins/freecell/patches/p1/freecell-0.0.2.diff
@@ -0,0 +1,174 @@
+diff -Nru freecell-0.0.2/cards.c freecell-0.0.2-n/cards.c
+--- freecell-0.0.2/cards.c	2004-08-14 14:02:55.000000000 +0200
++++ freecell-0.0.2-n/cards.c	2006-11-05 03:24:28.000000000 +0100
+@@ -52,7 +52,11 @@
+ 	mX = X;
+ 	mY = Y;
+ 	mStacked = Stacked;
++#if VDRVERSNUM >= 10318
++	mSeed = cTimeMs::Now();
++#else
+ 	mSeed = time_ms();
++#endif
+ }
+ 
+ cCardStack::~cCardStack() {
+diff -Nru freecell-0.0.2/Makefile freecell-0.0.2-n/Makefile
+--- freecell-0.0.2/Makefile	2004-03-21 01:54:39.000000000 +0100
++++ freecell-0.0.2-n/Makefile	2006-11-05 03:24:28.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,7 @@
+ 	DEFINES  += -DTOOLBOX_DEBUG -DDEBUG
+ 	CXXFLAGS += -g
+ else
+-	CXXFLAGS += -O2
++	CXXFLAGS += -fPIC -O2
+ endif
+ 
+ ### Implicit rules:
+@@ -77,7 +77,7 @@
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+diff -Nru freecell-0.0.2/tools/list.h freecell-0.0.2-n/tools/list.h
+--- freecell-0.0.2/tools/list.h	2004-02-11 13:33:26.000000000 +0100
++++ freecell-0.0.2-n/tools/list.h	2006-11-05 03:24:28.000000000 +0100
+@@ -90,22 +90,22 @@
+ 	T &SetNextCurrent  ();
+ 	T &SetPrevCurrent  ();
+ 
+-	friend cTBList<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
+-	friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
++//	friend cTBList<T> &operator+= <> (cTBList<T> &list1, const cTBList<T> &list2);
++//	friend cTBList<T> &operator+= <> (cTBList<T> &list, const T &element);
+ 
+-	friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
+-	friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
+-	friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
++//	friend cTBList<T> operator+ <> (const cTBList<T> &list1, const cTBList<T> &list2);
++//	friend cTBList<T> operator+ <> (const T &element, const cTBList<T> &list);
++//	friend cTBList<T> operator+ <> (const cTBList<T> &list, const T &element);
+ 
+ 	/*friend cSource &operator<< <> (cSource &dest, const cTBList<T> &list);
+-	friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
++//	friend cSource &operator>> <> (cSource &dest, cTBList<T> &list);*/
+ };
+ 
+ // Template Implementation (inline funcs)
+ 
+ template<class T>
+ inline int cTBList<T>::Find (const T & i) {
+-	cTBList<T>::cItem *item = m_First;
++	typename cTBList<T>::cItem *item = m_First;
+ 	int index = 0;
+ 
+ 	while (item && (item->Data != i)) {
+@@ -203,7 +203,7 @@
+ 
+ template<class T>
+ typename cTBList<T>::cItem *cTBList<T>::NewItem (cTBList<T>::cItem *pBefore, cTBList<T>::cItem *pAfter) const {
+-	cTBList<T>::cItem *item = new cTBList<T>::cItem;
++	typename cTBList<T>::cItem *item = new typename cTBList<T>::cItem;
+ 
+ 	item->Next = pAfter;
+ 	item->Prev = pBefore;
+@@ -235,7 +235,7 @@
+ 	if ((int)idx == m_CurPos)
+ 		return m_Current;
+ 
+-	cTBList<T>::cItem *item;
++	typename cTBList<T>::cItem *item;
+ 	int dist = idx - m_CurPos;
+ 	bool direct;
+ 
+@@ -271,7 +271,7 @@
+ 
+ template<class T>
+ T &cTBList<T>::Prepend () {
+-	cTBList<T>::cItem *item = NewItem(NULL, m_First);
++	typename cTBList<T>::cItem *item = NewItem(NULL, m_First);
+ 
+ 	m_First = m_Current = item;
+ 	if (!m_Last)
+@@ -285,7 +285,7 @@
+ 
+ template<class T>
+ T &cTBList<T>::Append () {
+-	cTBList<T>::cItem *item = NewItem(m_Last, NULL);
++	typename cTBList<T>::cItem *item = NewItem(m_Last, NULL);
+ 
+ 	m_Last = m_Current = item;
+ 	if (!m_First)
+@@ -317,13 +317,13 @@
+ 		return true;
+ 	}
+ 
+-	cTBList<T>::cItem *nextItem = Locate(idx);
++	typename cTBList<T>::cItem *nextItem = Locate(idx);
+ 	if (!nextItem)
+ 		return false;
+ 
+-	cTBList<T>::cItem *prevItem = nextItem->Prev;
++	typename cTBList<T>::cItem *prevItem = nextItem->Prev;
+ 
+-	cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
++	typename cTBList<T>::cItem *item = NewItem(prevItem, nextItem);
+ 	item->Data = i;
+ 
+ 	m_CurPos = idx;
+@@ -338,7 +338,7 @@
+ 	if (!m_Current)
+ 		return NULL;
+ 
+-	cTBList<T>::cItem *item = m_Current;
++	typename cTBList<T>::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<T>::cItem *item = Unlink();
++	typename cTBList<T>::cItem *item = Unlink();
+ 	if (!item)
+ 		return false;
+ 
+@@ -383,7 +383,7 @@
+ 	if (!Locate(idx))
+ 		return false;
+ 
+-	cTBList<T>::cItem *item = Unlink();
++	typename cTBList<T>::cItem *item = Unlink();
+ 	if (!item)
+ 		return false;
+ 
+@@ -412,13 +412,13 @@
+ 
+ template<class T>
+ void cTBList<T>::Clear () {
+-	cTBList<T>::cItem *item = m_First;
++	typename cTBList<T>::cItem *item = m_First;
+ 
+ 	m_First = m_Last = m_Current = NULL;
+ 	m_Count = 0;
+ 	m_CurPos = -1;
+ 
+-	cTBList<T>::cItem *Prev;
++	typename cTBList<T>::cItem *Prev;
+ 	while (item) {
+ 		Prev = item;
+ 		item = item->Next;
diff --git a/plugins/freecell/plugin.sh b/plugins/freecell/plugin.sh
new file mode 100644
index 0000000..9afc68d
--- /dev/null
+++ b/plugins/freecell/plugin.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis)
+# von Marc Wernecke - www.zulu-entertainment.de
+# 05.05.2008
+#
+# vdr-freecell
+
+# defaults
+source ./../../x-vdr.conf
+source ./../../setup.conf
+source ./../../functions
+
+WEB="http://vdr-wiki.de/vdr/vdr-freecell/vdr-freecell-0.0.2.tgz"
+VERSION="freecell-0.0.2"
+LINK="freecell"
+
+VAR=`basename $WEB`
+DIR=`pwd`
+
+# plugin entfernen
+function clean_plugin() {
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -rf $LINK*
+  rm -f $VDRLIBDIR/libvdr-$LINK*
+  rm -rf $VDRCONFDIR/plugins/freecell
+  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 ##
+  if [ -d $DIR/freecell ]; then
+    cp -fR $DIR/freecell $VDRCONFDIR/plugins
+  else
+    cp -fR $SOURCEDIR/VDR/PLUGINS/src/$LINK/freecell $VDRCONFDIR/plugins
+  fi
+  # rechte setzen
+  chown -R $VDRUSER:$VDRGROUP $VDRCONFDIR/plugins/freecell
+  ## 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