summaryrefslogtreecommitdiff
path: root/media-video/vdr
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/Manifest5
-rw-r--r--media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch20
-rw-r--r--media-video/vdr/vdr-2.2.0-r5.ebuild2
-rw-r--r--media-video/vdr/vdr-2.4.1-r1.ebuild (renamed from media-video/vdr/vdr-2.4.1.ebuild)5
4 files changed, 27 insertions, 5 deletions
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 3401663eba1d..5ac4900ef66a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -5,6 +5,7 @@ AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da
AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
AUX vdr-2.4.1_gentoo.patch 2128 BLAKE2B dd10816931a5801f0ecef5025d750a8a0f16795fd70234792b6721ef31909350682a8f5ddae091d3c39a383b9715a281f178059798b9c5cd37b9e4c22f36dd6e SHA512 4ed95f894fa37a1a2fea6c568e5e3878b16afa172ebdde8181203a88bcbef4b3691449a1e07b0912675a67200ae8137f0ae0a78b8f1ebe2e5fe17a729c418284
+AUX vdr-2.4.1_glibc-2.31.patch 819 BLAKE2B f2862c53102ceff07f2b3416b41c2e38f254ee1b09cc0426be1116a0f18623f6f5f67661a25617e38782886b589609db45e1474ee634bec9dbe83e3546608902 SHA512 a81c8c175477d61f71ce76144619936a5ba4a3e6b25873d44ebc7507d265bbaa95c4475c658714ed03abc724bf39a53fa001cad8bbe418587b1309e77029e1c4
AUX vdr-2.4.1_makefile-variables.patch 1076 BLAKE2B 674b9a57fa8504e88cbaa21016766a0da3fc4ec8b6d9891050c7aa026c01414d18f57895885f8f0466243474ba02937397b571819cea3e1c38e5b35b5e5a9cbe SHA512 47bfbb7929e15ff98ff4bd0b466cbfa37c7f90efb1ef3a5c75e6c67fb0719a5979d2bfa2cb2e19805b15f22931dd1c911efab2e31fe8bd6953a1850196785d77
AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
@@ -15,6 +16,6 @@ DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b549
DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r5.ebuild 8110 BLAKE2B 8f71caafb129020c9c431db012061f3f3dad3f60a2b28439f793a39c0336e049b94cfe21f8011741a8db16777efe0b8fb6bdd2bc3dd61845a32c595a296f7b61 SHA512 f3e10562f35f19ae808215a86b5a807af4aeec327e39e42ed89eb2a729836afe1ab4253cd95a379be8d2a693719066093c765be4118e483bbcd1c007767399be
-EBUILD vdr-2.4.1.ebuild 5733 BLAKE2B 0bdc7d0a4654b2a19997c5d15dad9bd4a0b6edd38dc5000ad935e9233ef4de0d047f29d3b4aef639ffc1e8e2ea839143e77fc63f8fdc8e33f63ef9fb233bf5ec SHA512 1c76e2d0c0de09e703d7bc554f1c6cf327b9f7ce2db11806d77774a762e7cd2ce1c2ee280c6e0aa35cbdfdc6dacc77f131aa068001b3c2969351c2a424ee7274
+EBUILD vdr-2.2.0-r5.ebuild 8117 BLAKE2B 4d336cf14f3f0f100c8e99b05421b03cdb49b45760ea95856d5473ca73c7ccfe844298024b8aac5c27bd3eb35db9250e7af62b51da466321f8098771c9b5c276 SHA512 0ff86c5334116e9b2af96338adc4d05c233c96bcd8bdbbe52555945d01ad2aa7cbcd63e54ab061b88f52540745052885a4ef98dec8f767aa16ccb85780dd7af1
+EBUILD vdr-2.4.1-r1.ebuild 5784 BLAKE2B b818695ef39fc99e86a6ec61c73187a3ecb11dab525663bb24a471b7af536403dc854fa23ece3d71b501627b7c797c618d81107f19e7163e8c5a06cffdf3f09b SHA512 48aa844c2f8f13c78ad989757088d01354165148343a96605c43a11d95d863a627c939dba3c0fa5681cb70cde887055b20b9bdbf943cde3b4a38be682ca27069
MISC metadata.xml 1862 BLAKE2B 7dc6b96c3e05f9e4b34e6c2eb755e7326b5398e16ebee51768676003127becae8cd744de9a749b529452ca262caf4ccda9889d169297a0cf2134bdc2e22ca439 SHA512 3272e780bac7ae35449902621e7ff7ed7da099b9633d7cb47e6a2f6708cf069c220b5d67f6be3092459cbb254931f52b2e4d9b08f983c6b8841b74ae7239b1b2
diff --git a/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
new file mode 100644
index 000000000000..0db8c5064ac5
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_glibc-2.31.patch
@@ -0,0 +1,20 @@
+Replace obsolete stime() function with clock_settime()
+bug 708802
+
+
+Suggested-by: Manuel Reimer <manuel.reimer@gmx.de>
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2020 Feb 10 )
+diff -Naur vdr-2.4.1.orig/eit.c vdr-2.4.1/eit.c
+--- vdr-2.4.1.orig/eit.c 2020-02-10 21:25:03.594761113 +0100
++++ vdr-2.4.1/eit.c 2020-02-10 21:26:32.443761113 +0100
+@@ -391,7 +391,9 @@
+ if (abs(diff) > MAX_TIME_DIFF) {
+ mutex.Lock();
+ if (abs(diff) > MAX_ADJ_DIFF) {
+- if (stime(&dvbtim) == 0)
++ timespec ts = {};
++ ts.tv_sec = dvbtim;
++ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
+ isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
+ else
+ esyslog("ERROR while setting system time: %m");
diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild b/media-video/vdr/vdr-2.2.0-r5.ebuild
index 38a44d4e8183..472f17daa0ab 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
# Switches supported by extensions-patch
EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
diff --git a/media-video/vdr/vdr-2.4.1.ebuild b/media-video/vdr/vdr-2.4.1-r1.ebuild
index d2f923913af4..8cff2947749d 100644
--- a/media-video/vdr/vdr-2.4.1.ebuild
+++ b/media-video/vdr/vdr-2.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
HOMEPAGE="http://www.tvdr.de/"
@@ -124,6 +124,7 @@ src_prepare() {
eapply "${FILESDIR}/vdr-2.2.0-jpeg-9c.patch"
use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
eapply "${FILESDIR}/${P}_makefile-variables.patch"
+ eapply "${FILESDIR}/${P}_glibc-2.31.patch"
# works
use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"