From 63948aa99cfc93951828f26d622a7a3cbf24c961 Mon Sep 17 00:00:00 2001
From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Wed, 11 Dec 2019 21:36:16 +0100
Subject: media-plugins/vdr-loadepg: fixed conversion from char to const char
fixed invalid conversion from char to const char*
thanks to M.Brakemeier for point this fix out
this commit will close wrt bug 663348
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
---
media-plugins/vdr-loadepg/Manifest | 1 -
.../files/vdr-loadepg-0.2.5_asprintf.patch | 60 ++++++++++++++++++++++
media-plugins/vdr-loadepg/vdr-loadepg-0.2.3.ebuild | 31 -----------
media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild | 8 +--
4 files changed, 65 insertions(+), 35 deletions(-)
create mode 100644 media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
delete mode 100644 media-plugins/vdr-loadepg/vdr-loadepg-0.2.3.ebuild
(limited to 'media-plugins')
diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest
index 32e15d23839a..a2e18cbd32fa 100644
--- a/media-plugins/vdr-loadepg/Manifest
+++ b/media-plugins/vdr-loadepg/Manifest
@@ -1,2 +1 @@
-DIST vdr-loadepg-0.2.3.tgz 54973 BLAKE2B 31afa867c31326490f0b5bcff97675ecb655c094ad8ddef6a1e7ce357dff45bb20a854d6ad7917d4083096c5b5bf62923dde0f0af086d904c81130260b567405 SHA512 01015e0cd57436a3c0223b168a9f6a4f10bf2002264167bec4144f8eeae6ca2ce5ba0008870b18be9ee68f100de4a77deb67fe06a57688c35f5c277d3421b9d8
DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb
diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
new file mode 100644
index 000000000000..c650ff61d7c3
--- /dev/null
+++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/663348
+
+compile fix for invalid conversion from char to const char*
+thx to Michael Brakemeier for point this out
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@astrali.de> (17 Nov 2019)
+diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c
+--- loadepg-0.2.5.orig/loadepg.c 2019-11-17 14:49:27.637235533 +0100
++++ loadepg-0.2.5/loadepg.c 2019-11-17 14:50:23.690235533 +0100
+@@ -159,7 +159,7 @@
+ (lProviders + nProviders)->SourceId = cSource::FromString(string2);
+ asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
+ asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
+- asprintf(&(lProviders + nProviders)->Parm3, '\0');
++ asprintf(&(lProviders + nProviders)->Parm3, "");
+ nProviders ++;
+ IsSkyThemesNull = true;
+ }
+@@ -169,8 +169,8 @@
+ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;
+ (lProviders + nProviders)->SourceId = cSource::FromString(string2);
+ asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
+- asprintf(&(lProviders + nProviders)->Parm2, '\0');
+- asprintf(&(lProviders + nProviders)->Parm3, '\0');
++ asprintf(&(lProviders + nProviders)->Parm2, "");
++ asprintf(&(lProviders + nProviders)->Parm3, "");
+ nProviders ++;
+ }
+ else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)
+@@ -179,8 +179,8 @@
+ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;
+ (lProviders + nProviders)->SourceId = cSource::FromString(string2);
+ asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
+- asprintf(&(lProviders + nProviders)->Parm2, '\0');
+- asprintf(&(lProviders + nProviders)->Parm3, '\0');
++ asprintf(&(lProviders + nProviders)->Parm2, "");
++ asprintf(&(lProviders + nProviders)->Parm3, "");
+ nProviders ++;
+ }
+ else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)
+@@ -189,8 +189,8 @@
+ (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;
+ (lProviders + nProviders)->SourceId = 0;
+ asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
+- asprintf(&(lProviders + nProviders)->Parm2, '\0');
+- asprintf(&(lProviders + nProviders)->Parm3, '\0');
++ asprintf(&(lProviders + nProviders)->Parm2, "");
++ asprintf(&(lProviders + nProviders)->Parm3, "");
+ nProviders ++;
+ }
+ else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)
+@@ -200,7 +200,7 @@
+ (lProviders + nProviders)->SourceId = 0;
+ asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
+ asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
+- asprintf(&(lProviders + nProviders)->Parm3, '\0');
++ asprintf(&(lProviders + nProviders)->Parm3, "");
+ nProviders ++;
+ }
+ }
diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.3.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.3.ebuild
deleted file mode 100644
index 7a0c8bca96c6..000000000000
--- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR : Loadepg Plugin; Canal+ group (Mediahighway)"
-HOMEPAGE="http://lukkinosat.altervista.org/"
-SRC_URI="http://lukkinosat.altervista.org/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- sed -i loadepg.h -e 's:"../../../libsi/section.h":<vdr/libsi/section.h>:'
-}
-
-src_install() {
- vdr-plugin-2_src_install
-
- insinto /etc/vdr/plugins/loadepg
- doins "${S}"/conf/*
- fowners -R vdr:vdr /etc/vdr/plugins/loadepg
-}
diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
index 5b7bee32cab0..813116671ac6 100644
--- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
+++ b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit vdr-plugin-2
@@ -14,7 +14,7 @@ SLOT="0"
LICENSE="GPL-2"
IUSE=""
-DEPEND=">=media-video/vdr-2"
+DEPEND="media-video/vdr"
src_prepare() {
# remove untranslated po files
@@ -23,6 +23,8 @@ src_prepare() {
vdr-plugin-2_src_prepare
fix_vdr_libsi_include loadepg.h
+
+ eapply "${FILESDIR}/${P}_asprintf.patch"
}
src_install() {
--
cgit v1.2.3-65-gdbad