Added patch for selection of audio-language

(Portage version: 2.1_pre7-r1)

5 files changed, 155 insertions, 1 deletions

diff --git a/media-video/mplayer-sh/ChangeLog b/media-video/mplayer-sh/ChangeLog
index fbfe4650da63..e6cfb8b6140e 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.1 2006/01/08 21:35:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-sh/ChangeLog,v 1.2 2006/03/26 21:57:13 zzam Exp $
+
+*mplayer-sh-0.8.6-r2 (26 Mar 2006)
+
+  26 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mplayer-sh-0.8.6-parameter-aid.diff, +mplayer-sh-0.8.6-r2.ebuild:
+  Added patch for selection of audio-language
 
 *mplayer-sh-0.8.6-r1 (08 Jan 2006)
 
diff --git a/media-video/mplayer-sh/Manifest b/media-video/mplayer-sh/Manifest
index 3beda1d7c4cc..b00f9f3f6375 100644
--- a/media-video/mplayer-sh/Manifest
+++ b/media-video/mplayer-sh/Manifest
@@ -1,4 +1,21 @@
 MD5 d9fc9896f4e8e0999df34cffdbf68d3b ChangeLog 408
+RMD160 c6ffbbfa5215d6906ef65ae35650c9a18b3e306a ChangeLog 408
+SHA256 1d4b36586d2940ea77b681e2ceee13502eb86e399e654945f78cc9f31bb98f58 ChangeLog 408
 MD5 c06d0ba97e330e46424cd4ead8bc46d6 files/digest-mplayer-sh-0.8.6-r1 66
+RMD160 3c5395a7e18f5ef2ac395d4593fff17b4b00c066 files/digest-mplayer-sh-0.8.6-r1 66
+SHA256 800d0467daf25747a0b08a5e6a1d8c74332058e86b865a4d233be7e45ce008c6 files/digest-mplayer-sh-0.8.6-r1 66
+MD5 adfff0d2d40fc305f16cebce29ca5978 files/digest-mplayer-sh-0.8.6-r2 244
+RMD160 b2f7e103e1d59e7304ad053dfb557c634b39cead files/digest-mplayer-sh-0.8.6-r2 244
+SHA256 3165a4ff4bc197c62409a8bb16ed76168b13eb3fb18ddb0d09ae2fbfea79d647 files/digest-mplayer-sh-0.8.6-r2 244
+MD5 262049fb406cde17f4947b3fb2c2b86e files/mplayer-sh-0.8.6-parameter-aid.diff 3541
+RMD160 8f19e51557ea0779d56fcde5cf0f2fdac0cd521c files/mplayer-sh-0.8.6-parameter-aid.diff 3541
+SHA256 b63f1c0220b2a2fce8ad5a81767a756bfa91aca769c3a943058cbbf023f56dc5 files/mplayer-sh-0.8.6-parameter-aid.diff 3541
 MD5 877a7f594a277abff9b23dd40d8434bb metadata.xml 364
+RMD160 a646a36caa9dca40a1fdb4c94393e42b1c747c9e metadata.xml 364
+SHA256 b5850390a83c624957b2d10c1fe89bca9f70a8c00e5cb5bdb7a77609c25d1692 metadata.xml 364
 MD5 9937434dcf316d06a71f47db09573bf4 mplayer-sh-0.8.6-r1.ebuild 1119
+RMD160 2aaeb8a2330f7ffba6ee2920edeb628745aa7309 mplayer-sh-0.8.6-r1.ebuild 1119
+SHA256 4b67b05983b458da7f575972dbf42d7e86fad45277feaf9d2fb0da077fdc4dc4 mplayer-sh-0.8.6-r1.ebuild 1119
+MD5 021f8c8ca6484d563a1b2e9224e11e72 mplayer-sh-0.8.6-r2.ebuild 1180
+RMD160 2e735f44f99b13f2c65e928670bd95b5477ec812 mplayer-sh-0.8.6-r2.ebuild 1180
+SHA256 012b7b2a1c8ba745c46031e62719b9c9d1c1cab392b24d15561f9590e92ae3e5 mplayer-sh-0.8.6-r2.ebuild 1180
diff --git a/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.6-r2 b/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.6-r2
new file mode 100644
index 000000000000..4f5259c5770a
--- /dev/null
+++ b/media-video/mplayer-sh/files/digest-mplayer-sh-0.8.6-r2
@@ -0,0 +1,3 @@
+MD5 898f14049b248fd807737864b6cb4665 mplayer.sh-0.8.6.tar.gz 7568
+RMD160 83ec8b494dba73182f95b2fec07d090522c75bef mplayer.sh-0.8.6.tar.gz 7568
+SHA256 3d98b55f7b173296ac40d14b967f525459f415b340322de53cd8105cca4851ef mplayer.sh-0.8.6.tar.gz 7568
diff --git a/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
new file mode 100644
index 000000000000..3b329215564b
--- /dev/null
+++ b/media-video/mplayer-sh/files/mplayer-sh-0.8.6-parameter-aid.diff
@@ -0,0 +1,84 @@
+--- mplayer.sh.orig	2006-03-26 23:31:10.000000000 +0200
++++ mplayer.sh	2006-03-26 23:50:39.000000000 +0200
+@@ -6,6 +6,7 @@
+ declare VERSION="0.8.6"
+ 
+ # History (as always in the source code :-)
++#       - 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)
+ #	- changed the fps values from rational values to integer ones
+@@ -208,6 +209,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"
+ 
+@@ -478,15 +484,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
+@@ -504,18 +519,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
+@@ -545,9 +560,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 == "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 -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
++      CMDLINE="$MPLAYER -vo $VO $AOUT -vop $VOP:$NEW_FPS,expand=$NEW_X:$REAL_Y:-1:-1:1,scale=$NEW_X:${NEW_Y}${DETC} $SPEED $FDSTR $CACHESTR $AUDIO $REMOTE $SUBTITLES $USERDEF $FORCEIDX"
+     fi
+ fi
+ 
diff --git a/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
new file mode 100644
index 000000000000..5abbe943944d
--- /dev/null
+++ b/media-video/mplayer-sh/mplayer-sh-0.8.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 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.6-r2.ebuild,v 1.1 2006/03/26 21:57:13 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="Video Disk Recorder Mplayer API Script"
+HOMEPAGE="http://batleth.sapienti-sat.org/"
+SRC_URI="http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-${PV}.tar.gz"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="as-is"
+IUSE=""
+
+RDEPEND=">=media-video/mplayer-0.90_rc4"
+
+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:video /etc/vdr/plugins/DVD-VCD/{DVD,VCD}
+}