diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-07-16 21:13:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-07-16 21:13:29 +0000 |
| commit | 4c226079f5df149d6882298b19790ea2665f5eda (patch) | |
| tree | 302f176ed960220709c52b44895974051ef64229 /media-sound/lame | |
| parent | Add latest upstream bug fixes, thanks to Yar Odin <yarodin@gmail.com> (#231861). (diff) | |
| download | gentoo-2-4c226079f5df149d6882298b19790ea2665f5eda.tar.gz gentoo-2-4c226079f5df149d6882298b19790ea2665f5eda.tar.bz2 gentoo-2-4c226079f5df149d6882298b19790ea2665f5eda.zip | |
Update PIC patch, thanks again to the PaX Team.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'media-sound/lame')
| -rw-r--r-- | media-sound/lame/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/lame/files/lame-3.98-pic-fix.patch | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog index 486ddf7ffe86..057de1624bc2 100644 --- a/media-sound/lame/ChangeLog +++ b/media-sound/lame/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/lame # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.98 2008/07/16 21:03:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.99 2008/07/16 21:13:28 aballier Exp $ + + 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> + files/lame-3.98-pic-fix.patch: + Update PIC patch, thanks again to the PaX Team. 16 Jul 2008; Alexis Ballier <aballier@gentoo.org> lame-3.98.ebuild: Fix parallel make when enabling nasm. diff --git a/media-sound/lame/files/lame-3.98-pic-fix.patch b/media-sound/lame/files/lame-3.98-pic-fix.patch index e4e1088f899e..8874611cf49f 100644 --- a/media-sound/lame/files/lame-3.98-pic-fix.patch +++ b/media-sound/lame/files/lame-3.98-pic-fix.patch @@ -1,6 +1,6 @@ diff -urp lame-398-orig/libmp3lame/i386/choose_table.nas lame-398/libmp3lame/i386/choose_table.nas ---- lame-398-orig/libmp3lame/i386/choose_table.nas 2008-07-16 13:53:55.000000000 +0200 -+++ lame-398/libmp3lame/i386/choose_table.nas 2008-07-16 14:06:08.000000000 +0200 +--- lame-398-orig/libmp3lame/i386/choose_table.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/choose_table.nas 2008-07-16 21:47:30.000000000 +0200 @@ -111,33 +111,42 @@ choose_table_H dw 0x1d16, 0x1e16, 0x1e17, 0x1f17, 0x1f17 @@ -242,8 +242,8 @@ diff -urp lame-398-orig/libmp3lame/i386/choose_table.nas lame-398/libmp3lame/i38 end diff -urp lame-398-orig/libmp3lame/i386/fft3dn.nas lame-398/libmp3lame/i386/fft3dn.nas ---- lame-398-orig/libmp3lame/i386/fft3dn.nas 2008-07-16 13:53:55.000000000 +0200 -+++ lame-398/libmp3lame/i386/fft3dn.nas 2008-07-16 13:54:07.000000000 +0200 +--- lame-398-orig/libmp3lame/i386/fft3dn.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/fft3dn.nas 2008-07-16 21:47:30.000000000 +0200 @@ -24,26 +24,35 @@ D_1_0_0_0 dd 0.0 , 1.0 segment_code @@ -436,8 +436,8 @@ diff -urp lame-398-orig/libmp3lame/i386/fft3dn.nas lame-398/libmp3lame/i386/fft3 popd ebp, ebx, esi, edi endproc diff -urp lame-398-orig/libmp3lame/i386/fftsse.nas lame-398/libmp3lame/i386/fftsse.nas ---- lame-398-orig/libmp3lame/i386/fftsse.nas 2008-07-16 13:53:55.000000000 +0200 -+++ lame-398/libmp3lame/i386/fftsse.nas 2008-07-16 13:54:07.000000000 +0200 +--- lame-398-orig/libmp3lame/i386/fftsse.nas 2008-07-16 21:47:19.000000000 +0200 ++++ lame-398/libmp3lame/i386/fftsse.nas 2008-07-16 21:48:10.000000000 +0200 @@ -25,6 +25,12 @@ costab_fft:
S_SQRT2 dd 1.414213562
@@ -460,8 +460,10 @@ diff -urp lame-398-orig/libmp3lame/i386/fftsse.nas lame-398/libmp3lame/i386/ffts +%assign _P 4*5
;2つ目のループ
- mov eax,[esp+_P+4] ;eax=fz
- mov ebp,[esp+_P+8] ;=n
+- mov eax,[esp+_P+4] ;eax=fz
+- mov ebp,[esp+_P+8] ;=n
++ mov eax,[esp+_P+0] ;eax=fz
++ mov ebp,[esp+_P+4] ;=n
shl ebp,3
add ebp,eax ; fn = fz + n, この関数終了まで不変
+ push ebp
|