From 87d40d3e5e38e4410e8f676a8c469d7eb7c065f9 Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Sun, 9 Jan 2005 06:35:03 +0000 Subject: [PATCH] fixes bug #76469. --- media-video/mplayer/ChangeLog | 8 ++- media-video/mplayer/Manifest | 72 ++++++++----------- .../mplayer/mplayer-1.0_pre5-r4.ebuild | 6 +- .../mplayer/mplayer-1.0_pre5-r5.ebuild | 6 +- media-video/mplayer/mplayer-1.0_pre6.ebuild | 6 +- 5 files changed, 47 insertions(+), 51 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index bd2b151583cb..fc5c2749038e 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.251 2005/01/06 22:10:26 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.252 2005/01/09 06:35:03 luckyduck Exp $ + + 09 Jan 2005; Jan Brinkmann + mplayer-1.0_pre5-r4.ebuild, mplayer-1.0_pre5-r5.ebuild, + mplayer-1.0_pre6.ebuild: + made some trivial changes to the alsa related warning in pkg_postinst. fixes + bug #76469. 07 Jan 2005; Chris White mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 9fd2c9c0b857..300f4845327f 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,50 +1,40 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 58688457a0d09cf8fbd007b152057e78 ChangeLog 46209 -MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 -MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225 +MD5 c3b71d9ff1fd6387fa44af207588a8d6 mplayer-1.0_pre5-r5.ebuild 16392 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050 +MD5 f308cc0aef3f665d0d3f981d0e751b57 mplayer-1.0_pre6.ebuild 15413 +MD5 bbf3eb6ef8895797dadbd05cb78985ae mplayer-1.0_pre5-r4.ebuild 16471 +MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225 +MD5 8dd858cb06f0088bd45505918581ff80 ChangeLog 46439 MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870 -MD5 52714ea18e966f225eef7e6a4ad2106c mplayer-1.0_pre5-r4.ebuild 16472 -MD5 b07e49fc25003f43c107190978308ebb mplayer-1.0_pre5-r5.ebuild 16392 -MD5 64406efaa293bfd9120f5ddb71509d3e mplayer-1.0_pre6.ebuild 15414 -MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053 -MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358 -MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440 -MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440 -MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510 -MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981 -MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 -MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 -MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299 -MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650 -MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267 -MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459 -MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691 -MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281 -MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378 -MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043 -MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459 -MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853 -MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597 +MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 +MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534 MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505 -MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730 -MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119 +MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043 +MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650 +MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107 +MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853 +MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 +MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613 +MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845 +MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119 +MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691 +MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981 +MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950 +MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 +MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281 +MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 +MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597 MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 -MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514 -MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613 -MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511 -MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534 MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFB3bdqFdQwWVoAgN4RAl0BAJ9M1NgGRnllhZXPYFtGH8m5A1Gr+gCgj3cl -TDZm5AXqnZnq5SmNXTewK9E= -=q7SL ------END PGP SIGNATURE----- +MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358 +MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440 +MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440 +MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510 +MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514 +MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299 +MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053 +MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267 +MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378 diff --git a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild index f4b9af733a6f..8fec2c623480 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.27 2005/01/05 23:24:19 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r4.ebuild,v 1.28 2005/01/09 06:35:03 luckyduck Exp $ inherit eutils flag-o-matic kernel-mod @@ -534,12 +534,12 @@ pkg_postinst() { fi if use alsa ; then - einfo "For those using alsa, please note the vo driver name is no longer" + einfo "For those using alsa, please note the ao driver name is no longer" einfo "alsa9x or alsa1x. It is now just 'alsa' (omit quotes)." einfo "The syntax for optional drivers has also changed. For example" einfo "if you use a dmix driver called 'dmixer,' use" einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer" - einfo "Some users may not need to specify the extra driver with the vo=" + einfo "Some users may not need to specify the extra driver with the ao=" einfo "command." fi } diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild index 8ac00377a1f6..79388c056262 100644 --- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.9 2005/01/06 22:10:26 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.10 2005/01/09 06:35:03 luckyduck Exp $ inherit eutils flag-o-matic kernel-mod @@ -536,12 +536,12 @@ pkg_postinst() { fi if use alsa ; then - einfo "For those using alsa, please note the vo driver name is no longer" + einfo "For those using alsa, please note the ao driver name is no longer" einfo "alsa9x or alsa1x. It is now just 'alsa' (omit quotes)." einfo "The syntax for optional drivers has also changed. For example" einfo "if you use a dmix driver called 'dmixer,' use" einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer" - einfo "Some users may not need to specify the extra driver with the vo=" + einfo "Some users may not need to specify the extra driver with the ao=" einfo "command." fi } diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild index b4ac02e5c837..5c2146786d2a 100644 --- a/media-video/mplayer/mplayer-1.0_pre6.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.8 2005/01/06 22:10:26 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.9 2005/01/09 06:35:03 luckyduck Exp $ inherit eutils flag-o-matic kernel-mod @@ -509,12 +509,12 @@ pkg_postinst() { fi if use alsa ; then - einfo "For those using alsa, please note the vo driver name is no longer" + einfo "For those using alsa, please note the ao driver name is no longer" einfo "alsa9x or alsa1x. It is now just 'alsa' (omit quotes)." einfo "The syntax for optional drivers has also changed. For example" einfo "if you use a dmix driver called 'dmixer,' use" einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer" - einfo "Some users may not need to specify the extra driver with the vo=" + einfo "Some users may not need to specify the extra driver with the ao=" einfo "command." fi } -- 2.26.2