diff options
Diffstat (limited to 'media-plugins/vdr-loadepg')
4 files changed, 67 insertions, 37 deletions
diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest index e1d9161095da..cad716ac1158 100644 --- a/media-plugins/vdr-loadepg/Manifest +++ b/media-plugins/vdr-loadepg/Manifest @@ -1,6 +1,5 @@ AUX rc-addon.sh 237 BLAKE2B d5360013da99daf2a15f5502f962fd676ed10bda6f9a6a63a307282bf33d1ffee0afa00cc135d507dde3cccd1253755630a56fe3aee13898ff82e1f67c8554aa SHA512 bd9baeb3617a6f4891d39813ddbe9f7b3f0576b144c8bd4a6afdf3eade962ed15491ce0ce312b275c056c50769961fbae03b88db808b621d195832ab30bfefca -DIST vdr-loadepg-0.2.3.tgz 54973 BLAKE2B 31afa867c31326490f0b5bcff97675ecb655c094ad8ddef6a1e7ce357dff45bb20a854d6ad7917d4083096c5b5bf62923dde0f0af086d904c81130260b567405 SHA512 01015e0cd57436a3c0223b168a9f6a4f10bf2002264167bec4144f8eeae6ca2ce5ba0008870b18be9ee68f100de4a77deb67fe06a57688c35f5c277d3421b9d8 +AUX vdr-loadepg-0.2.5_asprintf.patch 3207 BLAKE2B 3bbb85568602e515d04a7aa090e15652748e26470207cf845fa646be6641b22c7f49ff3cd2cb4a169c44182a592625e3213f5445af43c88d00cf44327229dc06 SHA512 73efcce5b64208046421946158c4da33aa0c2df69db3c1137487d141e110ea197ec4ddaef1bf76f0c139af5246b519bcc9075ae900e6e833dff7dc6d65518b59 DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb -EBUILD vdr-loadepg-0.2.3.ebuild 657 BLAKE2B 5fdc66a392c809b54ae82cf9069c52c0e5587bc840eb8ed8c8c80c98cf7018de389452c95bd5277dd68aefde680c157ed8b45f168a26ee821a25dcbe08e2e43d SHA512 3d66681dabc271d5dcc2ff55ae2961d8bc1b2c5ce5811e352db5f725c5ebbfb70aec5ca334325aca0087a5e6e9b8d76e16fa375a9f85824471cd420db68f29bd -EBUILD vdr-loadepg-0.2.5.ebuild 759 BLAKE2B c7ebb33d8ca5d02b0f7e21561130d175e7df93fd365fd89202214aa6f491d73e5671e2a93117f83f8775858d2d3061d0c423bb4aa0141123c8a22ddd92d2e533 SHA512 d88607432a232579265a548ffe364b125586fde6f7325879723185df9c3f10130f8abbbf1069e00790780bb393d0968576f6682ebf3cd3f28b19b6d41d7a8d75 +EBUILD vdr-loadepg-0.2.5.ebuild 795 BLAKE2B 9fcb5132c864e27d678904ca6cf1be1728193c6214771553b4fa09cb65ea5e4f35d9247bfb1ac3d8613a65b4d28c05863776301e38e346f2e1b20fb680ac32cb SHA512 5660788136541257cd7d852ac5eefb89bc47368859fbf2b85742b6747ede7e121c6f35a26a73010610a753363e766e55153de1749c6b191255b8425a0d4cd8a7 MISC metadata.xml 498 BLAKE2B cf0a8fbd4e28315fef9cfcd95fc8c841450e64accf23e456bc930759cd8bc496fc17fdefecc543cce20b300541dd6aa01ca34ef71aadd18c8d7f52c195535548 SHA512 2fdfed4c2bd048cb52361a5c4f91d7a87d9376085c92e63a18422f39f403b7712e82b69e597f581e4457b6f99c83d6360cf82ea1a4b80b16b9c6374427b560d4 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() { |