summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-06-26 01:16:22 +0000
committerDaniel Goller <morfic@gentoo.org>2004-06-26 01:16:22 +0000
commit1826b3d93dec118c534f986487f66262c264a8f3 (patch)
tree04670e8838639337875356e3760c03e598398a67 /media-video/transcode/files
parentLong-overdue revision bump. There may be issues in building w/ gcc-3.4.x, bu... (diff)
downloadhistorical-1826b3d93dec118c534f986487f66262c264a8f3.tar.gz
historical-1826b3d93dec118c534f986487f66262c264a8f3.tar.bz2
historical-1826b3d93dec118c534f986487f66262c264a8f3.zip
Applying 2nd patch to allow compilation with gcc-3.4.0, fixes #49457
Diffstat (limited to 'media-video/transcode/files')
-rw-r--r--media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch b/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch
new file mode 100644
index 000000000000..43e1ca8dde34
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.12-gcc-3.4.patch
@@ -0,0 +1,40 @@
+diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c
+--- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/dsputil_mmx.c 2003-12-30 10:02:10.000000000 +0000
++++ transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c 2004-05-21 19:47:12.808592624 +0000
+@@ -31,8 +31,8 @@
+ 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_20 __attribute__ ((aligned(8), used)) = 0x0014001400140014ULL;
++static const uint64_t ff_pw_3 __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL;
+ static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
+ static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
+
+diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c
+--- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/motion_est_mmx.c 2003-12-30 10:02:10.000000000 +0000
++++ transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c 2004-05-21 19:44:37.969131800 +0000
+@@ -26,7 +26,7 @@
+ 0x0002000200020002ULL,
+ };
+
+-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
++static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL;
+
+ static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
+ {
+diff -ur transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c
+--- transcode-0.6.12.orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2003-12-20 11:49:12.000000000 +0000
++++ transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c 2004-05-21 19:48:06.594415936 +0000
+@@ -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__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL;
++static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL;
+
+ static const int16_t __attribute__((aligned(8))) coeffs[]= {
+ 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,