* [gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/mplayer-sh/, media-video/mplayer-sh/files/
@ 2022-04-20 7:51 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2022-04-20 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 937074a2aebc55cc6e9fda8e9385e6a7682cc94b
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 07:43:30 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 07:50:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=937074a2
media-video/mplayer-sh: treeclean
Closes: https://bugs.gentoo.org/835364
Closes: https://bugs.gentoo.org/553404
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
media-video/mplayer-sh/Manifest | 1 -
.../files/mplayer-sh-0.8.7-parameter-aid.diff | 84 ----------------------
media-video/mplayer-sh/metadata.xml | 8 ---
media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild | 42 -----------
profiles/package.mask | 6 --
5 files changed, 141 deletions(-)
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
deleted file mode 100644
index f35174f84896..000000000000
--- a/media-video/mplayer-sh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mplayer.sh-0.8.7.tar.gz 7851 BLAKE2B b7dbaf93c509a3d2bb38f226dafed2261ddadbff24a6e450f3fe2cf5cb5208bb3e89a1830fc3e59d674e9b045360208e7c221498e32f228be9c6e0147aef2588 SHA512 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
deleted file mode 100644
index 3de61e76cd1b..000000000000
--- a/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- mplayer.sh.orig 2007-02-11 16:34:07.000000000 +0100
-+++ mplayer.sh 2007-05-05 18:17:48.000000000 +0200
-@@ -12,6 +12,7 @@
- # - calculate USE_SPEED with 30 fps instead of 29.97
- # - use '-vf' and '-af' instead of '-vop' and '-aop', as the
- # latter are deprecated
-+# - add -aid to mplayer when AID is given (Matthias Schwarzott <zzam@gentoo.org>)
- #
- # 0.8.6 - fixed a copy'n'paste bug regarding the subtitle background
- # alpha color (thanks to Christian Haider)
-@@ -215,6 +216,11 @@
- fi
- debugvar REMOTE "$REMOTE"
-
-+ if test -n "${AID}"; then
-+ AUDIO="-aid ${AID}"
-+ fi
-+ debugvar AUDIO "${AUDIO}"
-+
- if ! test -z "$USERDEF"; then echolog "*** Use Option USERDEF at your own risk!"; fi
- debugvar USERDEF "$USERDEF"
-
-@@ -485,15 +491,24 @@
- declare -i NEW_X NEW_Y
- declare -i HALF_Y FULL_Y
- declare ORIG_FPS NEW_FPS ORIG_ASPECT VIDEO_FORMAT AUDIO_CODEC
--declare CMDLINE AOUT REMOTE USERDEF SUFFIX
-+declare CMDLINE AOUT REMOTE AUDIO USERDEF SUFFIX
- declare FILE="$1"
--declare SLAVE="$2"
-+shift
- declare -a XResPAL[0]
- declare -a XResNTSC[0]
- declare FDSTR=""
- declare SUBTITLES=""
- declare DETC=""
-
-+while [[ -n $1 ]]; do
-+ case ${1} in
-+ SLAVE) SLAVE=SLAVE ;;
-+ AID) AID=${2}; shift ;;
-+ esac
-+
-+ shift
-+done
-+
- echolog "*** Starting mplayer.sh Version $VERSION"
-
- if test -z "$FILE"; then echolog "*** USAGE: mplayer.sh <File_to_be_played>"; exit; fi
-@@ -511,18 +526,18 @@
- if test \( "$FILE" == "$DVDFiles/DVD" -o "$FILE" == "$DVDFiles/VCD" \) -a -n "$DVDFiles" -a -n "$DVD"; then
- if test "$FILE" == "$DVDFiles/DVD"; then
- $USEAC3 && AOUT="$AC3AOUT"
-- CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -dvd-device $DVD dvd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -alang $DVDLANG $DVDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -dvd-device $DVD dvd://"
- fi
- if test "$FILE" == "$DVDFiles/VCD"; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $REMOTE $USERDEF -cdrom-device $DVD vcd://"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $VCDOPTIONS $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -cdrom-device $DVD vcd://"
- fi
- unset FILE
- elif test "${SUFFIX}" == ".cue"; then
- if $MPLAYER_V1; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF cue://$FILE:2"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF cue://$FILE:2"
- unset FILE
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF -vcd 2 -cuefile"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF -vcd 2 -cuefile"
- fi
- else
- # Try to determine the video attributes
-@@ -552,9 +567,9 @@
- \( $NTSC -a $NEW_FPS == "30" -a \( \( $ORIG_X == "352" -a $ORIG_Y == "240" \) -o \( $ORIG_Y == "480" -a \
- \( $ORIG_X == "352" -o $ORIG_X == "480" -o $ORIG_X == "512" -o $ORIG_X == "544" -o $ORIG_X == "640" -o $ORIG_X == "704" -o $ORIG_X == "720" \) \) \) \) \
- \) ; then
-- CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $REMOTE $USERDEF"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT $FDSTR $CACHESTR $AUDIO $REMOTE $USERDEF"
- else
-- CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
-+ CMDLINE="$MPLAYER -vo $VO $AOUT -vf scale=$NEW_X:${NEW_Y}${DETC},expand=$NEW_X:$REAL_Y:-1:-1:1,$VOP:$NEW_FPS $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
- fi
- fi
-
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/mplayer-sh/metadata.xml
deleted file mode 100644
index 2b167a7461de..000000000000
--- a/media-video/mplayer-sh/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
deleted file mode 100644
index c5826b56616a..000000000000
--- a/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch
-
-RESTRICT="mirror bindist"
-
-DESCRIPTION="Video Disk Recorder Mplayer API Script"
-HOMEPAGE="http://batleth.sapienti-sat.org/projects/VDR/"
-SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-${PV}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="all-rights-reserved"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-0.1.20070321"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-parameter-aid.diff"
-
- sed -i "s:^declare CFGFIL.*$:declare CFGFIL=\"\/etc\/vdr\/plugins\/mplayer\/mplayer.sh.conf\":" mplayer.sh
- sed -i mplayer.sh.conf -e "s:^LIRCRC.*$:LIRCRC=\/etc\/lircd.conf:" \
- -e "s:^MPLAYER=.*$:MPLAYER=\/usr\/bin\/mplayer:"
-}
-
-src_install() {
-
- insinto /etc/vdr/plugins/mplayer
- doins mplayer.sh.conf
-
- into /usr/share/vdr/mplayer
- dobin mplayer.sh
-
- dodir /etc/vdr/plugins/DVD-VCD
- touch "${D}"/etc/vdr/plugins/DVD-VCD/{DVD,VCD}
- fowners vdr:vdr /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index da7105627e7f..a327b4cd065e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -281,12 +281,6 @@ dev-java/java-apicheck
dev-java/jboss-marshalling-river
dev-java/jboss-marshalling-serial
-# David Seifert <soap@gentoo.org> (2022-03-21)
-# EAPI 5, last release 15 years ago, QA permission issues, no other
-# distro packages this.
-# Bug #553404, #835364, removal on 2022-04-20.
-media-video/mplayer-sh
-
# David Seifert <soap@gentoo.org> (2022-03-20)
# Mask gcc-8 branch (ended upstream support). Please switch
# to a fresher gcc branch.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-20 7:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-20 7:51 [gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/mplayer-sh/, media-video/mplayer-sh/files/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox