From: Matthias Schwarzott Date: Sun, 8 Oct 2006 13:54:07 +0000 (+0000) Subject: Fixed rc-addon, and added a new version with moved mute-directory. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9184605fd1b167bf1914630976fa42b30a5d2aa2;p=gentoo.git Fixed rc-addon, and added a new version with moved mute-directory. Package-Manager: portage-2.1.2_pre2-r6 --- diff --git a/media-plugins/vdr-bitstreamout/ChangeLog b/media-plugins/vdr-bitstreamout/ChangeLog index 7c286cd48350..e50f19c8a5f2 100644 --- a/media-plugins/vdr-bitstreamout/ChangeLog +++ b/media-plugins/vdr-bitstreamout/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-bitstreamout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.6 2006/08/16 08:34:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/ChangeLog,v 1.7 2006/10/08 13:54:06 zzam Exp $ + +*vdr-bitstreamout-0.85-r1 (08 Oct 2006) + + 08 Oct 2006; Matthias Schwarzott +files/confd-0.85, + +files/rc-addon.sh-0.85, files/confd, files/rc-addon.sh, + vdr-bitstreamout-0.85.ebuild, +vdr-bitstreamout-0.85-r1.ebuild: + Fixed rc-addon, and added a new version with moved mute-directory. 16 Aug 2006; Matthias Schwarzott -vdr-bitstreamout-0.84.ebuild, vdr-bitstreamout-0.85.ebuild: diff --git a/media-plugins/vdr-bitstreamout/Manifest b/media-plugins/vdr-bitstreamout/Manifest index 5df274773335..679f19afd8e5 100644 --- a/media-plugins/vdr-bitstreamout/Manifest +++ b/media-plugins/vdr-bitstreamout/Manifest @@ -1,23 +1,35 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX confd 545 RMD160 0150ce8ec9f0e2bacd196c9a61f1c9f53557f067 SHA1 2e9a90166282ab49125fa966b1cb409f7f8934c7 SHA256 d515671f139346563cfc040249b03fe7ba1cd32d8e4c8f9948afff8fd5906b49 -MD5 56d61f9e0b02581a533c9efd12bd0363 files/confd 545 -RMD160 0150ce8ec9f0e2bacd196c9a61f1c9f53557f067 files/confd 545 -SHA256 d515671f139346563cfc040249b03fe7ba1cd32d8e4c8f9948afff8fd5906b49 files/confd 545 -AUX rc-addon.sh 207 RMD160 d9a426c98e5ebbfca99caf1a1132f2b3f6a74715 SHA1 384b384972f0fa0cf4facc7ef73f62f06ceb3e23 SHA256 f0d8531b7e6e1cf83c9a57f8902a905fcb18ab5a5c8950893a64f4cabf660f5c -MD5 b6f5f97cf699156fd33a0bc3cd61f8c1 files/rc-addon.sh 207 -RMD160 d9a426c98e5ebbfca99caf1a1132f2b3f6a74715 files/rc-addon.sh 207 -SHA256 f0d8531b7e6e1cf83c9a57f8902a905fcb18ab5a5c8950893a64f4cabf660f5c files/rc-addon.sh 207 +AUX confd 448 RMD160 472fe6800a9468eef3514e6efd55997520142fef SHA1 78623ae6c1a7ef3a06a9be97bafd83be13d8d0be SHA256 1cb5e289b90b1fc6beb828beb63d0631427d48ec86321fd58e742f5592007a80 +MD5 fa5c4ab15ac1b2291b77a6574d8ea590 files/confd 448 +RMD160 472fe6800a9468eef3514e6efd55997520142fef files/confd 448 +SHA256 1cb5e289b90b1fc6beb828beb63d0631427d48ec86321fd58e742f5592007a80 files/confd 448 +AUX confd-0.85 550 RMD160 211c21aa382c37344d1afbd7e5d23510475e0e7e SHA1 f5b6b0b925fe472f04b0151ffdad1f342c889515 SHA256 cb9731d5f012cd540d95d8116077c2631eb5db5ec2ef6ec17d0d63f6791e1699 +MD5 249d1e2925ac6457064aa574d264515f files/confd-0.85 550 +RMD160 211c21aa382c37344d1afbd7e5d23510475e0e7e files/confd-0.85 550 +SHA256 cb9731d5f012cd540d95d8116077c2631eb5db5ec2ef6ec17d0d63f6791e1699 files/confd-0.85 550 +AUX rc-addon.sh 500 RMD160 6ba2adba5fe1d163d140fdb370e574303dd6d7f8 SHA1 507345975905c65d70e0054fac586ae23410616f SHA256 8f71f16bea6cb27650a0907f57af7b7092b03022f9668b3b19478538b993aa11 +MD5 3b388c7a7206e6a7e8ee87d2be49c4b7 files/rc-addon.sh 500 +RMD160 6ba2adba5fe1d163d140fdb370e574303dd6d7f8 files/rc-addon.sh 500 +SHA256 8f71f16bea6cb27650a0907f57af7b7092b03022f9668b3b19478538b993aa11 files/rc-addon.sh 500 +AUX rc-addon.sh-0.85 160 RMD160 59a7624d495e4a52b1d8479e7512b275351c520f SHA1 9a216f20fbe1a788003ee0a714f4f3dcf58ccb19 SHA256 63587f743d49062cc80adf92fc873f4f5fa464fd0d39280138848db81d8226dd +MD5 6e5c984c531ee202988ad2e8793b471f files/rc-addon.sh-0.85 160 +RMD160 59a7624d495e4a52b1d8479e7512b275351c520f files/rc-addon.sh-0.85 160 +SHA256 63587f743d49062cc80adf92fc873f4f5fa464fd0d39280138848db81d8226dd files/rc-addon.sh-0.85 160 DIST vdr-bitstreamout-0.85.tar.bz2 168603 RMD160 053cbb7434df36639117c15185fd40b055e89d16 SHA1 c0354e1a268bc57b2995dc41376a305a73e82fea SHA256 8c7084defdce262f57adb37b5dc053675689c340813d10783cf26a4eb781d3e8 -EBUILD vdr-bitstreamout-0.85.ebuild 888 RMD160 dfe300f18384dff69be6dc0c126e0f9de1312821 SHA1 705dd9b0593189f888fa310793da2e416e242cbf SHA256 ecdc7c6f22d0ae69070b8eea9ab2bf5ba72d68946ab0daf4acc9baafea7f813e -MD5 83e4dd3ce428f4650846349d95246e4d vdr-bitstreamout-0.85.ebuild 888 -RMD160 dfe300f18384dff69be6dc0c126e0f9de1312821 vdr-bitstreamout-0.85.ebuild 888 -SHA256 ecdc7c6f22d0ae69070b8eea9ab2bf5ba72d68946ab0daf4acc9baafea7f813e vdr-bitstreamout-0.85.ebuild 888 -MISC ChangeLog 1103 RMD160 756534e5d56be4b7ee5d76b2a385d405d830aca1 SHA1 3f0c7d3141b4d2e16e09dc3ac067496c0f889e66 SHA256 d6d32d8239b146063ec6154dd3d768c086ddcc4c90809353deb3ed38c81ae07a -MD5 bc70fd8c60b043a0daff520db2fa404d ChangeLog 1103 -RMD160 756534e5d56be4b7ee5d76b2a385d405d830aca1 ChangeLog 1103 -SHA256 d6d32d8239b146063ec6154dd3d768c086ddcc4c90809353deb3ed38c81ae07a ChangeLog 1103 +EBUILD vdr-bitstreamout-0.85-r1.ebuild 894 RMD160 723dbeed5d1baefb5999f533753d0c2396a273f3 SHA1 9d8598c031e19de9bef936c96cd3a551aeeb5aba SHA256 d274761a3104dbff9e033cea3a10767bb7e1a88512bc792a1d19399a80128901 +MD5 901815f9d98ced959c89e1798057e45c vdr-bitstreamout-0.85-r1.ebuild 894 +RMD160 723dbeed5d1baefb5999f533753d0c2396a273f3 vdr-bitstreamout-0.85-r1.ebuild 894 +SHA256 d274761a3104dbff9e033cea3a10767bb7e1a88512bc792a1d19399a80128901 vdr-bitstreamout-0.85-r1.ebuild 894 +EBUILD vdr-bitstreamout-0.85.ebuild 973 RMD160 d14ce82603204f2ac59b257d12addf54ad76c8e6 SHA1 79ef80c0edb21b63090fa7e0772cb335be5f6c3a SHA256 0e93d74e056be7f7eb67c3dc74fa8c6784c41a8662a24817a9803e0aced844ff +MD5 d6001379628041492ecc4cbbc0ef2b00 vdr-bitstreamout-0.85.ebuild 973 +RMD160 d14ce82603204f2ac59b257d12addf54ad76c8e6 vdr-bitstreamout-0.85.ebuild 973 +SHA256 0e93d74e056be7f7eb67c3dc74fa8c6784c41a8662a24817a9803e0aced844ff vdr-bitstreamout-0.85.ebuild 973 +MISC ChangeLog 1411 RMD160 143dd19ddd8c2ea5e70df7742269c48648856468 SHA1 363804de74cf42c2fdf1b3f6cb5d20d72a81c430 SHA256 a6f8d85b26c8772177841d7af7dfcf8393927ada411bf1252e85407dfe778fab +MD5 118bbfc45a1c6f84e40300a79a529021 ChangeLog 1411 +RMD160 143dd19ddd8c2ea5e70df7742269c48648856468 ChangeLog 1411 +SHA256 a6f8d85b26c8772177841d7af7dfcf8393927ada411bf1252e85407dfe778fab ChangeLog 1411 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -25,10 +37,13 @@ SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata MD5 45356cb364a75152c6956337531ca995 files/digest-vdr-bitstreamout-0.85 268 RMD160 aaf230f688156fa222c3f07b27679ae48c2a242a files/digest-vdr-bitstreamout-0.85 268 SHA256 e82621518ce03a686965181e6f8bfc4e263d4ed949b3b2ba5cb71ebefcdf08e1 files/digest-vdr-bitstreamout-0.85 268 +MD5 45356cb364a75152c6956337531ca995 files/digest-vdr-bitstreamout-0.85-r1 268 +RMD160 aaf230f688156fa222c3f07b27679ae48c2a242a files/digest-vdr-bitstreamout-0.85-r1 268 +SHA256 e82621518ce03a686965181e6f8bfc4e263d4ed949b3b2ba5cb71ebefcdf08e1 files/digest-vdr-bitstreamout-0.85-r1 268 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE4tiyt2vP6XvVdOcRAl7DAJ4qcfG4ZZ5j6q+RyDAa0yuyWv7LkACeMtKd -hGfaE+qGx7BlYxb7aN7ub9k= -=W54l +iD8DBQFFKQMLt2vP6XvVdOcRAlr5AJ9i8GOI+ADTXGVrJ5r5WSk9aMF+IACguYiP +2wspqy1JSLY14bcDzvcLZlc= +=3jaL -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-bitstreamout/files/confd b/media-plugins/vdr-bitstreamout/files/confd index d626bdaaa01f..5e1e87d666db 100644 --- a/media-plugins/vdr-bitstreamout/files/confd +++ b/media-plugins/vdr-bitstreamout/files/confd @@ -1,12 +1,11 @@ # /etc/conf.d/vdr.bitstreamout: -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd,v 1.2 2006/03/14 19:36:34 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd,v 1.3 2006/10/08 13:54:07 zzam Exp $ # Global config file for vdr plugin bitstreamout -# You may use mute.sh for muting the S/P-DIF out of the -# sound card even if not used for AC3. Note that this -# script is designed for a C-Media PCI CMI8738 based sound card. -# Please modify vdr_mute.sh depending of your sound-card -#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_cmi8738.sh" -#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_soundblaster.sh" +# You may use some mute-script for muting the S/P-DIF out of the +# sound card even if not used for AC3. +# You can create your own mute-script under /usr/share/vdr/bitstreamout if needed +#BITSTREAMOUT_MUTE="cmi8738" +#BITSTREAMOUT_MUTE="soundblaster" diff --git a/media-plugins/vdr-bitstreamout/files/confd-0.85 b/media-plugins/vdr-bitstreamout/files/confd-0.85 new file mode 100644 index 000000000000..cabb1d23552e --- /dev/null +++ b/media-plugins/vdr-bitstreamout/files/confd-0.85 @@ -0,0 +1,12 @@ +# /etc/conf.d/vdr.bitstreamout: +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/files/confd-0.85,v 1.1 2006/10/08 13:54:07 zzam Exp $ + +# Global config file for vdr plugin bitstreamout + +# You may use mute.sh for muting the S/P-DIF out of the +# sound card even if not used for AC3. Note that this +# script is designed for a C-Media PCI CMI8738 based sound card. +# Please modify vdr_mute.sh depending of your sound-card +#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_cmi8738.sh" +#BITSTREAMOUT_MUTE="/usr/lib/vdr/bin/mute_soundblaster.sh" + diff --git a/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1 b/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1 new file mode 100644 index 000000000000..153710435901 --- /dev/null +++ b/media-plugins/vdr-bitstreamout/files/digest-vdr-bitstreamout-0.85-r1 @@ -0,0 +1,3 @@ +MD5 f30e23e10ecad1e4ecf24bd261f7b8ba vdr-bitstreamout-0.85.tar.bz2 168603 +RMD160 053cbb7434df36639117c15185fd40b055e89d16 vdr-bitstreamout-0.85.tar.bz2 168603 +SHA256 8c7084defdce262f57adb37b5dc053675689c340813d10783cf26a4eb781d3e8 vdr-bitstreamout-0.85.tar.bz2 168603 diff --git a/media-plugins/vdr-bitstreamout/files/rc-addon.sh b/media-plugins/vdr-bitstreamout/files/rc-addon.sh index a6815bf3a955..38e34ad6ee91 100755 --- a/media-plugins/vdr-bitstreamout/files/rc-addon.sh +++ b/media-plugins/vdr-bitstreamout/files/rc-addon.sh @@ -1,10 +1,19 @@ # plugin-startup-skript for bitstreamout-plugin plugin_pre_vdr_start() { - [[ -n "${BITSTREAMOUT_MUTE}" ]] && "--mute=${BITSTREAMOUT_MUTE}" -} + if [[ -n "${BITSTREAMOUT_MUTE}" ]]; then + local mydir=/usr/share/vdr/bitstreamout + + if [[ ${BITSTREAMOUT_MUTE:0:1} != "/" ]] && [[ -x ${mydir}/mute_${BITSTREAMOUT_MUTE}.sh ]]; then + BITSTREAMOUT_MUTE=${mydir}/mute_${BITSTREAMOUT_MUTE}.sh + fi -if [[ ${SCRIPT_API:-1} -lt 2 ]]; then - plugin_pre_vdr_start -fi + + if [[ -x ${BITSTREAMOUT_MUTE} ]]; then + add_plugin_param "--mute=${BITSTREAMOUT_MUTE}" + else + einfo " bitstreamout: ${BITSTREAMOUT_MUTE} is not executable" + fi + fi +} diff --git a/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85 b/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85 new file mode 100755 index 000000000000..113ccdaed5d6 --- /dev/null +++ b/media-plugins/vdr-bitstreamout/files/rc-addon.sh-0.85 @@ -0,0 +1,6 @@ +# plugin-startup-skript for bitstreamout-plugin + +plugin_pre_vdr_start() { + [[ -n "${BITSTREAMOUT_MUTE}" ]] && add_plugin_param "--mute=${BITSTREAMOUT_MUTE}" +} + diff --git a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild new file mode 100644 index 000000000000..ee6e916990b8 --- /dev/null +++ b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85-r1.ebuild,v 1.1 2006/10/08 13:54:06 zzam Exp $ + +IUSE="" + +inherit vdr-plugin + +DESCRIPTION="VDR plugin: play ac3 sound over SPDIF-port of an alsa-compatible soundcard" +HOMEPAGE="http://bitstreamout.sourceforge.net" +SRC_URI="mirror://sourceforge/bitstreamout/${P}.tar.bz2" +KEYWORDS="~x86 ~amd64" +SLOT="0" +LICENSE="GPL-2" + +DEPEND=">=media-video/vdr-1.2.6 + >=media-libs/alsa-lib-0.9.8 + >=media-sound/alsa-utils-0.9.8 + >=media-libs/libmad-0.14.2b-r2 + " + +src_install() { + vdr-plugin_src_install + + doman vdr-bitstreamout.5 + dodoc ChangeLog Description PROBLEMS + dodoc ${S}/doc/* + + cd ${S}/mute + dodoc README* + + insinto /usr/share/vdr/bin + insopts -m0755 + + for f in *.sh; do + newins ${f} mute_${f} + done +} + diff --git a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild index 486e7057bbf9..7893520254aa 100644 --- a/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild +++ b/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild,v 1.3 2006/08/16 08:34:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-bitstreamout/vdr-bitstreamout-0.85.ebuild,v 1.4 2006/10/08 13:54:06 zzam Exp $ IUSE="" @@ -19,6 +19,9 @@ DEPEND=">=media-video/vdr-1.2.6 >=media-libs/libmad-0.14.2b-r2 " +VDR_CONFD_FILE=${FILESDIR}/confd-0.85 +VDR_RCADDON_FILE=${FILESDIR}/rc-addon.sh-0.85 + src_install() { vdr-plugin_src_install