Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-audiorecorder/files: vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff rc-addon.sh
Date: Tue, 28 Dec 2010 18:44:34
Message-Id: 20101228184425.4A39C20054@flycatcher.gentoo.org
1 hd_brummy 10/12/28 18:44:25
2
3 Modified: rc-addon.sh
4 Added: vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff
5 Log:
6 use shared tinyxml lib now, see bug #349507; some minor fixes in source code
7
8 (Portage version: 2.1.9.24/cvs/Linux i686)
9
10 Revision Changes Path
11 1.2 media-plugins/vdr-audiorecorder/files/rc-addon.sh
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh?r1=1.1&r2=1.2
16
17 Index: rc-addon.sh
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- rc-addon.sh 5 Jul 2006 16:57:35 -0000 1.1
24 +++ rc-addon.sh 28 Dec 2010 18:44:25 -0000 1.2
25 @@ -1,4 +1,4 @@
26 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh,v 1.1 2006/07/05 16:57:35 zzam Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/files/rc-addon.sh,v 1.2 2010/12/28 18:44:25 hd_brummy Exp $
28 #
29 # rc-addon-script for plugin audiorecorder
30 #
31 @@ -8,5 +8,6 @@
32
33 plugin_pre_vdr_start() {
34 add_plugin_param "--recdir=${AUDIORECORDER_DIR}"
35 + add_plugin_param "--debug=0"
36 }
37
38
39
40
41 1.1 media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff?rev=1.1&content-type=text/plain
45
46 Index: vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff
47 ===================================================================
48 unbundle source included tinyxml, use now shared libs from dev-libs/tinyxml
49 bugs.gentoo.org #349507
50 Joerg bornkessel <hd_brummy@g.o> 2010 Dec 28
51
52 diff -Naur audiorecorder-0.1.0-pre14.orig/Makefile audiorecorder-0.1.0-pre14/Makefile
53 --- audiorecorder-0.1.0-pre14.orig/Makefile 2010-12-28 16:10:30.000000000 +0100
54 +++ audiorecorder-0.1.0-pre14/Makefile 2010-12-28 16:25:52.000000000 +0100
55 @@ -46,6 +46,8 @@
56
57 LIBS = $(shell taglib-config --libs)
58
59 +LIBS += -ltinyxml
60 +
61 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTIXML_USE_STL
62
63 ifdef AUDIORECORDER_DEVEL
64 @@ -68,7 +70,7 @@
65
66 ### The object files (add further files here):
67
68 -OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o tinyxml/tinyxml.o tinyxml/tinyxmlerror.o tinyxml/tinyxmlparser.o audiorecorder_i18n.o
69 +OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o audiorecorder_i18n.o
70
71 ### Implicit rules:
72
73 diff -Naur audiorecorder-0.1.0-pre14.orig/xml-base.c audiorecorder-0.1.0-pre14/xml-base.c
74 --- audiorecorder-0.1.0-pre14.orig/xml-base.c 2010-12-28 16:10:30.000000000 +0100
75 +++ audiorecorder-0.1.0-pre14/xml-base.c 2010-12-28 16:38:29.000000000 +0100
76 @@ -10,7 +10,7 @@
77
78
79 using namespace std;
80 -using namespace a_land;
81 +/*using namespace a_land; */
82
83 /* --- cXmlBase ------------------------------------------------------------- */
84
85 diff -Naur audiorecorder-0.1.0-pre14.orig/xml-base.h audiorecorder-0.1.0-pre14/xml-base.h
86 --- audiorecorder-0.1.0-pre14.orig/xml-base.h 2010-12-28 16:10:30.000000000 +0100
87 +++ audiorecorder-0.1.0-pre14/xml-base.h 2010-12-28 16:39:35.000000000 +0100
88 @@ -5,7 +5,7 @@
89 #ifndef __XML_BASE_H
90 #define __XML_BASE_H
91
92 -#include "tinyxml/tinyxml.h"
93 +#include <tinyxml.h>
94
95 #include <string>
96
97 @@ -13,8 +14,8 @@
98 private:
99 std::string path, root_element;
100
101 - a_land::TiXmlDocument *document;
102 - a_land::TiXmlElement *root;
103 + TiXmlDocument *document;
104 + TiXmlElement *root;
105 protected:
106 virtual ~cXmlBase();
107
108 @@ -25,11 +26,11 @@
109 bool load(const std::string &_path);
110 void clear(void);
111
112 - void add_subelement(a_land::TiXmlElement &main_element,
113 + void add_subelement(TiXmlElement &main_element,
114 const char *name, const std::string &text);
115
116 - a_land::TiXmlDocument *get_document(void) { return document; }
117 - a_land::TiXmlElement *get_root(void) { return root; }
118 + TiXmlDocument *get_document(void) { return document; }
119 + TiXmlElement *get_root(void) { return root; }
120 void set_root(void);
121 };
122
123 diff -Naur audiorecorder-0.1.0-pre14.orig/xml-cache.c audiorecorder-0.1.0-pre14/xml-cache.c
124 --- audiorecorder-0.1.0-pre14.orig/xml-cache.c 2010-12-28 16:10:30.000000000 +0100
125 +++ audiorecorder-0.1.0-pre14/xml-cache.c 2010-12-28 16:41:27.000000000 +0100
126 @@ -19,7 +19,7 @@
127
128
129 using namespace std;
130 -using namespace a_land;
131 +/*using namespace a_land; */
132
133 /* --- cXmlCache ------------------------------------------------------------ */
134
135 @@ -111,7 +111,7 @@
136 trackinfo.get_title().empty())
137 return;
138
139 - a_land::TiXmlElement track("track");
140 + TiXmlElement track("track");
141 track.SetAttribute("path", trackinfo.get_partial_path());
142 track.SetAttribute("date", trackinfo.get_date());
143 track.SetAttribute("time", trackinfo.get_time());
144 @@ -146,7 +146,7 @@
145
146 void cXmlCache::copy_to_objects(void)
147 {
148 - a_land::TiXmlElement *xml_track = get_root()->FirstChildElement("track");
149 + TiXmlElement *xml_track = get_root()->FirstChildElement("track");
150
151 while (xml_track) {
152 cTrackInfo trackinfo;
153 @@ -155,7 +155,7 @@
154
155 if (path.empty()) {
156 /* remove deleted files from the xml-cache */
157 - a_land::TiXmlElement *tmp = xml_track;
158 + TiXmlElement *tmp = xml_track;
159 xml_track = xml_track->NextSiblingElement("track");
160 get_root()->RemoveChild(tmp);
161
162 @@ -169,7 +169,7 @@
163 if (access(path.c_str(), F_OK) == -1) {
164 dsyslog("[audiorecorder]: copy %s : (%s, %s())", path.c_str(), __FILE__, __func__);
165 /* remove deleted files from the xml-cache */
166 - a_land::TiXmlElement *tmp = xml_track;
167 + TiXmlElement *tmp = xml_track;
168 xml_track = xml_track->NextSiblingElement("track");
169 get_root()->RemoveChild(tmp);
170
171 @@ -181,7 +181,7 @@
172 if (xml_track->Attribute("time"))
173 trackinfo.set_time(xml_track->Attribute("time"));
174
175 - for (a_land::TiXmlElement *element = xml_track->FirstChildElement();
176 + for (TiXmlElement *element = xml_track->FirstChildElement();
177 element; element = element->NextSiblingElement()) {
178 if (element->FirstChild() == NULL)
179 continue;
Report Message
Find on MARC Find on Google Groups