1 |
commit: 84014afdc8783146d314c74c7039978548e9908e |
2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 5 15:41:17 2020 +0000 |
4 |
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 5 15:41:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84014afd |
7 |
|
8 |
media-plugins/vdr-skinelchi: compile fix for not declared min/max |
9 |
|
10 |
Closes: https://bugs.gentoo.org/703994 |
11 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
12 |
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> |
13 |
|
14 |
.../vdr-skinelchi-0.3.0_min_max_from_stl.patch | 18 ++++++++++ |
15 |
.../vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild | 41 ++++++++++++++++++++++ |
16 |
2 files changed, 59 insertions(+) |
17 |
|
18 |
diff --git a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..123d0e4d557 |
21 |
--- /dev/null |
22 |
+++ b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch |
23 |
@@ -0,0 +1,18 @@ |
24 |
+taken from debian vdr repo |
25 |
+this will fix |
26 |
+https://bugs.gentoo.org/703994 |
27 |
+ |
28 |
+Reviewed-by: Joerg Bornkessel <hd_brummy@g.o> ( 2020 Jan 05 ) |
29 |
+Index: b/DisplayChannel.c |
30 |
+=================================================================== |
31 |
+--- a/DisplayChannel.c |
32 |
++++ b/DisplayChannel.c |
33 |
+@@ -724,7 +724,7 @@ |
34 |
+ } |
35 |
+ else { |
36 |
+ time_t t = time(NULL); |
37 |
+- int seen = max(0, min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration()))); |
38 |
++ int seen = std::max(0, std::min(y9 - y6a - 1, int((y9 - y6a) * double(t - Present->StartTime()) / Present->Duration()))); |
39 |
+ osd->DrawRectangle(x4 + Gap, y6a + seen, x4 + Gap + ScrollWidth - 1, y9 - 1, Theme.Color(clrChannelTimebarRest)); |
40 |
+ osd->DrawRectangle(x4 + Gap, y6a, x4 + Gap + ScrollWidth - 1, y6a + seen - 1, Theme.Color(clrChannelTimebarSeen)); |
41 |
+ changed = true; |
42 |
|
43 |
diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild |
44 |
new file mode 100644 |
45 |
index 00000000000..0f5afd25994 |
46 |
--- /dev/null |
47 |
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild |
48 |
@@ -0,0 +1,41 @@ |
49 |
+# Copyright 1999-2020 Gentoo Authors |
50 |
+# Distributed under the terms of the GNU General Public License v2 |
51 |
+ |
52 |
+EAPI=7 |
53 |
+ |
54 |
+inherit vdr-plugin-2 |
55 |
+ |
56 |
+DESCRIPTION="VDR Skin Plugin: skinelchi" |
57 |
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi" |
58 |
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2" |
59 |
+ |
60 |
+SLOT="0" |
61 |
+LICENSE="GPL-2" |
62 |
+KEYWORDS="~amd64 ~x86" |
63 |
+ |
64 |
+DEPEND="media-video/vdr" |
65 |
+ |
66 |
+src_prepare() { |
67 |
+ vdr-plugin-2_src_prepare |
68 |
+ |
69 |
+ #bug #599148 |
70 |
+ append-cxxflags -std=gnu++11 |
71 |
+ |
72 |
+ # disable imagemagick support, broken ... |
73 |
+ sed -i "${S}"/Makefile -e \ |
74 |
+ "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 0:" |
75 |
+ |
76 |
+ sed -i "${S}"/DisplayChannel.c \ |
77 |
+ -e "s:/hqlogos::" \ |
78 |
+ -e "s:/logos::" |
79 |
+ |
80 |
+ # wrong sed in vdr-plugin-2.eclass? |
81 |
+ sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRINCDIR)/include:" \ |
82 |
+ -i Makefile |
83 |
+ |
84 |
+ # gcc-6 warnings |
85 |
+ sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h |
86 |
+ |
87 |
+ # wrt bug 703994 |
88 |
+ eapply "${FILESDIR}/${P}_min_max_from_stl.patch" |
89 |
+} |