diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-09-28 13:03:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-09-28 13:03:56 +0000 |
| commit | b9d165dd3c0b26be2ed905ec3ae5e266056ec082 (patch) | |
| tree | 374ba5bf9d7c80b6a36eb92a855c5286472d41b0 /media-libs/flac/files | |
| parent | Sparc stable --- Bug #194011 --- tests run successfully. (diff) | |
| download | gentoo-2-b9d165dd3c0b26be2ed905ec3ae5e266056ec082.tar.gz gentoo-2-b9d165dd3c0b26be2ed905ec3ae5e266056ec082.tar.bz2 gentoo-2-b9d165dd3c0b26be2ed905ec3ae5e266056ec082.zip | |
Fix TEXTRELs using patch from PaX Team from bug 193222 and while at it, attempt to clean up ebuild a bit. Revert last commit restoring elibtoolize for fbsd since eautoreconf allready does libtoolize.
(Portage version: 2.1.3.9)
Diffstat (limited to 'media-libs/flac/files')
| -rw-r--r-- | media-libs/flac/files/digest-flac-1.2.1-r1 | 3 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.2.1-asm.patch | 80 |
2 files changed, 83 insertions, 0 deletions
diff --git a/media-libs/flac/files/digest-flac-1.2.1-r1 b/media-libs/flac/files/digest-flac-1.2.1-r1 new file mode 100644 index 000000000000..061357afea8b --- /dev/null +++ b/media-libs/flac/files/digest-flac-1.2.1-r1 @@ -0,0 +1,3 @@ +MD5 153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz 2009217 +RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc flac-1.2.1.tar.gz 2009217 +SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf flac-1.2.1.tar.gz 2009217 diff --git a/media-libs/flac/files/flac-1.2.1-asm.patch b/media-libs/flac/files/flac-1.2.1-asm.patch new file mode 100644 index 000000000000..cc832eec74a2 --- /dev/null +++ b/media-libs/flac/files/flac-1.2.1-asm.patch @@ -0,0 +1,80 @@ +diff -urp flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm +--- flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm 2007-03-30 02:54:53.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm 2007-09-27 21:39:45.000000000 +0200 +@@ -140,8 +140,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 16] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align +@@ -216,8 +221,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 16] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align +@@ -315,8 +325,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + call _bitreader_read_from_client_ + %else ++%ifdef OBJ_FORMAT_elf ++ mov ebx, [esp + 20] ; saved ebx (GOT base) ++ call bitreader_read_from_client_ wrt ..plt ++%else + call bitreader_read_from_client_ + %endif ++%endif + pop edx ; /* discard, unused */ + pop ecx ; /* restore */ + mov esi, [ebp + 16] ; cwords = br->consumed_words; +@@ -362,13 +377,20 @@ cident FLAC__bitreader_read_rice_signed_ + mov [ebp + 16], esi ; br->consumed_words = cwords; + mov [ebp + 20], ecx ; br->consumed_bits = cbits; + push ecx ; /* save */ ++ push ebx ; /* save */ + push ebp ; /* push br argument */ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + call _bitreader_read_from_client_ + %else ++%ifdef OBJ_FORMAT_elf ++ mov ebx, [esp + 24] ; saved ebx (GOT base) ++ call bitreader_read_from_client_ wrt ..plt ++%else + call bitreader_read_from_client_ + %endif ++%endif + pop edx ; /* discard, unused */ ++ pop ebx ; /* restore */ + pop ecx ; /* restore */ + mov esi, [ebp + 16] ; cwords = br->consumed_words; + ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; +@@ -437,8 +459,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 24] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align |