1 |
commit: af2c54704ac43a351c13a98c374822744833b4c6 |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 27 15:44:21 2019 +0000 |
4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 15:44:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2c5470 |
7 |
|
8 |
media-plugins/vdr-extrecmenu: compile fix vdr-2.4 |
9 |
|
10 |
to compile with vdr-2.4 we use a git snapshot |
11 |
moved to eapi 7 |
12 |
cleanup old |
13 |
|
14 |
Bug: https://bugs.gentoo.org/703964 |
15 |
Closes: https://bugs.gentoo.org/703964 |
16 |
Package-Manager: Portage-2.3.83, Repoman-2.3.18 |
17 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
18 |
|
19 |
media-plugins/vdr-extrecmenu/Manifest | 2 +- |
20 |
.../files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff | 167 --------------------- |
21 |
.../vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild | 59 -------- |
22 |
.../vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild | 42 ++++++ |
23 |
4 files changed, 43 insertions(+), 227 deletions(-) |
24 |
|
25 |
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest |
26 |
index 859df524036..711ce822c1c 100644 |
27 |
--- a/media-plugins/vdr-extrecmenu/Manifest |
28 |
+++ b/media-plugins/vdr-extrecmenu/Manifest |
29 |
@@ -1,3 +1,3 @@ |
30 |
DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f |
31 |
-DIST vdr-extrecmenu-1.2.2.tgz 734012 BLAKE2B 0598447cbcd8337f08722503743f8cfb38d8ea9533d0e4b4ea281ca6cc0cf6e9fbfc439ab1243b749007838b0640398a895715124382ca73abf8965c81762c8e SHA512 071fd3c1d44afe17081ff2cdd747555d4218cffa2fd101ffa9c77b81376114af829bf58ce2f70f74eb7eb1090699b6a85a8e7105e3bf748ee7e8cb39ebee4f3c |
32 |
+DIST vdr-extrecmenu-1.2.4-r1.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4 |
33 |
DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592 |
34 |
|
35 |
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff |
36 |
deleted file mode 100644 |
37 |
index b1f4d391a44..00000000000 |
38 |
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.2_vdr-2.1.2.diff |
39 |
+++ /dev/null |
40 |
@@ -1,167 +0,0 @@ |
41 |
-diff -Naur extrecmenu-1.2.2.orig/mymenueditrecording.c extrecmenu-1.2.2/mymenueditrecording.c |
42 |
---- extrecmenu-1.2.2.orig/mymenueditrecording.c 2013-10-23 13:14:38.010071212 +0200 |
43 |
-+++ extrecmenu-1.2.2/mymenueditrecording.c 2013-10-23 13:21:12.560096164 +0200 |
44 |
-@@ -76,7 +76,11 @@ |
45 |
- |
46 |
- if(isdir) |
47 |
- { |
48 |
-+#if APIVERSNUM > 20101 |
49 |
-+ if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),tmppath?"/":"",dirbase?dirbase:"",dirname)) |
50 |
-+#else |
51 |
- if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,tmppath?"/":"",dirbase?dirbase:"",dirname)) |
52 |
-+#endif |
53 |
- oldname=NULL; |
54 |
- } |
55 |
- else |
56 |
-@@ -84,7 +88,11 @@ |
57 |
- |
58 |
- if(oldname) |
59 |
- { |
60 |
-+#if APIVERSNUM > 20101 |
61 |
-+ if(-1==asprintf(&newname,"%s%s%s/%s%s",cVideoDirectory::Name(),tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/'))) |
62 |
-+#else |
63 |
- if(-1==asprintf(&newname,"%s%s%s/%s%s",VideoDirectory,tmppath?"/":"",tmppath?tmppath:"",tmpname,isdir?"":strrchr(recording->FileName(),'/'))) |
64 |
-+#endif |
65 |
- newname=NULL; |
66 |
- |
67 |
- if(newname) |
68 |
-@@ -305,7 +313,11 @@ |
69 |
- |
70 |
- if(dirname) |
71 |
- { |
72 |
-+#if APIVERSNUM > 20101 |
73 |
-+ if(-1==asprintf(&oldname,"%s%s%s/%s",cVideoDirectory::Name(),dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname)) |
74 |
-+#else |
75 |
- if(-1==asprintf(&oldname,"%s%s%s/%s",VideoDirectory,dirbase?"/":"",tmpdirbase?tmpdirbase:"",tmpdirname)) |
76 |
-+#endif |
77 |
- oldname=NULL; |
78 |
- } |
79 |
- else |
80 |
-@@ -357,7 +369,11 @@ |
81 |
- if(dir) |
82 |
- dir=ExchangeChars(dir,true); |
83 |
- |
84 |
-+#if APIVERSNUM > 20101 |
85 |
-+ if(-1==asprintf(&_newname,"%s%s%s%s",cVideoDirectory::Name(),dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/'))) |
86 |
-+#else |
87 |
- if(-1==asprintf(&_newname,"%s%s%s%s",VideoDirectory,dir?"/":"",dir?dir:"",strrchr(dirname?oldname:recording->FileName(),'/'))) |
88 |
-+#endif |
89 |
- _newname=NULL; |
90 |
- |
91 |
- if(_newname) |
92 |
-@@ -424,7 +440,11 @@ |
93 |
- { |
94 |
- if(!strncmp(oldname,rec->FileName(),strlen(oldname))) |
95 |
- { |
96 |
-+#if APIVERSNUM > 20101 |
97 |
-+ char *_buf=ExchangeChars(strdup(oldname+strlen(cVideoDirectory::Name())+1),false); |
98 |
-+#else |
99 |
- char *_buf=ExchangeChars(strdup(oldname+strlen(VideoDirectory)+1),false); |
100 |
-+#endif |
101 |
- |
102 |
- if(strcmp(rec->Name(),_buf)) |
103 |
- { |
104 |
-diff -Naur extrecmenu-1.2.2.orig/mymenurecordings.c extrecmenu-1.2.2/mymenurecordings.c |
105 |
---- extrecmenu-1.2.2.orig/mymenurecordings.c 2013-10-23 13:14:38.010071212 +0200 |
106 |
-+++ extrecmenu-1.2.2/mymenurecordings.c 2013-10-23 13:27:17.916785937 +0200 |
107 |
-@@ -590,7 +590,11 @@ |
108 |
- { |
109 |
- if(mysetup.FileSystemFreeMB) |
110 |
- { |
111 |
-+#if APIVERSNUM > 20101 |
112 |
-+ string path=cVideoDirectory::Name(); |
113 |
-+#else |
114 |
- string path=VideoDirectory; |
115 |
-+#endif |
116 |
- path+="/"; |
117 |
- char *tmpbase=base?ExchangeChars(strdup(base),true):NULL; |
118 |
- if(base) |
119 |
-@@ -634,7 +638,11 @@ |
120 |
- else |
121 |
- { |
122 |
- int freemb; |
123 |
-+#if APIVERSNUM > 20101 |
124 |
-+ cVideoDirectory::VideoDiskSpace(&freemb); |
125 |
-+#else |
126 |
- VideoDiskSpace(&freemb); |
127 |
-+#endif |
128 |
- return freemb; |
129 |
- } |
130 |
- |
131 |
-@@ -747,7 +755,11 @@ |
132 |
- for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording)) |
133 |
- list->Add(new myRecListItem(recording)); |
134 |
- // sort my recordings list |
135 |
-+#if APIVERSNUM > 20101 |
136 |
-+ string path=cVideoDirectory::Name(); |
137 |
-+#else |
138 |
- string path=VideoDirectory; |
139 |
-+#endif |
140 |
- path+="/"; |
141 |
- if(base) |
142 |
- path+=base; |
143 |
-@@ -1211,7 +1223,11 @@ |
144 |
- { |
145 |
- char *strBase=base?ExchangeChars(strdup(base), true):NULL; |
146 |
- char *strName=ExchangeChars(strdup(item->Name()), true); |
147 |
-+#if APIVERSNUM > 20101 |
148 |
-+ if(-1==asprintf(¶meter,"\"%s/%s/%s\"",cVideoDirectory::Name(),strBase?strBase:"", strName)) |
149 |
-+#else |
150 |
- if(-1==asprintf(¶meter,"\"%s/%s/%s\"",VideoDirectory,strBase?strBase:"", strName)) |
151 |
-+#endif |
152 |
- parameter=NULL; |
153 |
- free(strBase); |
154 |
- free(strName); |
155 |
-@@ -1235,7 +1251,11 @@ |
156 |
- // change sorting |
157 |
- eOSState myMenuRecordings::ChangeSorting() |
158 |
- { |
159 |
-+#if APIVERSNUM > 20101 |
160 |
-+ string path=cVideoDirectory::Name(); |
161 |
-+#else |
162 |
- string path=VideoDirectory; |
163 |
-+#endif |
164 |
- path+="/"; |
165 |
- if(base) |
166 |
- path+=base; |
167 |
-diff -Naur extrecmenu-1.2.2.orig/tools.c extrecmenu-1.2.2/tools.c |
168 |
---- extrecmenu-1.2.2.orig/tools.c 2013-10-23 13:14:38.010071212 +0200 |
169 |
-+++ extrecmenu-1.2.2/tools.c 2013-10-23 13:36:56.026822499 +0200 |
170 |
-@@ -152,7 +152,11 @@ |
171 |
- { |
172 |
- if(!strncmp(OldName,item->recording->FileName(),strlen(OldName))) |
173 |
- { |
174 |
-+#if APIVERSNUM > 20101 |
175 |
-+ buf=strdup(OldName+strlen(cVideoDirectory::Name())+1); |
176 |
-+#else |
177 |
- buf=strdup(OldName+strlen(VideoDirectory)+1); |
178 |
-+#endif |
179 |
- if(buf) |
180 |
- { |
181 |
- buf=ExchangeChars(buf,false); |
182 |
-@@ -240,8 +244,13 @@ |
183 |
- { |
184 |
- myRecListItem *item=(myRecListItem*)&ListObject; |
185 |
- |
186 |
-+#if APIVERSNUM > 20101 |
187 |
-+ char *s1=StripEpisodeName(strdup(filename+strlen(cVideoDirectory::Name()))); |
188 |
-+ char *s2=StripEpisodeName(strdup(item->filename+strlen(cVideoDirectory::Name()))); |
189 |
-+#else |
190 |
- char *s1=StripEpisodeName(strdup(filename+strlen(VideoDirectory))); |
191 |
- char *s2=StripEpisodeName(strdup(item->filename+strlen(VideoDirectory))); |
192 |
-+#endif |
193 |
- |
194 |
- int compare; |
195 |
- if(mysetup.DescendSorting) |
196 |
-@@ -699,7 +708,11 @@ |
197 |
- |
198 |
- isyslog("[extrecmenu] moving canceled"); |
199 |
- |
200 |
-+#if APIVERSNUM > 20101 |
201 |
-+ cVideoDirectory::RemoveVideoFile(To.c_str()); |
202 |
-+#else |
203 |
- RemoveVideoFile(To.c_str()); |
204 |
-+#endif |
205 |
- |
206 |
- return true; |
207 |
- } |
208 |
|
209 |
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild |
210 |
deleted file mode 100644 |
211 |
index 68be40df19f..00000000000 |
212 |
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.2-r2.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,59 +0,0 @@ |
215 |
-# Copyright 1999-2018 Gentoo Foundation |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
- |
218 |
-EAPI=5 |
219 |
- |
220 |
-inherit vdr-plugin-2 |
221 |
- |
222 |
-VERSION="936" #every bump, new version |
223 |
- |
224 |
-DVDARCHIVE="dvdarchive-2.3-beta.sh" |
225 |
- |
226 |
-DESCRIPTION="VDR Plugin: Extended recordings menu" |
227 |
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu" |
228 |
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz |
229 |
- mirror://gentoo/${DVDARCHIVE}.gz" |
230 |
- |
231 |
-LICENSE="GPL-2" |
232 |
-SLOT="0" |
233 |
-KEYWORDS="amd64 x86" |
234 |
-IUSE="" |
235 |
- |
236 |
-DEPEND=">=media-video/vdr-1.6.0" |
237 |
-RDEPEND="${DEPEND}" |
238 |
- |
239 |
-src_prepare() { |
240 |
- |
241 |
- cd "${WORKDIR}" |
242 |
- epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch" |
243 |
- |
244 |
- cd "${S}" |
245 |
- if grep -q fskProtection /usr/include/vdr/timers.h; then |
246 |
- einfo "Enabling parentalrating option" |
247 |
- sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile |
248 |
- fi |
249 |
- |
250 |
- vdr-plugin-2_src_prepare |
251 |
- |
252 |
- if has_version ">=media-video/vdr-1.7.28"; then |
253 |
- sed -i "s:SetRecording(recording->FileName(),recording->Title:SetRecording(recording->FileName:" mymenurecordings.c |
254 |
- fi |
255 |
- |
256 |
- if has_version ">=media-video/vdr-1.7.32"; then |
257 |
- export EXTRECMENU_USE_VDR_CUTTER=1 |
258 |
- einfo "disabled plugin cutter" |
259 |
- einfo "plugin use now the vdr included cutter" |
260 |
- fi |
261 |
- |
262 |
- epatch "${FILESDIR}/${P}_vdr-2.1.2.diff" |
263 |
-} |
264 |
- |
265 |
-src_install() { |
266 |
- vdr-plugin-2_src_install |
267 |
- |
268 |
- cd "${WORKDIR}" |
269 |
- newbin ${DVDARCHIVE} dvdarchive.sh |
270 |
- |
271 |
- insinto /etc/vdr |
272 |
- doins "${FILESDIR}"/dvdarchive.conf |
273 |
-} |
274 |
|
275 |
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild |
276 |
new file mode 100644 |
277 |
index 00000000000..78df7fa041f |
278 |
--- /dev/null |
279 |
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild |
280 |
@@ -0,0 +1,42 @@ |
281 |
+# Copyright 1999-2019 Gentoo Authors |
282 |
+# Distributed under the terms of the GNU General Public License v2 |
283 |
+ |
284 |
+EAPI=7 |
285 |
+ |
286 |
+inherit vdr-plugin-2 |
287 |
+ |
288 |
+GIT_VERSION="77d10faec3c7b0abe25ba3b161dc3b4e2cad042b" |
289 |
+ |
290 |
+DVDARCHIVE="dvdarchive-2.3-beta.sh" |
291 |
+ |
292 |
+DESCRIPTION="VDR Plugin: Extended recordings menu" |
293 |
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu" |
294 |
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-${GIT_VERSION}.tar.gz -> ${PF}.tar.gz |
295 |
+ mirror://gentoo/${DVDARCHIVE}.gz" |
296 |
+ |
297 |
+LICENSE="GPL-2" |
298 |
+SLOT="0" |
299 |
+KEYWORDS="~amd64 ~arm ~x86" |
300 |
+ |
301 |
+DEPEND="media-video/vdr" |
302 |
+ |
303 |
+S="${WORKDIR}/vdr-plugin-extrecmenu-${GIT_VERSION}" |
304 |
+ |
305 |
+src_prepare() { |
306 |
+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po |
307 |
+ |
308 |
+ cd "${WORKDIR}" |
309 |
+ eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch" |
310 |
+ |
311 |
+ vdr-plugin-2_src_prepare |
312 |
+} |
313 |
+ |
314 |
+src_install() { |
315 |
+ vdr-plugin-2_src_install |
316 |
+ |
317 |
+ cd "${WORKDIR}" |
318 |
+ newbin ${DVDARCHIVE} dvdarchive.sh |
319 |
+ |
320 |
+ insinto /etc/vdr |
321 |
+ doins "${FILESDIR}"/dvdarchive.conf |
322 |
+} |