1 |
commit: 2f472c1f91d21444530ed18c29a26db3fccc40a8 |
2 |
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> |
3 |
AuthorDate: Sun Nov 17 01:33:46 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 17 01:33:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f472c1f |
7 |
|
8 |
media-video/vdr: fix multiple QA issues |
9 |
|
10 |
* QA issue: USE flag 'permashift_v1' uses reserved underscore |
11 |
character, rename USE flag 'permashift_v1' to 'permashift' |
12 |
* QA issue: UnnecessarySlashStrip in DESTDIR="${D%/}" |
13 |
* QA issue: makefile installs pre-compressed manpages |
14 |
|
15 |
Bug: https://bugs.gentoo.org/695066 |
16 |
Closes: https://github.com/gentoo/gentoo/pull/13588 |
17 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
18 |
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> |
19 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
20 |
|
21 |
media-video/vdr/files/vdr-2.2.0_gentoo.patch | 35 +++++++----- |
22 |
media-video/vdr/metadata.xml | 12 ++++- |
23 |
media-video/vdr/vdr-2.2.0-r3.ebuild | 4 +- |
24 |
.../{vdr-2.2.0-r3.ebuild => vdr-2.2.0-r4.ebuild} | 62 +++++++++++----------- |
25 |
4 files changed, 63 insertions(+), 50 deletions(-) |
26 |
|
27 |
diff --git a/media-video/vdr/files/vdr-2.2.0_gentoo.patch b/media-video/vdr/files/vdr-2.2.0_gentoo.patch |
28 |
index 37ffd3c7b2c..70066f5b0c8 100644 |
29 |
--- a/media-video/vdr/files/vdr-2.2.0_gentoo.patch |
30 |
+++ b/media-video/vdr/files/vdr-2.2.0_gentoo.patch |
31 |
@@ -1,7 +1,6 @@ |
32 |
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
33 |
---- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100 |
34 |
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100 |
35 |
-@@ -116,7 +116,7 @@ |
36 |
+--- a/Makefile |
37 |
++++ b/Makefile |
38 |
+@@ -124,7 +124,7 @@ |
39 |
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
40 |
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
41 |
|
42 |
@@ -10,7 +9,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
43 |
|
44 |
# Implicit rules: |
45 |
|
46 |
-@@ -170,7 +170,7 @@ |
47 |
+@@ -179,7 +179,7 @@ |
48 |
|
49 |
PODIR = po |
50 |
LOCALEDIR = locale |
51 |
@@ -19,7 +18,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
52 |
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) |
53 |
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) |
54 |
I18Npot = $(PODIR)/vdr.pot |
55 |
-@@ -193,7 +193,7 @@ |
56 |
+@@ -202,7 +202,7 @@ |
57 |
|
58 |
install-i18n: i18n |
59 |
@mkdir -p $(DESTDIR)$(LOCDIR) |
60 |
@@ -28,7 +27,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
61 |
|
62 |
# The 'include' directory (for plugins): |
63 |
|
64 |
-@@ -255,7 +255,7 @@ |
65 |
+@@ -264,7 +264,7 @@ |
66 |
|
67 |
# Install the files (note that 'install-pc' must be first!): |
68 |
|
69 |
@@ -37,16 +36,13 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
70 |
|
71 |
# VDR binary: |
72 |
|
73 |
-@@ -267,12 +267,13 @@ |
74 |
+@@ -276,12 +276,10 @@ |
75 |
|
76 |
install-dirs: |
77 |
@mkdir -p $(DESTDIR)$(VIDEODIR) |
78 |
- @mkdir -p $(DESTDIR)$(CONFDIR) |
79 |
- @mkdir -p $(DESTDIR)$(ARGSDIR) |
80 |
- @mkdir -p $(DESTDIR)$(CACHEDIR) |
81 |
-+# @mkdir -p $(DESTDIR)$(CONFDIR) |
82 |
-+# @mkdir -p $(DESTDIR)$(ARGSDIR) |
83 |
-+# @mkdir -p $(DESTDIR)$(CACHEDIR) |
84 |
@mkdir -p $(DESTDIR)$(RESDIR) |
85 |
|
86 |
install-conf: |
87 |
@@ -54,14 +50,25 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile |
88 |
@cp -pn *.conf $(DESTDIR)$(CONFDIR) |
89 |
|
90 |
# Documentation: |
91 |
-@@ -299,8 +300,11 @@ |
92 |
+@@ -289,9 +287,9 @@ |
93 |
+ install-doc: |
94 |
+ @mkdir -p $(DESTDIR)$(MANDIR)/man1 |
95 |
+ @mkdir -p $(DESTDIR)$(MANDIR)/man5 |
96 |
+- @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz |
97 |
+- @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz |
98 |
+- @gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz |
99 |
++ @cp vdr.1 $(DESTDIR)$(MANDIR)/man1/ |
100 |
++ @cp vdr.5 $(DESTDIR)$(MANDIR)/man5/ |
101 |
++ @cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/ |
102 |
+ |
103 |
+ # Plugins: |
104 |
+ |
105 |
+@@ -308,8 +306,9 @@ |
106 |
# Includes: |
107 |
|
108 |
install-includes: include-dir |
109 |
- @mkdir -p $(DESTDIR)$(INCDIR) |
110 |
- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
111 |
-+# @mkdir -p $(DESTDIR)$(INCDIR) |
112 |
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
113 |
+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi |
114 |
+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR) |
115 |
+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr |
116 |
|
117 |
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml |
118 |
index 8ebb4b08a51..246bd87c200 100644 |
119 |
--- a/media-video/vdr/metadata.xml |
120 |
+++ b/media-video/vdr/metadata.xml |
121 |
@@ -1,6 +1,14 @@ |
122 |
<?xml version="1.0" encoding="UTF-8"?> |
123 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
124 |
<pkgmetadata> |
125 |
+ <maintainer type="person"> |
126 |
+ <email>martin.dummer@×××.net</email> |
127 |
+ <name>Martin Dummer</name> |
128 |
+ </maintainer> |
129 |
+ <maintainer type="project"> |
130 |
+ <email>proxy-maint@g.o</email> |
131 |
+ <name>Proxy Maintainers</name> |
132 |
+ </maintainer> |
133 |
<maintainer type="project"> |
134 |
<email>vdr@g.o</email> |
135 |
<name>Gentoo VDR Project</name> |
136 |
@@ -19,8 +27,8 @@ |
137 |
<flag name="menuorg">Enables support for the <pkg>media-plugins/vdr-menuorg</pkg></flag> |
138 |
<flag name="menuselection">adds support for menu hotkeys of double digits</flag> |
139 |
<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag> |
140 |
- <flag name="permashift">permanent timeshift by recording live TV on hard disk, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag> |
141 |
- <flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin >=mediaplugins/vdr-permashift-1</flag> |
142 |
+ <flag name="permashift">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag> |
143 |
+ <flag name="permashift_v1">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag> |
144 |
<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag> |
145 |
<flag name="resumereset">rreset resume of EOF</flag> |
146 |
<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag> |
147 |
|
148 |
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild |
149 |
index 8dad304a1d8..dfbfd553e10 100644 |
150 |
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild |
151 |
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild |
152 |
@@ -260,7 +260,7 @@ src_install() { |
153 |
# directory |
154 |
emake install \ |
155 |
VIDEODIR="/" \ |
156 |
- DESTDIR="${D%/}" install || die "emake install failed" |
157 |
+ DESTDIR="${D}" install |
158 |
|
159 |
keepdir "${PLUGIN_LIBDIR}" |
160 |
|
161 |
@@ -283,7 +283,7 @@ src_install() { |
162 |
doins "${FILESDIR}"/channel_alternative.conf |
163 |
fi |
164 |
|
165 |
- chown -R vdr:vdr "${D%/}/${CONF_DIR}" |
166 |
+ chown -R vdr:vdr "${D}/${CONF_DIR}" |
167 |
} |
168 |
|
169 |
pkg_postinst() { |
170 |
|
171 |
diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r4.ebuild |
172 |
similarity index 82% |
173 |
copy from media-video/vdr/vdr-2.2.0-r3.ebuild |
174 |
copy to media-video/vdr/vdr-2.2.0-r4.ebuild |
175 |
index 8dad304a1d8..27229bab9fa 100644 |
176 |
--- a/media-video/vdr/vdr-2.2.0-r3.ebuild |
177 |
+++ b/media-video/vdr/vdr-2.2.0-r4.ebuild |
178 |
@@ -1,12 +1,12 @@ |
179 |
-# Copyright 1999-2019 Gentoo Authors |
180 |
+# Copyright 2019 Gentoo Authors |
181 |
# Distributed under the terms of the GNU General Public License v2 |
182 |
|
183 |
EAPI=7 |
184 |
|
185 |
-inherit eutils flag-o-matic toolchain-funcs |
186 |
+inherit flag-o-matic toolchain-funcs |
187 |
|
188 |
# Switches supported by extensions-patch |
189 |
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin |
190 |
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin |
191 |
mainmenuhooks menuorg menuselection resumereset ttxtsubs" |
192 |
|
193 |
# names of the use-flags |
194 |
@@ -15,8 +15,6 @@ EXT_PATCH_FLAGS_RENAMED="" |
195 |
# names ext-patch uses internally, here only used for maintainer checks |
196 |
EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify" |
197 |
|
198 |
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" |
199 |
- |
200 |
MY_PV="${PV%_p*}" |
201 |
MY_P="${PN}-${MY_PV}" |
202 |
S="${WORKDIR}/${MY_P}" |
203 |
@@ -26,34 +24,33 @@ EXT_P="extpng-${P}-gentoo-edition-v1" |
204 |
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" |
205 |
HOMEPAGE="http://www.tvdr.de/" |
206 |
SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 |
207 |
- https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" |
208 |
+ mirror://gentoo/${EXT_P}.patch.bz2" |
209 |
|
210 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" |
211 |
-SLOT="0" |
212 |
LICENSE="GPL-2" |
213 |
+SLOT="0" |
214 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
215 |
+IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" |
216 |
|
217 |
-COMMON_DEPEND="virtual/jpeg:* |
218 |
+COMMON_DEPEND=" |
219 |
+ virtual/jpeg:* |
220 |
sys-libs/libcap |
221 |
>=media-libs/fontconfig-2.4.2 |
222 |
>=media-libs/freetype-2" |
223 |
- |
224 |
DEPEND="${COMMON_DEPEND} |
225 |
- >=virtual/linuxtv-dvb-headers-5.3 |
226 |
- sys-devel/gettext" |
227 |
- |
228 |
+ >=virtual/linuxtv-dvb-headers-5.3" |
229 |
RDEPEND="${COMMON_DEPEND} |
230 |
dev-lang/perl |
231 |
>=media-tv/gentoo-vdr-scripts-2.7 |
232 |
media-fonts/corefonts |
233 |
bidi? ( dev-libs/fribidi ) |
234 |
systemd? ( sys-apps/systemd )" |
235 |
+BDEPEND="sys-devel/gettext" |
236 |
|
237 |
-CONF_DIR=/etc/vdr |
238 |
-CAP_FILE=${S}/capabilities.sh |
239 |
+CONF_DIR="/etc/vdr" |
240 |
+CAP_FILE="${S}/capabilities.sh" |
241 |
CAPS="# Capabilities of the vdr-executable for use by startscript etc." |
242 |
|
243 |
pkg_setup() { |
244 |
- |
245 |
use debug && append-flags -g |
246 |
|
247 |
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" |
248 |
@@ -71,12 +68,12 @@ add_cap() { |
249 |
enable_patch() { |
250 |
local arg ARG_UPPER |
251 |
for arg; do |
252 |
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]') |
253 |
- echo "${ARG_UPPER} = 1" >> Make.config |
254 |
+ ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]') |
255 |
+ echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to Make.config" |
256 |
|
257 |
# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS |
258 |
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp |
259 |
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE |
260 |
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp" |
261 |
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE || die "cannot write to defines.tmp" |
262 |
export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) |
263 |
done |
264 |
} |
265 |
@@ -86,7 +83,7 @@ extensions_add_make_conf() |
266 |
# copy all ifdef for extensions-patch to Make.config |
267 |
sed -e '1,/need to touch the following:/d' \ |
268 |
-e '/need to touch the following/,/^$/d' \ |
269 |
- Make.config.template >> Make.config |
270 |
+ Make.config.template >> Make.config || die "cannot write to Make.config" |
271 |
} |
272 |
|
273 |
extensions_all_defines() { |
274 |
@@ -94,7 +91,7 @@ extensions_all_defines() { |
275 |
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ |
276 |
Make.config.template \ |
277 |
| sort \ |
278 |
- | tr '[:upper:]' '[:lower:]' |
279 |
+ | tr '[:upper:]' '[:lower:]' || die "error in function extensions_all_defines" |
280 |
} |
281 |
|
282 |
lang_po() { |
283 |
@@ -111,16 +108,16 @@ src_configure() { |
284 |
} |
285 |
|
286 |
src_prepare() { |
287 |
- # apply maintainace-patches |
288 |
+ # apply maintenance-patches |
289 |
ebegin "Changing paths for gentoo" |
290 |
|
291 |
- local DVBDIR=/usr/include |
292 |
+ local DVBDIR="/usr/include" |
293 |
local i |
294 |
for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do |
295 |
[[ -d ${i} ]] || continue |
296 |
if [[ -f ${i}/linux/dvb/dmx.h ]]; then |
297 |
einfo "Found DVB header files in ${i}" |
298 |
- DVBDIR=${i} |
299 |
+ DVBDIR="${i}" |
300 |
break |
301 |
fi |
302 |
done |
303 |
@@ -136,7 +133,7 @@ src_prepare() { |
304 |
die "DVB headers too old" |
305 |
fi |
306 |
|
307 |
- cat > Make.config <<-EOT |
308 |
+ cat > Make.config <<-EOT || die "cannot write to Make.config" |
309 |
# |
310 |
# Generated by ebuild ${PF} |
311 |
# |
312 |
@@ -168,6 +165,7 @@ src_prepare() { |
313 |
|
314 |
# Now apply extensions patch |
315 |
eapply "${WORKDIR}/${EXT_P}.patch" |
316 |
+ sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed" |
317 |
|
318 |
# This allows us to start even if some plugin does not exist |
319 |
# or is not loadable. |
320 |
@@ -180,10 +178,10 @@ src_prepare() { |
321 |
# (or have them already hard enabled) |
322 |
local IGNORE_PATCHES="pluginmissing" |
323 |
|
324 |
- extensions_all_defines > "${T}"/new.IUSE |
325 |
+ extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE" |
326 |
echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \ |
327 |
$IGNORE_PATCHES | \ |
328 |
- tr ' ' '\n' |sort > "${T}"/old.IUSE |
329 |
+ tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE" |
330 |
local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]') |
331 |
if [[ -z ${DIFFS} ]]; then |
332 |
einfo "EXT_PATCH_FLAGS are up to date." |
333 |
@@ -208,7 +206,7 @@ src_prepare() { |
334 |
|
335 |
# add defined use-flags compile options to vdr.pc |
336 |
sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \ |
337 |
- -i Makefile |
338 |
+ -i Makefile || die "sed fails on Makefile" |
339 |
|
340 |
ebegin "Make depend" |
341 |
emake .dependencies >/dev/null |
342 |
@@ -226,7 +224,7 @@ src_prepare() { |
343 |
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \ |
344 |
-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \ |
345 |
-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \ |
346 |
- -i "${S}"/Makefile |
347 |
+ -i "${S}"/Makefile || die "sed fails on Makefile" |
348 |
|
349 |
eapply_user |
350 |
|
351 |
@@ -260,7 +258,7 @@ src_install() { |
352 |
# directory |
353 |
emake install \ |
354 |
VIDEODIR="/" \ |
355 |
- DESTDIR="${D%/}" install || die "emake install failed" |
356 |
+ DESTDIR="${ED}" install |
357 |
|
358 |
keepdir "${PLUGIN_LIBDIR}" |
359 |
|
360 |
@@ -283,7 +281,7 @@ src_install() { |
361 |
doins "${FILESDIR}"/channel_alternative.conf |
362 |
fi |
363 |
|
364 |
- chown -R vdr:vdr "${D%/}/${CONF_DIR}" |
365 |
+ chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed" |
366 |
} |
367 |
|
368 |
pkg_postinst() { |