Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/linuxtv-dvb-apps/files/, media-tv/linuxtv-dvb-apps/
Date: Sun, 01 Nov 2020 03:20:00
Message-Id: 1604200788.147c971aa4733fcbe450ee768a08204603b191f2.sam@gentoo
1 commit: 147c971aa4733fcbe450ee768a08204603b191f2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 1 03:19:48 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 1 03:19:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147c971a
7
8 media-tv/linuxtv-dvb-apps: fix gcc 10 build
9
10 Thanks-to: Nico R <n-roeser <AT> gmx.net>
11 Closes: https://bugs.gentoo.org/723420
12 Package-Manager: Portage-3.0.8, Repoman-3.0.2
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch | 11 +++++++++++
16 .../linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild | 3 ++-
17 2 files changed, 13 insertions(+), 1 deletion(-)
18
19 diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch
20 new file mode 100644
21 index 00000000000..d218183be14
22 --- /dev/null
23 +++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch
24 @@ -0,0 +1,11 @@
25 +https://723420.bugs.gentoo.org/attachment.cgi?id=639692
26 +--- a/util/alevt/vbi.c
27 ++++ b/util/alevt/vbi.c
28 +@@ -35,7 +35,6 @@
29 +
30 + static u8 *rawbuf; // one common buffer for raw vbi data
31 + static int rawbuf_size; // its current size
32 +-u_int16_t sid;
33 + static char *vbi_names[]
34 + = { "/dev/vbi", "/dev/vbi0", "/dev/video0", "/dev/dvb/adapter0/demux0",
35 + NULL }; // default device names if none was given at the command line
36
37 diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
38 index e0dddee3f36..821333cff38 100644
39 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
40 +++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
41 @@ -38,6 +38,7 @@ PATCHES=(
42 "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
43 "${FILESDIR}"/${PN}-no-ca_set_pid.patch
44 "${FILESDIR}"/${PN}-glibc-2.31.patch
45 + "${FILESDIR}"/${PN}-1.1.1.20140321-gcc10.patch
46 )
47
48 src_prepare() {
49 @@ -89,5 +90,5 @@ src_install() {
50 }
51
52 pkg_postinst() {
53 - elog "/usr/bin/scan has been installed as scan-dvb."
54 + elog "${EPREFIX}/usr/bin/scan has been installed as scan-dvb."
55 }