diff options
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 80 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-gcc_detection.patch | 11 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-jack.patch | 11 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre6.ebuild | 9 |
5 files changed, 82 insertions, 36 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index f3b58f6ebcd9..e6c0e07b23a0 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # 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.273 2005/02/07 20:31:18 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.274 2005/02/19 05:30:53 chriswhite Exp $ + + 19 Feb 2005; Chris White <chriswhite@gentoo.org> + +files/mplayer-gcc_detection.patch, +files/mplayer-jack.patch, + mplayer-1.0_pre6.ebuild: + Fixed endianess issues with jack output. Fixed gcc being detected improperly. 07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> mplayer-1.0_pre5-r5.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 9da20bb88221..72febf696f9a 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,44 +1,56 @@ -MD5 e8a88febcbbee42c370346d5bc1306d6 mplayer-1.0_pre5-r5.ebuild 16832 -MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050 -MD5 d7e7de1f6ce19e3252b554b77b5e100e mplayer-1.0_pre6.ebuild 16594 -MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 e0d3b3f7dedd5001641a04f06e865619 ChangeLog 50397 +MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224 MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225 -MD5 b4c95beebc940388a2ebe77c670509ae ChangeLog 50171 +MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050 MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870 -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 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730 -MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673 -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 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694 -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 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593 -MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388 -MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459 -MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845 -MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793 -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 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353 +MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471 +MD5 e8a88febcbbee42c370346d5bc1306d6 mplayer-1.0_pre5-r5.ebuild 16832 +MD5 a4e81c4d84939d0cd87ac9c85fbfdf47 mplayer-1.0_pre6.ebuild 16818 +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 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514 +MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511 +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 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053 +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 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613 +MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505 +MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534 +MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353 +MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388 +MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694 +MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 +MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673 +MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730 +MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593 +MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793 +MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107 +MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845 +MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950 +MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 +MD5 efe0d2d4856bdb10685bf499d2b6803a files/mplayer-gcc_detection.patch 390 +MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFCFs9GFdQwWVoAgN4RAqvHAKCP8cyF1JmMiHVJxSjvQI3CqMbSDQCg8i2/ +BoUAeFd+mJo6rQ++Y1K6jRQ= +=5ju8 +-----END PGP SIGNATURE----- diff --git a/media-video/mplayer/files/mplayer-gcc_detection.patch b/media-video/mplayer/files/mplayer-gcc_detection.patch new file mode 100644 index 000000000000..380d4a8c7530 --- /dev/null +++ b/media-video/mplayer/files/mplayer-gcc_detection.patch @@ -0,0 +1,11 @@ +--- configure.old 2005-02-19 13:11:58.000000000 +0900 ++++ configure 2005-02-19 13:20:22.538154224 +0900 +@@ -586,7 +586,7 @@ + echocheck "$_cc version" + cc_vendor=gnu + cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1` +- cc_version=`( $_cc -dumpversion ) 2>&1` ++ cc_version=`( $_cc -dumpversion | cut -f1,2 -d.) 2>&1` + if test "$?" -gt 0; then + cc_version="not found" + fi diff --git a/media-video/mplayer/files/mplayer-jack.patch b/media-video/mplayer/files/mplayer-jack.patch new file mode 100644 index 000000000000..c35b48a750e1 --- /dev/null +++ b/media-video/mplayer/files/mplayer-jack.patch @@ -0,0 +1,11 @@ +--- libao2/ao_jack.c_old 2005-02-13 20:59:19.789628272 +0000 ++++ libao2/ao_jack.c 2005-02-13 20:59:32.437705472 +0000 +@@ -103,7 +103,7 @@ + m = 1; + break; + default: +- format = AFMT_S16_LE; ++ format = AFMT_S16_NE; + bits_per_sample = 16; + m = 2; + break; diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild index 465455c72bc6..a578183c639f 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.27 2005/02/07 06:58:57 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.28 2005/02/19 05:30:53 chriswhite Exp $ inherit eutils flag-o-matic kernel-mod @@ -132,6 +132,13 @@ src_unpack() { # fixes bug #78337 epatch ${FILESDIR}/${PN}-avi_crash.patch + + # fixes mplayer not seeing gcc 3.4-blahetc type + # gcc versions. Half stolen from toolchain-funcs + epatch ${FILESDIR}/${PN}-gcc_detection.patch + + #fixes endian issues with jack output + epatch ${FILESDIR}/${PN}-jack.patch } linguas_warn() { |