summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-16 21:13:29 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-16 21:13:29 +0000
commite5203e237621a89f19d9b108d8e054aaeccb88ba (patch)
tree4d2509957a04a8043dfe728b99b4941d18e8386a /media-sound/lame
parentAdd latest upstream bug fixes, thanks to Yar Odin <yarodin@gmail.com> (#231861). (diff)
downloadhistorical-e5203e237621a89f19d9b108d8e054aaeccb88ba.tar.gz
historical-e5203e237621a89f19d9b108d8e054aaeccb88ba.tar.bz2
historical-e5203e237621a89f19d9b108d8e054aaeccb88ba.zip
Update PIC patch, thanks again to the PaX Team.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64
Diffstat (limited to 'media-sound/lame')
-rw-r--r--media-sound/lame/ChangeLog6
-rw-r--r--media-sound/lame/Manifest10
-rw-r--r--media-sound/lame/files/lame-3.98-pic-fix.patch18
3 files changed, 20 insertions, 14 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/Manifest b/media-sound/lame/Manifest
index 87a0bc6e7c75..965721acd752 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -6,19 +6,19 @@ AUX lame-3.96.1-asneeded.patch 9027 RMD160 5456182576a331feb00d1d8931ba598e37f08
AUX lame-3.96.1-shared-frontend.patch 945 RMD160 0a0d2cd6dfd35bb909ba238a27d8a5d370f61a8e SHA1 c7066e2e460001853a2468dd8dffd5d418182c5b SHA256 f6af4c844776f22f24e3957a2348c4c1faab8d487b85f2deca3ddd1aa151e195
AUX lame-3.98-execstacks.patch 471 RMD160 047433da9998efc8110d592d7e1ed0862599302d SHA1 a8d44c4bddb1f6ad1b5a9dda5ed8a6f37c0335df SHA256 13cba5c2bcdcb58da1ff7b3d68e0422bc05f234da0896e3cd755a0ea003b9520
AUX lame-3.98-gtk-path.patch 8606 RMD160 8bca3b986edf75853bfaee6837f9eb4832b664fa SHA1 dc77fbe83f167eeb3f77b6677a90765395b17de9 SHA256 0728822c0eb05b6dc70c0ae8e064c9be3b2a3448d10a53764397c70b7489a3b8
-AUX lame-3.98-pic-fix.patch 14748 RMD160 69146077e45ae6445459f9af356abaa585662a4e SHA1 2451a78d06f12e4d7dcf57b11cba5d0e7a38da7c SHA256 6cd158f71be645f8f62a1268f3e7d4dfe1b722360a7073970459f197cbcbd027
+AUX lame-3.98-pic-fix.patch 14804 RMD160 443e4b1fc6a54be4d2c356ea7b4cc857f26b2a1c SHA1 551d364c34c30f6486b034f6e0789247450aae95 SHA256 f77ededd6e067a4d47ad49a0fa939290de5b248ef83a4b8a1aba52dbb0649381
AUX lame-3.98-shared-frontend.patch 1008 RMD160 8e12e752a325926e1376e45ffd3b72cac61ebf4a SHA1 af371fe673e42c4ba2e6e07255d6196d76d8ef79 SHA256 fb40bfb00e47964acbe0de428cc7a3e4b3a0e0ade120bf547891bf78031f6916
AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b SHA1 b4ebe2a3e8c343180b7d82e2bd2edb81a7c0d1bd SHA256 2fc25342cf5b5d5fd465c76f7899b0276e6e9f21b948f6005de0724a35dcc567
DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
EBUILD lame-3.97-r1.ebuild 2344 RMD160 0a9a1f527ff190af4be8537e005f228c7bca6de2 SHA1 7b8e6829846de017788b86605bedcc46590261f5 SHA256 0562fbf1fe90d783f9f04eff7b5adfabd5b0bf1865f28826852b48086f114604
EBUILD lame-3.98.ebuild 2720 RMD160 a11cdd5b19cb210e4e58dac3827e0d175e9ea012 SHA1 f97cd7edfa309b9ee86625d47b20883d792f3b66 SHA256 b6f0b47319a4101b560237815526a5416ba75820a43154a89fc8a826f713ab02
-MISC ChangeLog 13670 RMD160 bc7e16e96f1e06ce877614801846bb2cbaca6089 SHA1 ab0e8d3ed4a7143bd05c4fd16ae3e0c76681a065 SHA256 75abdda16009a9af2272ec800dcee1fc97080acce10f4923491336c52cc25d02
+MISC ChangeLog 13806 RMD160 f5fd8382fe0a212fb80b6ec7c4261980b51108c6 SHA1 b4f5fb65eba7bbbe097c2ee592bb45b1562bb1cd SHA256 0a150472fdffb9d431aaa06a4064aeadc0e12509f589739adb7909df3ab0c217
MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkh+YkUACgkQvFcC4BYPU0qdKACgwilInvsOttlhYMdL+ugnRUh9
-IHsAniOIu4JRv9D8rdMjBYG5kuoIqqRp
-=IQn9
+iEYEARECAAYFAkh+ZIEACgkQvFcC4BYPU0pVcQCfTsUKw2KTn/U7HZ/lPyMQbL/p
+ccUAn33Uu/7Zjmj9Jm8+bVTYbN7WLXTo
+=x6ei
-----END PGP SIGNATURE-----
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