version bump

(Portage version: 2.1.2.2)

4 files changed, 139 insertions, 2 deletions

diff --git a/media-video/mplayer-sh/ChangeLog b/media-video/mplayer-sh/ChangeLog
index fb58808de501..4659fb0bcb33 100644
--- a/media-video/mplayer-sh/ChangeLog
+++ b/media-video/mplayer-sh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer-sh
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-sh/ChangeLog,v 1.4 2006/08/01 18:51:04 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-sh/ChangeLog,v 1.5 2007/05/06 20:49:29 hd_brummy Exp $
+
+*mplayer-sh-0.8.7 (06 May 2007)
+
+  06 May 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/mplayer-sh-0.8.7-parameter-aid.diff, +mplayer-sh-0.8.7.ebuild:
+  version bump
 
   01 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to VDR-Project.
diff --git a/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.7 b/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.7
new file mode 100644
index 000000000000..d0b546ece7cc
--- /dev/null
+++ b/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.7
@@ -0,0 +1,3 @@
+MD5 cc2e48d4787b7ee739a0a8bb5b8c9fb2 mplayer.sh-0.8.7.tar.gz 7851
+RMD160 e7039810513dca08f398a14b12e5e2968683e937 mplayer.sh-0.8.7.tar.gz 7851
+SHA256 271f1105efcc6292117d826255f873da4ef70cf517f523d65a36036c74c60dcf mplayer.sh-0.8.7.tar.gz 7851
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
new file mode 100644
index 000000000000..3de61e76cd1b
--- /dev/null
+++ b/media-video/mplayer-sh/files/mplayer-sh-0.8.7-parameter-aid.diff
@@ -0,0 +1,84 @@
+--- 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/mplayer-sh-0.8.7.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
new file mode 100644
index 000000000000..698522e20e86
--- /dev/null
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-sh/mplayer-sh-0.8.7.ebuild,v 1.1 2007/05/06 20:49:29 hd_brummy Exp $
+
+inherit eutils
+
+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="~x86 ~amd64"
+SLOT="0"
+LICENSE="as-is"
+IUSE=""
+
+RDEPEND=">=media-video/mplayer-0.1.20070321"
+
+S=${WORKDIR}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	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}
+}