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-video/vdr/files: vdr-1.4.7-makefile-destdir.diff vdr-set-dumpable.diff vdr-add-svdrp-down-0.1.diff digest-vdr-1.4.7-r4 extensions-patch-32-plugin-link-error.diff vdr-1.4.7-makefile-install-header.diff
Date: Wed, 12 Sep 2007 08:38:48
Message-Id: E1IVNdJ-0002CO-IA@stork.gentoo.org
1 hd_brummy 07/09/12 08:31:37
2
3 Added: vdr-1.4.7-makefile-destdir.diff
4 vdr-set-dumpable.diff vdr-add-svdrp-down-0.1.diff
5 digest-vdr-1.4.7-r4
6 extensions-patch-32-plugin-link-error.diff
7 vdr-1.4.7-makefile-install-header.diff
8 Log:
9 versions bump; new patchset handling and a lot of new use-flags up from this version
10 (Portage version: 2.1.2.12)
11
12 Revision Changes Path
13 1.1 media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff?rev=1.1&content-type=text/plain
17
18 Index: vdr-1.4.7-makefile-destdir.diff
19 ===================================================================
20 Index: vdr-1.4.7/Makefile
21 ===================================================================
22 --- vdr-1.4.7.orig/Makefile
23 +++ vdr-1.4.7/Makefile
24 @@ -24,6 +24,7 @@ PLUGINDIR= ./PLUGINS
25 PLUGINLIBDIR= $(PLUGINDIR)/lib
26
27 VIDEODIR = /video
28 +CONFDIR = $(VIDEODIR)
29
30 DOXYGEN = /usr/bin/doxygen
31 DOXYFILE = Doxyfile
32 @@ -200,30 +201,31 @@ install: install-bin install-conf instal
33 # VDR binary:
34
35 install-bin: vdr
36 - @mkdir -p $(BINDIR)
37 - @cp --remove-destination vdr runvdr $(BINDIR)
38 + @mkdir -p $(DESTDIR)$(BINDIR)
39 + @cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)
40
41 # Configuration files:
42
43 install-conf:
44 - @if [ ! -d $(VIDEODIR) ]; then\
45 - mkdir -p $(VIDEODIR);\
46 - cp *.conf $(VIDEODIR);\
47 + @mkdir -p $(DESTDIR)$(VIDEODIR)
48 + @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
49 + mkdir -p $(DESTDIR)$(CONFDIR);\
50 + cp *.conf $(DESTDIR)$(CONFDIR);\
51 fi
52
53 # Documentation:
54
55 install-doc:
56 - @mkdir -p $(MANDIR)/man1
57 - @mkdir -p $(MANDIR)/man5
58 - @gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
59 - @gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
60 + @mkdir -p $(DESTDIR)$(MANDIR)/man1
61 + @mkdir -p $(DESTDIR)$(MANDIR)/man5
62 + @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
63 + @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
64
65 # Plugins:
66
67 install-plugins: plugins
68 - @mkdir -p $(PLUGINLIBDIR)
69 - @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
70 + @mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
71 + @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
72
73 # Source documentation:
74
75
76
77
78 1.1 media-video/vdr/files/vdr-set-dumpable.diff
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-set-dumpable.diff?rev=1.1&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-set-dumpable.diff?rev=1.1&content-type=text/plain
82
83 Index: vdr-set-dumpable.diff
84 ===================================================================
85 Patch by Matthias Schwarzott <zzam@g.o>
86
87 diff -ru vdr-1.4.3-vanilla/vdr.c vdr-1.4.3/vdr.c
88 --- vdr-1.4.3-vanilla/vdr.c 2006-10-12 18:04:50.000000000 +0200
89 +++ vdr-1.4.3/vdr.c 2006-10-12 18:05:41.000000000 +0200
90 @@ -103,8 +103,8 @@
91 fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
92 return false;
93 }
94 - if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
95 - fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
96 + if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
97 + esyslog("vdr: warning - cannot set dumpable: %s", strerror(errno));
98 // always non-fatal, and will not work with kernel < 2.6.13
99 }
100 }
101
102
103
104 1.4 media-video/vdr/files/vdr-add-svdrp-down-0.1.diff
105
106 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff?rev=1.4&view=markup
107 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff?rev=1.4&content-type=text/plain
108 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff?r1=1.3&r2=1.4
109
110
111
112
113 1.1 media-video/vdr/files/digest-vdr-1.4.7-r4
114
115 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/digest-vdr-1.4.7-r4?rev=1.1&view=markup
116 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/digest-vdr-1.4.7-r4?rev=1.1&content-type=text/plain
117
118 Index: digest-vdr-1.4.7-r4
119 ===================================================================
120 MD5 7888a22b1fa0c8bd7b5922c57c164cbe VDR-Extensions-Patch-32.tar.bz2 217019
121 RMD160 43ec5662a51885589ecc37594b3806342b8e1698 VDR-Extensions-Patch-32.tar.bz2 217019
122 SHA256 7d2caea7b47cc8eeb86b2539fea1dfeae1d0ec32d5162756f59c0ec6efb45ab1 VDR-Extensions-Patch-32.tar.bz2 217019
123 MD5 81be33a0edb93288ca3d235a04107ec4 vdr-1.4.7.tar.bz2 560888
124 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf vdr-1.4.7.tar.bz2 560888
125 SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464 vdr-1.4.7.tar.bz2 560888
126
127
128
129 1.1 media-video/vdr/files/extensions-patch-32-plugin-link-error.diff
130
131 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/extensions-patch-32-plugin-link-error.diff?rev=1.1&view=markup
132 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/extensions-patch-32-plugin-link-error.diff?rev=1.1&content-type=text/plain
133
134 Index: extensions-patch-32-plugin-link-error.diff
135 ===================================================================
136 --- vdr-1.4.7_extensions.diff 2007-06-24 12:12:15.000000000 +0200
137 +++ vdr-1.4.7_extensions-linking.diff 2007-07-05 12:51:06.000000000 +0200
138 @@ -7987,6 +7987,18 @@
139 dlls.Add(new cDll(buffer, Args));
140 free(buffer);
141 free(s);
142 +@@ -328,7 +336,11 @@ bool cPluginManager::LoadPlugins(bool Lo
143 + {
144 + for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
145 + if (!dll->Load(Log))
146 ++#ifdef USE_PLUGINMISSING
147 ++ ;
148 ++#else
149 + return false;
150 ++#endif /* PLUGINMISSING */
151 + }
152 + return true;
153 + }
154 diff -ruN vdr-1.4.7/rcontroller.c vdr-1.4.7-extensions/rcontroller.c
155 --- vdr-1.4.7/rcontroller.c 1970-01-01 01:00:00.000000000 +0100
156 +++ vdr-1.4.7-extensions/rcontroller.c 2007-06-24 12:25:13.000000000 +0200
157
158
159
160 1.1 media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff
161
162 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff?rev=1.1&view=markup
163 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff?rev=1.1&content-type=text/plain
164
165 Index: vdr-1.4.7-makefile-install-header.diff
166 ===================================================================
167 Index: vdr-1.4.7/Makefile
168 ===================================================================
169 --- vdr-1.4.7.orig/Makefile
170 +++ vdr-1.4.7/Makefile
171 @@ -19,6 +19,7 @@ MANDIR = /usr/local/man
172 BINDIR = /usr/local/bin
173 LIBS = -ljpeg -lpthread -ldl -lcap
174 INCLUDES =
175 +HEADERDIR = /usr/local/include
176
177 PLUGINDIR= ./PLUGINS
178 PLUGINLIBDIR= $(PLUGINDIR)/lib
179 @@ -196,7 +197,7 @@ clean-plugins:
180
181 # Install the files:
182
183 -install: install-bin install-conf install-doc install-plugins
184 +install: install-bin install-conf install-doc install-plugins install-header
185
186 # VDR binary:
187
188 @@ -227,6 +228,13 @@ install-plugins: plugins
189 @mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
190 @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
191
192 +# Header files:
193 +
194 +install-header:
195 + @mkdir -p $(DESTDIR)$(HEADERDIR)/vdr $(DESTDIR)$(HEADERDIR)/vdr/libsi
196 + @cp *.h Make.config $(DESTDIR)$(HEADERDIR)/vdr
197 + @cp libsi/*.h $(DESTDIR)$(HEADERDIR)/vdr/libsi
198 +
199 # Source documentation:
200
201 srcdoc:
202
203
204
205 --
206 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups