use now externel tinyxml lib

(Portage version: 2.1.10.11/cvs/Linux i686, RepoMan options: --force)

3 files changed, 196 insertions, 1 deletions

diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index f1e241b859df..3ce53cddfd52 100644
--- a/media-plugins/vdr-setup/ChangeLog
+++ b/media-plugins/vdr-setup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-setup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.24 2011/10/22 19:00:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-setup/ChangeLog,v 1.25 2011/10/23 15:56:34 hd_brummy Exp $
+
+*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:
diff --git a/media-plugins/vdr-setup/files/090-vdr-setup-0.3.1_extern-tinyxml.diff b/media-plugins/vdr-setup/files/090-vdr-setup-0.3.1_extern-tinyxml.diff
new file mode 100644
index 000000000000..ed29d6de5f27
--- /dev/null
+++ b/media-plugins/vdr-setup/files/090-vdr-setup-0.3.1_extern-tinyxml.diff
@@ -0,0 +1,107 @@
+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"
+ 
+ 
diff --git a/media-plugins/vdr-setup/vdr-setup-0.3.1-r4.ebuild b/media-plugins/vdr-setup/vdr-setup-0.3.1-r4.ebuild
new file mode 100644
index 000000000000..c067afc5575b
--- /dev/null
+++ b/media-plugins/vdr-setup/vdr-setup-0.3.1-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 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-r4.ebuild,v 1.1 2011/10/23 15:56:34 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+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 ~x86 ~ppc"
+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_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
+
+	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_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
+}