commit: 114bdbd155023cbcd3532d8b1d9239e091153fed
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 16:42:14 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 16:43:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=114bdbd1
media-video/vdr: readded use-flag pinplugin, permashift; bug fixes
-use-flag pinplugin, permashift readded
-fixed clang/LLVM compile
thx to Martin.Dummer to point this out
-fixed segfault in ttxtsubs patch
thx to Christian Kunkel to report this
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
media-video/vdr/Manifest | 4 +++-
media-video/vdr/files/vdr-2.4.6_clang.patch | 20 ++++++++++++++++++++
.../vdr/{vdr-2.4.6.ebuild => vdr-2.4.6-r1.ebuild} | 22 +++++++++++++---------
3 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 43de58b6f2e..7611c3c1c5a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,10 +2,12 @@ DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664
BLAKE2B 81b68ebe0ef4588c
DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B
f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175
SHA512
d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B
975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c
SHA512
183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B
426139bd890e50e491d0061111445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de
SHA512
f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
+DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B
ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33
SHA512
3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B
d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9
SHA512
99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B
6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3
SHA512
b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
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-2.4.6.tar.bz2 951272 BLAKE2B
52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd
SHA512
bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
-DIST vdr-2.4.6_ttxtsubs.patch.bz2 14964 BLAKE2B
b07e26077fe5af02df00b3580031615390ba6b3ea1c5a6e9c91f5e6d1964da7114e0ad939a9e4de640a97f5a887c45f6c8b5793a4da9341c7c238993a997c87c
SHA512
cd60496b4a8a2dbed209dcf6645c0a6886091c5d5fca791a5ff3ec9fdf7f6c3f2c9a99976636aa985257b9baef10439e75f844f58f3f0a25d5ebcd361ec552ae
+DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B
142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f
SHA512
d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
+DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B
e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882
SHA512
14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B
19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a
SHA512
7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
diff --git a/media-video/vdr/files/vdr-2.4.6_clang.patch
b/media-video/vdr/files/vdr-2.4.6_clang.patch
new file mode 100644
index 00000000000..095bd18ae20
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.6_clang.patch
@@ -0,0 +1,20 @@
+compiling with CC="clang" CXX="clang++" we get the message
+
+ svdrp.c:76:3: error: no matching member function for call to 'Set'
+ Set(INADDR_ANY, 0);
+ ^~~
+
+this patch fixes it
+
+Signed-off-by: Martin Dummer <[email protected]> ( 2020/02/15 )
+--- a/svdrp.c 2021-02-14 00:00:30.417157252 +0100
++++ b/svdrp.c 2021-02-14 00:00:55.636995544 +0100
+@@ -73,7 +73,7 @@
+
+ cIpAddress::cIpAddress(void)
+ {
+- Set(INADDR_ANY, 0);
++ Set((const char *)INADDR_ANY, 0);
+ }
+
+ cIpAddress::cIpAddress(const char *Address, int Port)
diff --git a/media-video/vdr/vdr-2.4.6.ebuild
b/media-video/vdr/vdr-2.4.6-r1.ebuild
similarity index 89%
rename from media-video/vdr/vdr-2.4.6.ebuild
rename to media-video/vdr/vdr-2.4.6-r1.ebuild
index b8ba1b702c6..d7ea137b4c6 100644
--- a/media-video/vdr/vdr-2.4.6.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -11,13 +11,15 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
mainmenuhooks? (
http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2
)
menuorg? (
https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff
)
naludump? (
http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
- ttxtsubs? (
http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs.patch.bz2 )"
+ pinplugin? (
http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+ ttxtsubs? (
http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs_v2.patch.bz2 )
+ permashift? (
http://vdr.websitec.de/download/${PN}/${P}/vdr-2.4-patch-for-permashift.diff.bz2
)"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump
systemd ttxtsubs verbose"
-# use-flag permashift, pinplugin tmp droped
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump
permashift pinplugin systemd ttxtsubs verbose"
+
COMMON_DEPEND="
virtual/jpeg:*
sys-libs/libcap
@@ -33,9 +35,8 @@ RDEPEND="${COMMON_DEPEND}
systemd? ( sys-apps/systemd )"
BDEPEND="sys-devel/gettext"
-# permashift, pinplugin tmp droped
-#REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
-# permashift? ( !naludump !pinplugin )"
+REQUIRED_USE="pinplugin? ( !mainmenuhooks )
+ permashift? ( !naludump !pinplugin )"
CONF_DIR="/etc/vdr"
CAP_FILE="${S}/capabilities.sh"
@@ -132,10 +133,13 @@ src_prepare() {
use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
eapply "${FILESDIR}/${P}_makefile-variables.patch"
+ # fix clang/LLVM compile
+ eapply "${FILESDIR}/${P}_clang.patch"
+
use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-# tmp droped, use permashift && eapply
"${DISTDIR}/${PN}-2.4-patch-for-permashift.diff"
-# tmp droped, use pinplugin && eapply "${WORKDIR}/${PN}-2.4.1_pinplugin.patch"
- use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs.patch"
+ use permashift && eapply
"${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
+ use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
+ use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs_v2.patch"
use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
use mainmenuhooks && eapply
"${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
