1 |
commit: 528dafa8662eaf776e6d582e928a04dcc6b4e9e2 |
2 |
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> |
3 |
AuthorDate: Fri Nov 15 21:29:27 2019 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 17 07:45:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528dafa8 |
7 |
|
8 |
media-plugins/vdr-dvbhddevice: fix gcc-9 compile issue |
9 |
|
10 |
does not compile with gcc-9, fixed |
11 |
add a patch to fix it |
12 |
|
13 |
Closes: https://bugs.gentoo.org/693418 |
14 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
15 |
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> |
16 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
17 |
|
18 |
.../vdr-dvbhddevice/files/convert-bool-fix.patch | 36 ++++++++++++++++++++++ |
19 |
.../vdr-dvbhddevice-2.2.0_p20180420.ebuild | 14 ++++++--- |
20 |
2 files changed, 45 insertions(+), 5 deletions(-) |
21 |
|
22 |
diff --git a/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..0bdc79fba94 |
25 |
--- /dev/null |
26 |
+++ b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch |
27 |
@@ -0,0 +1,36 @@ |
28 |
+fix cannot convert bool to boolean wrt bug #693418 |
29 |
+ |
30 |
+Signed-of-by: Joerg Bornkessel <hd_brummy@×××××××.de> (13 Nov 2019) |
31 |
+diff -Naur powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c |
32 |
+--- powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c 2019-11-13 18:46:50.000000000 +0100 |
33 |
++++ powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c 2019-11-13 18:48:12.000000000 +0100 |
34 |
+@@ -1069,15 +1069,15 @@ |
35 |
+ } |
36 |
+ else { |
37 |
+ esyslog("ERROR: out of memory"); |
38 |
+- return false; |
39 |
++ return FALSE; |
40 |
+ } |
41 |
+ if (jcd->mem) { |
42 |
+ cinfo->dest->next_output_byte = jcd->mem + Used; |
43 |
+ cinfo->dest->free_in_buffer = jcd->size - Used; |
44 |
+- return true; |
45 |
++ return TRUE; |
46 |
+ } |
47 |
+ } |
48 |
+- return false; |
49 |
++ return FALSE; |
50 |
+ } |
51 |
+ |
52 |
+ static void JpegCompressTermDestination(j_compress_ptr cinfo) |
53 |
+@@ -1122,8 +1122,8 @@ |
54 |
+ cinfo.in_color_space = JCS_YCbCr; |
55 |
+ |
56 |
+ jpeg_set_defaults(&cinfo); |
57 |
+- jpeg_set_quality(&cinfo, Quality, true); |
58 |
+- jpeg_start_compress(&cinfo, true); |
59 |
++ jpeg_set_quality(&cinfo, Quality, TRUE); |
60 |
++ jpeg_start_compress(&cinfo, TRUE); |
61 |
+ |
62 |
+ int rs = Width * 3; |
63 |
+ JSAMPROW rp[Height]; |
64 |
|
65 |
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild |
66 |
index 9f21531f038..67fe2ca2c87 100644 |
67 |
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild |
68 |
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild |
69 |
@@ -1,4 +1,4 @@ |
70 |
-# Copyright 2018 Gentoo Authors |
71 |
+# Copyright 2019 Gentoo Authors |
72 |
# Distributed under the terms of the GNU General Public License v2 |
73 |
|
74 |
EAPI=7 |
75 |
@@ -8,8 +8,7 @@ inherit vdr-plugin-2 |
76 |
HG_REVISION="2ea854ae8c7a" |
77 |
HG_REVISION_DATE="20180420" |
78 |
|
79 |
-DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend |
80 |
-S2-6400 DVB Card" |
81 |
+DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card" |
82 |
HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice" |
83 |
SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz -> |
84 |
${P}.tar.gz" |
85 |
@@ -17,17 +16,22 @@ SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz -> |
86 |
LICENSE="GPL-2" |
87 |
SLOT="0" |
88 |
KEYWORDS="~amd64 ~x86" |
89 |
-IUSE="" |
90 |
|
91 |
DEPEND=">=media-video/vdr-2.0.0" |
92 |
RDEPEND="${DEPEND}" |
93 |
|
94 |
+PATCHES=( |
95 |
+ "${FILESDIR}/convert-bool-fix.patch" |
96 |
+ "${FILESDIR}/define_AUDIO_GET_PTS.patch" ) |
97 |
+QA_FLAGS_IGNORED=" |
98 |
+ usr/lib/vdr/plugins/libvdr-dvbhddevice.* |
99 |
+ usr/lib64/vdr/plugins/libvdr-dvbhddevice.*" |
100 |
+ |
101 |
S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}" |
102 |
|
103 |
src_prepare() { |
104 |
vdr-plugin-2_src_prepare |
105 |
|
106 |
- eapply "${FILESDIR}/define_AUDIO_GET_PTS.patch" |
107 |
fix_vdr_libsi_include dvbhdffdevice.c |
108 |
} |