From 11963d9126afdaf78ec44a7bb3af2b7389b60775 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 10 Oct 2005 13:08:10 +0000 Subject: [PATCH] Minor fix Package-Manager: portage-2.0.53_rc4 --- media-video/mplayer/ChangeLog | 6 +- media-video/mplayer/Manifest | 49 ++++++-------- .../files/mplayer-1.0_pre7-gcc4-amd64.patch | 65 +++++++++++++++++++ .../mplayer/mplayer-1.0_pre7-r1.ebuild | 3 +- 4 files changed, 92 insertions(+), 31 deletions(-) create mode 100644 media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 52ee280ce12f..fe457b983525 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # 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.326 2005/08/31 14:24:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.327 2005/10/10 13:08:10 lu_zero Exp $ + + 10 Oct 2005; Luca Barbato + +files/mplayer-1.0_pre7-gcc4-amd64.patch, mplayer-1.0_pre7-r1.ebuild: + Fix for gcc-4.0.1 and amd64 31 Aug 2005; Aron Griffis mplayer-1.0_pre7-r1.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 4c4d5edd1721..d062b30096fc 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,36 +1,27 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 f61b143e75e30cdba4019237e32d4de2 mplayer-1.0_pre6-r4.ebuild 18372 -MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 -MD5 97a61e5346a71af3153dc28c5f4d8570 mplayer-1.0_pre7-r1.ebuild 16041 -MD5 5a83f97412eed125cd998f4314648baa ChangeLog 60122 -MD5 a1059d3d7970cd21dbbcb9c89d0bed8d mplayer-1.0_pre6-r6.ebuild 18368 -MD5 0929553017cf92b1bc65d12df2bf6b21 mplayer-1.0_pre6-r5.ebuild 18458 -MD5 a7ee6a7da902ae3aab61ef0f6c00cea9 mplayer-1.0_pre7.ebuild 17868 -MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233 +MD5 1a80890d9b793377ed9ae445cda1b876 ChangeLog 60273 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429 +MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r5 429 +MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429 +MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428 +MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432 +MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630 +MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264 +MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534 +MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233 MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353 +MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521 MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412 -MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794 +MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788 +MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388 MD5 e1fd1f0b9ee787f83ff0969f512d40d5 files/mplayer-gcc_detection.patch 611 MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272 -MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428 +MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673 -MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388 -MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534 -MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429 +MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794 MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634 -MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630 -MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r5 429 -MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264 -MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432 -MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755 -MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDFb2cBXaUFmZvwyMRAnRXAJ4xBTXYeh1C2KR6wYlklkCw6N8gKACfdaPI -0D0zvmbjz4t4gcFc4YNdJ00= -=y7YW ------END PGP SIGNATURE----- +MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 +MD5 f61b143e75e30cdba4019237e32d4de2 mplayer-1.0_pre6-r4.ebuild 18372 +MD5 0929553017cf92b1bc65d12df2bf6b21 mplayer-1.0_pre6-r5.ebuild 18458 +MD5 a1059d3d7970cd21dbbcb9c89d0bed8d mplayer-1.0_pre6-r6.ebuild 18368 +MD5 51136485e6d29039b685e17c735ade1c mplayer-1.0_pre7-r1.ebuild 16082 +MD5 a7ee6a7da902ae3aab61ef0f6c00cea9 mplayer-1.0_pre7.ebuild 17868 diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch new file mode 100644 index 000000000000..d6f34634327d --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch @@ -0,0 +1,65 @@ +diff -ur MPlayer-1.0pre7try2-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-1.0pre7try2/libavcodec/libpostproc/postprocess_template.c +--- MPlayer-1.0pre7try2-orig/libavcodec/libpostproc/postprocess_template.c 2005-10-03 13:05:15.824886936 +0000 ++++ MPlayer-1.0pre7try2/libavcodec/libpostproc/postprocess_template.c 2005-10-03 12:58:26.370023055 +0000 +@@ -3496,7 +3496,7 @@ + "prefetchnta 32(%%"REG_a", %0) \n\t" + "prefetcht0 32(%%"REG_d", %2) \n\t" + :: "r" (srcBlock), "r" ((long)srcStride), "r" (dstBlock), "r" ((long)dstStride), +- "m" ((long)x), "m" ((long)copyAhead) ++ "g" ((long)x), "g" ((long)copyAhead) + : "%"REG_a, "%"REG_d + ); + +@@ -3642,7 +3642,7 @@ + "prefetchnta 32(%%"REG_a", %0) \n\t" + "prefetcht0 32(%%"REG_d", %2) \n\t" + :: "r" (srcBlock), "r" ((long)srcStride), "r" (dstBlock), "r" ((long)dstStride), +- "m" ((long)x), "m" ((long)copyAhead) ++ "g" ((long)x), "g" ((long)copyAhead) + : "%"REG_a, "%"REG_d + ); + +diff -ur MPlayer-1.0pre7try2-orig/postproc/swscale_template.c MPlayer-1.0pre7try2/postproc/swscale_template.c +--- MPlayer-1.0pre7try2-orig/postproc/swscale_template.c 2005-10-03 13:05:15.828887121 +0000 ++++ MPlayer-1.0pre7try2/postproc/swscale_template.c 2005-10-03 13:12:18.948389447 +0000 +@@ -765,14 +765,14 @@ + asm volatile( + YSCALEYUV2YV12X(0, CHR_MMX_FILTER_OFFSET) + :: "r" (&c->redDither), +- "r" (uDest), "m" ((long)chrDstW) ++ "r" (uDest), "p" ((long)chrDstW) + : "%"REG_a, "%"REG_d, "%"REG_S + ); + + asm volatile( + YSCALEYUV2YV12X(4096, CHR_MMX_FILTER_OFFSET) + :: "r" (&c->redDither), +- "r" (vDest), "m" ((long)chrDstW) ++ "r" (vDest), "p" ((long)chrDstW) + : "%"REG_a, "%"REG_d, "%"REG_S + ); + } +@@ -780,7 +780,7 @@ + asm volatile( + YSCALEYUV2YV12X(0, LUM_MMX_FILTER_OFFSET) + :: "r" (&c->redDither), +- "r" (dest), "m" ((long)dstW) ++ "r" (dest), "p" ((long)dstW) + : "%"REG_a, "%"REG_d, "%"REG_S + ); + #else +@@ -2552,8 +2552,13 @@ + "add $1, %%"REG_a" \n\t" + "cmp %2, %%"REG_a" \n\t" + " jb 1b \n\t" +- ++/* GCC-3.3 makes MPlayer crash on IA-32 machines when using "g" operand here, ++ which is needed to support GCC-4.0 */ ++#if defined(ARCH_X86_64) && ((__GNUC__ > 3) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4)) ++ :: "m" (src1), "m" (dst), "g" ((long)dstWidth), "m" (xInc_hi), "m" (xInc_lo), ++#else + :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)), ++#endif + "r" (src2) + : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi" + ); diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild index a87b9de9def5..bbd5736ff9ca 100644 --- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre7-r1.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_pre7-r1.ebuild,v 1.8 2005/08/31 14:24:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.9 2005/10/10 13:08:10 lu_zero Exp $ inherit eutils flag-o-matic @@ -128,6 +128,7 @@ src_unpack() { # Fix building with gcc4 epatch ${FILESDIR}/${P}-gcc4.patch + epatch ${FILESDIR}/${P}-gcc4-amd64.patch # fixes mplayer not seeing gcc 3.4-blahetc type # gcc versions. Half stolen from toolchain-funcs -- 2.26.2