version bump

Package-Manager: portage-2.1.2.2

5 files changed, 160 insertions, 10 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/Manifest b/media-video/mplayer-sh/Manifest
index 90f5bee620e7..d195d5b54550 100644
--- a/media-video/mplayer-sh/Manifest
+++ b/media-video/mplayer-sh/Manifest
@@ -5,15 +5,24 @@ AUX mplayer-sh-0.8.6-parameter-aid.diff 3541 RMD160 8f19e51557ea0779d56fcde5cf0f
 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
+AUX mplayer-sh-0.8.7-parameter-aid.diff 3570 RMD160 0ff70de634b2172799b13553143ddf04faad11eb SHA1 683c2ac34bfcfa81d94fb2ab20f0d8907b20c581 SHA256 5d0079cb73baee2108ee1cb587988a09e6108b92361587b045a718215914858f
+MD5 1b57831a263e6524c824722c0389e090 files/mplayer-sh-0.8.7-parameter-aid.diff 3570
+RMD160 0ff70de634b2172799b13553143ddf04faad11eb files/mplayer-sh-0.8.7-parameter-aid.diff 3570
+SHA256 5d0079cb73baee2108ee1cb587988a09e6108b92361587b045a718215914858f files/mplayer-sh-0.8.7-parameter-aid.diff 3570
 DIST mplayer.sh-0.8.6.tar.gz 7568 RMD160 83ec8b494dba73182f95b2fec07d090522c75bef SHA1 5a7d006cfc5dca6677202637fd95472647af6385 SHA256 3d98b55f7b173296ac40d14b967f525459f415b340322de53cd8105cca4851ef
+DIST mplayer.sh-0.8.7.tar.gz 7851 RMD160 e7039810513dca08f398a14b12e5e2968683e937 SHA1 5de5b3db17c4ff653ce18c51cb580262b767681f SHA256 271f1105efcc6292117d826255f873da4ef70cf517f523d65a36036c74c60dcf
 EBUILD mplayer-sh-0.8.6-r2.ebuild 1110 RMD160 6783d97bc476427a7dbb2d40ae6f2e99f35c1bb2 SHA1 5319e86faad8a5624a8e66457abf7f957a24751e SHA256 8d9c95a554f4d2f221d4cfc0202cc9f2236e1625913018e44a5dadf7354df3f8
 MD5 21483efca63859424ad8d92a8d7369f0 mplayer-sh-0.8.6-r2.ebuild 1110
 RMD160 6783d97bc476427a7dbb2d40ae6f2e99f35c1bb2 mplayer-sh-0.8.6-r2.ebuild 1110
 SHA256 8d9c95a554f4d2f221d4cfc0202cc9f2236e1625913018e44a5dadf7354df3f8 mplayer-sh-0.8.6-r2.ebuild 1110
-MISC ChangeLog 868 RMD160 3f8c885551ab8776cbbd7cf572bdbfc55ca848f8 SHA1 313a4214a4903a01b24b309f776ec5a6cea3aac0 SHA256 270f3181a5b85aed5635efcaf6849bf83896d96c4911cb961ab5206a893b06f1
-MD5 ec96988291092e2ad2bf2835c9a5147a ChangeLog 868
-RMD160 3f8c885551ab8776cbbd7cf572bdbfc55ca848f8 ChangeLog 868
-SHA256 270f3181a5b85aed5635efcaf6849bf83896d96c4911cb961ab5206a893b06f1 ChangeLog 868
+EBUILD mplayer-sh-0.8.7.ebuild 1137 RMD160 08a217e8326ecbd27e4541a6a3a773ea7b295cd4 SHA1 815317d1f9e8fec8e69aa616a37d58048a60974b SHA256 a8e5a3006ced5e1e4ae8b4cc60194e1b6d322947305dfe963aafe18372535d76
+MD5 dbc0473c3bf8edf822fce24d94ae7dde mplayer-sh-0.8.7.ebuild 1137
+RMD160 08a217e8326ecbd27e4541a6a3a773ea7b295cd4 mplayer-sh-0.8.7.ebuild 1137
+SHA256 a8e5a3006ced5e1e4ae8b4cc60194e1b6d322947305dfe963aafe18372535d76 mplayer-sh-0.8.7.ebuild 1137
+MISC ChangeLog 1049 RMD160 3a980543b974d11262521201790cccc8aef998b5 SHA1 9d01503ed3987ee63f32d5aa9668a2101652cb9c SHA256 1c47f532834549ff16ddb88fe1aafaa633ac17c4ee48535701f1902ff748729f
+MD5 08499ff9dfe841594374a9868a199c22 ChangeLog 1049
+RMD160 3a980543b974d11262521201790cccc8aef998b5 ChangeLog 1049
+SHA256 1c47f532834549ff16ddb88fe1aafaa633ac17c4ee48535701f1902ff748729f ChangeLog 1049
 MISC metadata.xml 360 RMD160 a9e40bce454ec69711dab1ed581ddd712c2831ed SHA1 9145c93d90f94f94044389004fe1e29cc55fdf53 SHA256 acf529769233dd99fa0f41183f5f54a8c7da70b6f61c3bb64bcd866a4536ed1e
 MD5 b3112d0cae00a996a82779c71cca24ec metadata.xml 360
 RMD160 a9e40bce454ec69711dab1ed581ddd712c2831ed metadata.xml 360
@@ -21,10 +30,14 @@ SHA256 acf529769233dd99fa0f41183f5f54a8c7da70b6f61c3bb64bcd866a4536ed1e metadata
 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 af18a6664e40ae3886da588d00c74a6e files/digest-mplayer-sh-0.8.7 244
+RMD160 e18017a5447bde50a56410658fd81f35ae30e970 files/digest-mplayer-sh-0.8.7 244
+SHA256 8833bcd92e195abb4fe4a7bd041a9e059d59dc8805d5b6e3ccb35534e17f70ac files/digest-mplayer-sh-0.8.7 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5rc1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFEz6Ket2vP6XvVdOcRAkNCAJ9kdS8dRK0wN0jL2NpDBFsSx+e5OgCgnXRX
-qVx5AQZDxZ6Gwp90ydKC6Ys=
-=iEc3
+iD8DBQFGPj9mdn07HTTCgIoRAoBXAKCA9D8D1lzj/vIxtXfg4XN8oNfoXACfTXQb
+u10zVfFhOm7pkyEs6Bz/1Mc=
+=P3xW
 -----END PGP SIGNATURE-----
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}
+}