projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 37654d0)
use now externel tinyxml lib
authorJoerg Bornkessel <hd_brummy@gentoo.org>
Sun, 23 Oct 2011 15:56:35 +0000 (15:56 +0000)
committerJoerg Bornkessel <hd_brummy@gentoo.org>
Sun, 23 Oct 2011 15:56:35 +0000 (15:56 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux i686
RepoMan-Options: --force

media-plugins/vdr-dxr3/Manifest patch | blob | history
media-plugins/vdr-setup/ChangeLog patch | blob | history
media-plugins/vdr-setup/Manifest patch | blob | history
media-plugins/vdr-setup/files/090-vdr-setup-0.3.1_extern-tinyxml.diff [new file with mode: 0644] patch | blob
media-plugins/vdr-setup/vdr-setup-0.3.1-r4.ebuild [new file with mode: 0644] patch | blob

diff --git a/media-plugins/vdr-dxr3/Manifest b/media-plugins/vdr-dxr3/Manifest
index 1843638071efccdb0ee03cab88dfe1bbdb941b7f..3480a54b7c47b77a572d9187b30cc2fe647a7b48 100644 (file)
--- a/media-plugins/vdr-dxr3/Manifest
+++ b/media-plugins/vdr-dxr3/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX vdr-dxr3-0.2.8-ffmpeg-includes.diff 311 RMD160 eba61cf84c6133d054758f452b108dae795fe7d7 SHA1 48e1acf008344451e2b01a30bd3b3b8a05abc30f SHA256 80b0d5b022d5502ee2b865be246e31140abdf7995a1dde078b9a31e2508dce74
 DIST vdr-dxr3-0.2.10.tgz 76828 RMD160 61523bcb6060401714f82a04aed3e89f94fbefb3 SHA1 1d2b61619cc854f54e7146a5e83024da5ea02753 SHA256 d5068c62e16d8d55e71b003b4c58074837da47e7516215564d5c85b1ea0388c9
 DIST vdr-dxr3-0.2.12.tgz 104775 RMD160 bfeb97b89161fd94b3ff117165d202f2523ec7e8 SHA1 b85e6d1df46ca6d13515ba081361d23fbe04696e SHA256 8d5e65750d6ba451fd463e67082b639230517399f39d255344c437640e56fe60
+DIST vdr-dxr3-0.2.13.tgz 105613 RMD160 35ab2fed2cffb960858e3543e49912b1fb29b96d SHA1 a9b632accc2f55ebb3eb467abefd681030130379 SHA256 5337a6d2d6cc1361cc8fac78087a4a31831ceaf4202651e76ca8a27127f261da
 DIST vdr-dxr3-0.2.8.tgz 75649 RMD160 3ff53821b5a7d0abaf73c09f3a8833724b21e961 SHA1 13d7e3345b8038d3230b87e7c3cb5182a87733c3 SHA256 7f0f6c08f9c2d8a54e78b1acb0bc241488ecec0943d862ae277ce0e20a30d6ea
 EBUILD vdr-dxr3-0.2.10.ebuild 928 RMD160 fa378c4faa20422cf6febfa498c8b0389b618db0 SHA1 c235e5355a398ff9af11695754c85de14250075c SHA256 de3dfdab5792a79f2da58104159340d41da329080c919d3d545fedeb9e7d9924
 EBUILD vdr-dxr3-0.2.12.ebuild 1077 RMD160 4998a88752c222b9ffd7378d5ea4b9fd230793d7 SHA1 1cc72223f7770ac4238f55e2d7cb9e0df86cc58e SHA256 e87fe98ea362299b5e3e9407b01a3d48b9c60824921314997cfa83566c94afdd
+EBUILD vdr-dxr3-0.2.13.ebuild 966 RMD160 87c93648a0b2f2636cec072f060186eea997f35a SHA1 e345eb3b7e9c2a657fb24eeefa9d132ee7ff5c2e SHA256 b54e43358141f6c7d2a315b73a687393056f658cbe4f5ac939a2bef25b6a9e21
 EBUILD vdr-dxr3-0.2.8.ebuild 815 RMD160 6b9765f1b339f964dd276b2c56d227b1fea7537a SHA1 14b479b9e489a0f56739687b71ad2a4283a590b1 SHA256 418ceb6874d67291303c50bc59ecc851968ef1ee030653b878c4357b7d174e01
-MISC ChangeLog 3530 RMD160 682b4c361604680bc70e83cf5979d54b3f409bc9 SHA1 2871f471d536d7d491a79908cf588288fb9e4678 SHA256 c6c7f8489699c732bbc7739af0c0f35dcf56f0aca358e5b22777785f18ce987a
+MISC ChangeLog 3692 RMD160 349bbb700ab8c38eab0c6483f3640981ea183ce5 SHA1 235b2df033ab1ce673b962076fe3cf44ee9e1bbe SHA256 8c79245651b32d3a38b0dca2dd3918ca2abc585025984da36eb8e936b64efe93
 MISC metadata.xml 446 RMD160 ce4153392c311fbba39c47eaed69654dedc7984e SHA1 e573f0fe95c7fae4a6f3bc6f4310b30994221529 SHA256 90dd3564df473a32ef6cd8f3cf6223c0a90a064194102e5b74e79510199bf12c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQEcBAEBCAAGBQJNnKRdAAoJEMOx0zmdw4Z1noEIALiFfULHRLvLbMKJh8uORqfl
-NJAt3HATGsFjFA4eJVln7AxB68pBlIwi/HGjSQ+ZGdYtjwwho6Odxx+SZ1lpST61
-YQDvkorI3LcYnQaEhFM9FNXj8b15hl+SNgX7tkPE2lo7DYCmkMBkOZrU3ERZdhlF
-rpHGGnc7Xd4sU+BP/X/xIpu8mnryNycYgAvBcvAxMTa4rqX/DbMowTcmDwtW8H+E
-YZI3wKZsd6thvURouOfH9aw5Cq7R6Qxoh11FKxNBYG92e370CkNUqpnNXe6g9fpA
-5zg1icxox32Cto6l9kQ1iCwew5aqEJqaG1577LEvb2urzgBZAbJ3loXWGrbk50I=
-=sfSt
+iD8DBQFOpDnKdn07HTTCgIoRAqm8AJ4oVLVNOwnvzpbd+cF3UkVm+BEY/gCeO+oi
+tHiIjnC1g3HxY2ZShHv2A1Y=
+=iZbK
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-setup/ChangeLog b/media-plugins/vdr-setup/ChangeLog
index f1e241b859dfb831c1b9ffe21686288358adb8ee..3ce53cddfd526108969b00005e080e161774c2cd 100644 (file)
--- 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/Manifest b/media-plugins/vdr-setup/Manifest
index e1a58ea8bd441e9946152a07f3037e6a37e8080e..aa992003039e8765d06880e597e4135187f57810 100644 (file)
--- a/media-plugins/vdr-setup/Manifest
+++ b/media-plugins/vdr-setup/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 090-vdr-setup-0.3.1_extern-tinyxml.diff 3496 RMD160 e55150d7f81f92a6fc006d2dc08d5754952e810a SHA1 fe3ab6ee9edc96b69784a8a759d76e4162712e8e SHA256 09b098f0769eb7572539de9a9372a694713dafa78773c176399f4e47c670da92
 AUX vdr-menu.de.xml 2908 RMD160 3e5e24e7698053faf6ff4b2f307c7c7eae34c94d SHA1 18c5de2a41b718d6aebaa5fe8a0eb06425de4774 SHA256 2ad476894cac88bbcf085927e2be26c39fbe94f79a99c3e3edc5abfe9cc0720c
 AUX vdr-menu.en.xml 2913 RMD160 bed19f4cc91ff31a132c1e008361a12b1c195631 SHA1 2810aa412f5ce1d0c1e32b2ae3dffd66dfabbc8d SHA256 59c34d547a943d7056a050c6cca42f5dcc235475ea815918af1f3cb17172bd8b
 AUX vdr-setup-0.3.1-gcc-4.x.diff 2560 RMD160 1ef325019522d4ee5757ec5ffdc51239ca1b8427 SHA1 5de78950064149e9e94ec65acadc1321b273b22a SHA256 fe8595e8965977f0df4aa1816607eb2f824bd5b8c72c5d885efd26b22eae8b88
@@ -12,13 +13,14 @@ AUX vdr-setup.de.xml 8338 RMD160 63bb870b9eb21a207d6e5fca47613359b56e3cea SHA1 4
 AUX vdr-setup.en.xml 8328 RMD160 15eb50c71817ee93b2e453fa574f1ce8c4205c01 SHA1 eebebee4b43baa0c0f5b6b006a10dd87745c7668 SHA256 496a5ddf8b5f47dd1592cf73f108d7dc7504a8c30c7f0049282572ef5321a0a5
 DIST vdr-setup-0.3.1.tgz 89366 RMD160 81bc99b57669cff762aed4f452db4ddb67662c22 SHA1 301967f7876b9ec78326ca48c436a08146093540 SHA256 b44457c384a6fcf22baa24ae7cbeca3d8e23c9d93c7be5c1601dbca338828392
 EBUILD vdr-setup-0.3.1-r1.ebuild 2532 RMD160 ba24dda57dbdd167d7f78302f19af34a974af480 SHA1 31ed7596b089cfb48172e513320f61735d823eb9 SHA256 a933603fde300b28696020a25842efaa64b755d9f3d91855d36469d0b0c6db61
-MISC ChangeLog 3926 RMD160 7290610e7ec09a7c5b8009d16ebe372ca9b194ce SHA1 a9ccdf05ed53aa6210ee8d1fe5669657e1f24c38 SHA256 fe7a99e6085860978b56a89d1de8ebc93557f578750eff97020dd6de36fe4f00
+EBUILD vdr-setup-0.3.1-r4.ebuild 2205 RMD160 e36fc7e89f37c82f919b63658f04af64edf96952 SHA1 b18d206c30878b83d54d9c55eabc1e3396422ac1 SHA256 3717c112ac6601d1729060c78cdd619fd36f82d77bb6fd864a3a52e106174ff7
+MISC ChangeLog 4147 RMD160 486961ddbe4a9cfeaee1caf7482c9243ce4510a6 SHA1 1dcf8f58cd0b2943653833b87c72c7a85cd08d8b SHA256 31039736798c934905e832962329660a4d6d8a28af853ed1f4b998b471f8375c
 MISC metadata.xml 540 RMD160 cca198c4529623f25ab1009757673485c021c7da SHA1 586e6fd714fc530db6d4ca19cee2de28d19d9a38 SHA256 a9aa7b1d1b97ae4d5656042dbddab1cdfc9092b6acb94114a59eba5b44175233
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFOoxLndn07HTTCgIoRAtNcAJ4+Fevo/kkW4EmKVXV8LgDiVOHJUwCeOxQP
-QxsYga7BTi3Xe1Y0wzpnE0Y=
-=72Ho
+iD8DBQFOpDlMdn07HTTCgIoRAsReAJ9ImNxfGPu3JGTmY1TlqQ89w7gDiwCfWHYt
+/ovpsw08pFFlau3msfB0hEI=
+=Pom5
 -----END PGP SIGNATURE-----
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 (file)
index 0000000..ed29d6d
--- /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 (file)
index 0000000..c067afc
--- /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
+}
Unnamed repository; edit this file 'description' to name the repository.