commit: 9134d1babb27088984286523de6de91f514f3c96 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Tue Feb 4 19:02:54 2020 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Tue Feb 4 19:27:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9134d1ba
media-plugins/vdr-extb: pmasked removal bug 704014 Closes: https://bugs.gentoo.org/704014 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> media-plugins/vdr-extb/Manifest | 3 - .../vdr-extb/files/vdr-extb-0.3.1-gentoo.diff | 71 ---------------------- .../vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff | 25 -------- media-plugins/vdr-extb/metadata.xml | 9 --- media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild | 69 --------------------- 5 files changed, 177 deletions(-) diff --git a/media-plugins/vdr-extb/Manifest b/media-plugins/vdr-extb/Manifest deleted file mode 100644 index 8e3c99a6f1b..00000000000 --- a/media-plugins/vdr-extb/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST extb.tar.gz 45417 BLAKE2B 70c264b9d988e64ea5c21e76f5b02c23bf89a90d846f41f785a2491f138e182483046b8457cb46615430a42f7ae8ec337bd5c999998457470866c2c020eebd07 SHA512 2fd539425b773419aaca27ee6c00879a420b8bc47fc3033082eef03275f5e8cdeba0c6562fe160cbdf1146f5cb4a45ad4e723f7e63d627e1937a847615456381 -DIST extb_firmware_1.08_lircd.conf.zip 8197 BLAKE2B 7635ab601e10170e6b063fec3cc8486550a75083beb5e9071e6779859bfe57764a9210472925df0375e997db6618460d27bf68a42c2571d82ef0de0f2a062f5e SHA512 bee864bdf876a117f4235ab415feb04dfc31f59118ed9c601a46ee90b0df010d890e61bf12f9351fe9b3977815d3c3b9985e069a1ad9e72ceb177691bbd70609 -DIST vdr-extb-0.3.1.tar.gz 53136 BLAKE2B ccb3bb5a4a251e2928be1b7d836e98ab756730ecc7f6976c9520f3c9a13dcfb6ee513630fc42bca306134f04d2f3b92e22ca9ee7c25f4fc00e0544c136dd3397 SHA512 cbef33eef77e22266adc10fe305be2ae50c69c312dce44711d3e889387638daf9e6a0d71e8342a63f6655eb82f51c15f274b3a9815f876d17fbc4079da2ee391 diff --git a/media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff b/media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff deleted file mode 100644 index 84169755a93..00000000000 --- a/media-plugins/vdr-extb/files/vdr-extb-0.3.1-gentoo.diff +++ /dev/null @@ -1,71 +0,0 @@ -diff -ur extb.orig/bin/extb.sh extb/bin/extb.sh ---- extb.orig/bin/extb.sh 2004-05-05 17:38:29.000000000 +0200 -+++ extb/bin/extb.sh 2004-07-19 22:19:49.459865904 +0200 -@@ -10,17 +10,11 @@ - trap 'rm /tmp/tmp{1,2,3}.$$; exit 0' 2 15 - - #Defaults --SCRIPT_PATH="/opt/extb/bin/" --LINPIC_PATH="/opt/extb/bin/" --HEX_FILES_PATH="/opt/extb/src/PIC/firm/" --LIRCD_CMD="lircd" --IREXEC_CMD="irexec" -+SCRIPT_PATH="/usr/bin/" -+LINPIC_PATH="/usr/bin/" -+HEX_FILES_PATH=/usr/share/extb/" - SETSERIAL_CMD="setserial" --LIRC_CONF="/etc/lircd.conf" --LIRC_RC="/etc/lircrc" - COM_PORT="/dev/ttyS1" --VDR_PATH="/VDR/1.2.5/VDR/" --VDR_CMD="./runvdr" - - # ----------------------------------------------------------------------------- - -@@ -329,7 +323,7 @@ - ;; - - 1) -- cp /tmp/PICflags PICflags.conf -+ cp /tmp/PICflags /etc/extb/PICflags.conf - _MAIN - ;; - -@@ -477,7 +471,8 @@ - 0) - tx.sh M2 # sending M2 to Extension Board to disable video/audio - clear -- killall irexec; killall lircd -+ /etc/init.d/irexec stop -+ /etc/init.d/lircd stop - sleep 1 - $SETSERIAL_CMD $COM_PORT uart 16550 - sleep 1 -@@ -487,14 +482,15 @@ - echo "" - $SETSERIAL_CMD $COM_PORT uart none - sleep 1 -- $LIRCD_CMD $LIRC_CONF; $IREXEC_CMD $LIRC_RC & -+ /etc/init.d/lircd start -+ /etc/init.d/irexc start - echo "" - echo "Stopping VDR ..." -- killall vdr -+ /etc/init.d/vdr stop - sleep 1 - echo "" - echo "Restarting VDR ..." -- cd $VDR_PATH; $VDR_CMD -+ rcvdr start - cd $SCRIPT_PATH - echo "" - # just in case the Extension Board plugin is not installed ... -diff -ur extb.orig/bin/tx.sh extb/bin/tx.sh ---- extb.orig/bin/tx.sh 2004-04-12 18:23:16.000000000 +0200 -+++ extb/bin/tx.sh 2004-07-19 22:17:08.373354776 +0200 -@@ -1,2 +1,2 @@ - #!/bin/bash --rc send_once EXTB_TX $1 -\ No newline at end of file -+irsend send_once EXTB_TX $1 -\ No newline at end of file diff --git a/media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff b/media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff deleted file mode 100644 index b9fdd205117..00000000000 --- a/media-plugins/vdr-extb/files/vdr-extb-0.3.1_vdr-1.7.13.diff +++ /dev/null @@ -1,25 +0,0 @@ -http://toms-cafe.de/vdr/download/extb-0.3.1-vdr-1.7.13.diff -compile fix up from vdr-1.7.13 - ---- extb-0.3.1/extboardio.c -+++ extb-0.3.1/extboardio.c -@@ -361,10 +361,16 @@ void cExtBoardIO::Channel(int nChannelNu - m_nChannel |= (0 != pChannel->Tpid()) ?eHasTpid:0; - - if(pChannel->IsSat()) { -+#if VDRVERSNUM >= 10713 -+ cDvbTransponderParameters dtp(pChannel->Parameters()); -+ char polarization = dtp.Polarization(); -+#else -+ char polarization = pChannel->Polarization(); -+#endif - m_nChannel |= eIsSourceSat; -- if (toupper(pChannel->Polarization()) == 'V') -+ if (toupper(polarization) == 'V') - m_nChannel |= eIsSatVPolar; -- if (toupper(pChannel->Polarization()) == 'H') -+ if (toupper(polarization) == 'H') - m_nChannel |= eIsSatHPolar; - } - else if(pChannel->IsCable()) - diff --git a/media-plugins/vdr-extb/metadata.xml b/media-plugins/vdr-extb/metadata.xml deleted file mode 100644 index cfdfc8a7d45..00000000000 --- a/media-plugins/vdr-extb/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo VDR Project</name> - </maintainer> - <longdescription>VDR plugin to rename records on OSD</longdescription> -</pkgmetadata> diff --git a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild b/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild deleted file mode 100644 index b3996bbe5dc..00000000000 --- a/media-plugins/vdr-extb/vdr-extb-0.3.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR Plugin: used to control the VDR Extension Board" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; -SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz - http://vdr.websitec.de/download/${PN}/extb_firmware_1.08_lircd.conf.zip - http://vdr.websitec.de/download/${PN}/extb.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="app-misc/lirc - media-video/vdr" -RDEPEND="${DEPEND}" -BDEPEND="app-arch/unzip" - -src_prepare() { - vdr-plugin-2_src_prepare - - sed -i "${WORKDIR}"/extb/src/LinPIC/Makefile \ - -e "s:\$(LDLIBS):\$(LDFLAGS) \$(LDLIBS):" - - cd "${WORKDIR}" - eapply -p0 "${FILESDIR}/${P}-gentoo.diff" - eapply -p0 "${FILESDIR}/${P}_vdr-1.7.13.diff" -} - -src_compile() { - vdr-plugin-2_src_compile - - emake -C "${WORKDIR}/extb/src/LinPIC" all -} -src_install() { - vdr-plugin-2_src_install - - dodoc README.de "${WORKDIR}/lircd.conf.extb_FW1.08" - dodoc "${S}/wakeup/README.de" - - dobin "${WORKDIR}/extb/src/LinPIC/picdl" - dobin "${WORKDIR}/extb/bin/extb.sh" - dobin "${WORKDIR}/extb/bin/status.sh" - dobin "${WORKDIR}/extb/bin/tx.sh" - dobin "${S}/wakeup/extb-poweroff.pl" - dobin "${S}/wakeup/examples/checkscript.sh" - - insinto /usr/share/extb/ - doins "${WORKDIR}/extb_1.08.hex" - - insinto /etc/extb - doins "${WORKDIR}/extb/bin/PICflags.conf" - doins "${S}/wakeup/examples/extb-poweroff.conf" -} - -pkg_postinst() { - vdr-plugin-2_pkg_postinst - - einfo "You need to upload the included firmware (1.08)" - einfo "(you will find it in /usr/share/extb/)" - einfo "into the extension board and update your lircd.conf" - einfo "See the supplied lircd.conf.extb_FW1.08 in" - einfo "/usr/share/doc/${PF}" -}
