summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-04-28 05:16:51 +0000
committerTravis Tilley <lv@gentoo.org>2004-04-28 05:16:51 +0000
commitf64cca943d3063d51fa7e646f7f4f6c83f02a3b7 (patch)
tree93df890c00403fc3d9f11ca617e1b312742091d4 /media-video
parentarm KEYWORD (diff)
downloadhistorical-f64cca943d3063d51fa7e646f7f4f6c83f02a3b7.tar.gz
historical-f64cca943d3063d51fa7e646f7f4f6c83f02a3b7.tar.bz2
historical-f64cca943d3063d51fa7e646f7f4f6c83f02a3b7.zip
gcc 3.4 fix
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog7
-rw-r--r--media-video/mplayer/Manifest6
-rw-r--r--media-video/mplayer/files/mplayer-1.0_pre3-alsa-gcc34.patch11
-rw-r--r--media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch85
-rw-r--r--media-video/mplayer/mplayer-1.0_pre3-r5.ebuild6
5 files changed, 111 insertions, 4 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index f4c616ba08ea..62a14e0af6f6 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.122 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.123 2004/04/28 05:16:51 lv Exp $
+
+ 28 Apr 2004; Travis Tilley <lv@gentoo.org>
+ +files/mplayer-1.0_pre3-alsa-gcc34.patch,
+ +files/mplayer-1.0_pre3-libavcodec-gcc34.patch, mplayer-1.0_pre3-r5.ebuild:
+ added a fix for compiling with gcc 3.4. yaaay! =)
19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> mplayer-0.92-r1.ebuild,
mplayer-1.0_pre2-r1.ebuild, mplayer-1.0_pre3-r3.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ba6534a914d9..38bd4a7c36fd 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,9 +1,9 @@
MD5 b5879bc6ed587fe09e782b09e9e3f277 mplayer-1.0_pre3-r4.ebuild 11918
MD5 9c167eef5d63ea7678acdd6c6103e973 mplayer-1.0_pre3-r3.ebuild 11616
MD5 9f75c8a10e051291440089e942831bfa mplayer-1.0_pre2-r1.ebuild 11502
-MD5 deb6851cfa583aef8072b057fc247be4 mplayer-1.0_pre3-r5.ebuild 11410
+MD5 44f20c5153da3d51b91a584eb94b0189 mplayer-1.0_pre3-r5.ebuild 11512
MD5 dd623a5ef4090e678cee2a8dd3511c84 mplayer-0.92-r1.ebuild 11635
-MD5 69a905c49727314c2b215d46e2521235 ChangeLog 21163
+MD5 cb18acc0995b3473b987e054441829eb ChangeLog 21377
MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
@@ -11,6 +11,7 @@ MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515
MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 625fb9d5c99a6fef0ea480d446aefb7f files/mplayer-1.0_pre3-alsa-gcc34.patch 328
MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411
@@ -22,4 +23,5 @@ MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358
MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358
MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358
MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358
+MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010
MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-alsa-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre3-alsa-gcc34.patch
new file mode 100644
index 000000000000..a510b7a61b8a
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre3-alsa-gcc34.patch
@@ -0,0 +1,11 @@
+--- MPlayer-1.0pre3/libao2/ao_alsa9.c 2003-10-04 12:28:58.000000000 -0500
++++ MPlayer-1.0pre3/libao2/ao_alsa9_.c 2004-04-10 15:28:37.057002080 -0500
+@@ -341,7 +341,7 @@
+ strcpy(devstr, "surround51");
+ alsa_device = devstr;
+ break;
+- default:
++ default: ;
+ }
+ }
+
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch
new file mode 100644
index 000000000000..934c7eca5ea1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch
@@ -0,0 +1,85 @@
+diff -uprN ffmpeg/libavcodec/i386/dsputil_mmx.c ffmpeg_new/libavcodec/i386/dsputil_mmx.c
+--- ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-02-06 03:12:37.000000000 +0100
++++ ffmpeg_new/libavcodec/i386/dsputil_mmx.c 2004-02-15 23:56:39.665798024 +0100
+@@ -31,14 +31,14 @@ extern const uint8_t ff_h263_loop_filter
+ int mm_flags; /* multimedia extension flags */
+
+ /* pixel operations */
+-static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
+-static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
+-static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
+-
+-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
+-static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
+-static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
+-static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
++static const uint64_t mm_bone __attribute_used__ __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
++static const uint64_t mm_wone __attribute_used__ __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
++static const uint64_t mm_wtwo __attribute_used__ __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
++
++static const uint64_t ff_pw_20 __attribute_used__ __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
++static const uint64_t ff_pw_3 __attribute_used__ __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
++static const uint64_t ff_pw_16 __attribute_used__ __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
++static const uint64_t ff_pw_15 __attribute_used__ __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
+
+ static const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
+
+diff -uprN ffmpeg/libavcodec/i386/motion_est_mmx.c ffmpeg_new/libavcodec/i386/motion_est_mmx.c
+--- ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-01-10 17:04:55.000000000 +0100
++++ ffmpeg_new/libavcodec/i386/motion_est_mmx.c 2004-02-15 23:54:54.595771096 +0100
+@@ -27,7 +27,7 @@ static const __attribute__ ((aligned(8))
+ 0x0002000200020002ULL,
+ };
+
+-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
++static __attribute_used__ __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
+
+ static inline void sad8_1_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
+ {
+diff -uprN ffmpeg/libavcodec/i386/simple_idct_mmx.c ffmpeg_new/libavcodec/i386/simple_idct_mmx.c
+--- ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-09-15 21:18:28.000000000 +0200
++++ ffmpeg_new/libavcodec/i386/simple_idct_mmx.c 2004-02-15 23:49:54.101453176 +0100
+@@ -45,8 +45,8 @@
+ #define ROW_SHIFT 11
+ #define COL_SHIFT 20 // 6
+
+-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
+-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
++static const uint64_t __attribute_used__ __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
++static const uint64_t __attribute_used__ __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
+
+ static const int16_t __attribute__((aligned(8))) coeffs[]= {
+ 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
+diff -uprN ffmpeg/libavcodec/libpostproc/postprocess.c ffmpeg_new/libavcodec/libpostproc/postprocess.c
+--- ffmpeg/libavcodec/libpostproc/postprocess.c 2004-01-31 23:58:32.000000000 +0100
++++ ffmpeg_new/libavcodec/libpostproc/postprocess.c 2004-02-15 23:59:26.014509176 +0100
+@@ -104,13 +104,13 @@ try to unroll inner for(x=0 ... loop to
+ //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
+
+ #ifdef ARCH_X86
+-static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
+-static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
+-static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
+-static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
+-static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
+-static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL;
+-static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) w05= 0x0005000500050005LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) w20= 0x0020002000200020LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) b00= 0x0000000000000000LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) b01= 0x0101010101010101LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) b02= 0x0202020202020202LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) b08= 0x0808080808080808LL;
++static uint64_t __attribute_used__ __attribute__((aligned(8))) b80= 0x8080808080808080LL;
+ #endif
+
+
+@@ -119,7 +119,7 @@ static uint8_t * const clip_tab= clip_ta
+
+ static int verbose= 0;
+
+-static const int deringThreshold= 20;
++const int deringThreshold= 20;
+
+
+ static struct PPFilter filters[]=
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
index 15d7b79e667b..2750e535f7e8 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.7 2004/04/19 22:34:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r5.ebuild,v 1.8 2004/04/28 05:16:51 lv Exp $
IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb samba lirc matroska debug joystick theora ipv6 v4l v4l2"
@@ -114,6 +114,10 @@ src_unpack() {
#Add support for another G3 cpu
epatch ${FILESDIR}/ppc750FX-fix.patch
+ # GCC 3.4 fixes
+ epatch ${FILESDIR}/${P}-libavcodec-gcc34.patch
+ epatch ${FILESDIR}/${P}-alsa-gcc34.patch
+
# Fix hppa detection
[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"