summaryrefslogtreecommitdiffstats
path: root/media-plugins/xmms-flac/files
diff options
context:
space:
mode:
Diffstat (limited to 'media-plugins/xmms-flac/files')
-rw-r--r--media-plugins/xmms-flac/files/flac-1.2.1-asm.patch80
-rw-r--r--media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch22
-rw-r--r--media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch12
-rw-r--r--media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch11
4 files changed, 0 insertions, 125 deletions
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch b/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch
deleted file mode 100644
index cc832ee..0000000
--- a/media-plugins/xmms-flac/files/flac-1.2.1-asm.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch b/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch
deleted file mode 100644
index 0d6ffb9..0000000
--- a/media-plugins/xmms-flac/files/flac-1.2.1-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur flac-1.2.1.orig/src/flac/Makefile.am flac-1.2.1/src/flac/Makefile.am
---- flac-1.2.1.orig/src/flac/Makefile.am 2007-09-11 20:56:51.000000000 +0300
-+++ flac-1.2.1/src/flac/Makefile.am 2007-09-20 19:38:09.000000000 +0300
-@@ -53,6 +53,6 @@
- $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- @OGG_LIBS@ \
-- @LIBICONV@ \
-+ @LTLIBICONV@ \
- @MINGW_WINSOCK_LIBS@ \
- -lm
-diff -ur flac-1.2.1.orig/src/metaflac/Makefile.am flac-1.2.1/src/metaflac/Makefile.am
---- flac-1.2.1.orig/src/metaflac/Makefile.am 2007-09-11 20:59:25.000000000 +0300
-+++ flac-1.2.1/src/metaflac/Makefile.am 2007-09-20 19:38:25.000000000 +0300
-@@ -49,6 +49,6 @@
- $(top_builddir)/src/share/utf8/libutf8.la \
- $(top_builddir)/src/libFLAC/libFLAC.la \
- @OGG_LIBS@ \
-- @LIBICONV@ \
-+ @LTLIBICONV@ \
- @MINGW_WINSOCK_LIBS@ \
- -lm
diff --git a/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch b/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch
deleted file mode 100644
index 3910604..0000000
--- a/media-plugins/xmms-flac/files/flac-1.2.1-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur flac-1.2.1.orig/configure.in flac-1.2.1/configure.in
---- flac-1.2.1.orig/configure.in 2007-09-13 18:48:42.000000000 +0300
-+++ flac-1.2.1/configure.in 2007-09-20 19:26:05.000000000 +0300
-@@ -301,7 +301,7 @@
- CPPFLAGS="-DNDEBUG $CPPFLAGS"
- if test "x$GCC" = xyes; then
- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
-- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+ CFLAGS="$CFLAGS"
- fi
- fi
-
diff --git a/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch b/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch
deleted file mode 100644
index 0507c95..0000000
--- a/media-plugins/xmms-flac/files/xmms-flac-ds-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -dPNur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 17:58:03.000000000 +0200
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2011-02-08 17:30:56.000000000 +0100
-@@ -30,6 +30,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
-