summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-10-03 17:52:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-10-03 17:52:38 +0000
commit8de59c830303703f6252d642e50aee2e3165eeb3 (patch)
tree3e2714f9342706ecda62586e3bffb80890b6e601 /media-libs
parentConvert by Samuli Suominen to EAPI 2 #339027 by Marco Leogrande. (diff)
downloadgentoo-2-8de59c830303703f6252d642e50aee2e3165eeb3.tar.gz
gentoo-2-8de59c830303703f6252d642e50aee2e3165eeb3.tar.bz2
gentoo-2-8de59c830303703f6252d642e50aee2e3165eeb3.zip
old
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/audiofile/Manifest8
-rw-r--r--media-libs/audiofile/audiofile-0.2.6-r3.ebuild38
-rw-r--r--media-libs/audiofile/audiofile-0.2.6-r4.ebuild47
-rw-r--r--media-libs/audiofile/files/audiofile-0.2.6-constantise.patch320
-rw-r--r--media-libs/audiofile/files/audiofile-0.2.6-fmod.patch11
-rw-r--r--media-libs/audiofile/files/audiofile-0.2.6-m4.patch9
-rw-r--r--media-libs/audiofile/files/sfconvert-eradicator.patch144
7 files changed, 0 insertions, 577 deletions
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index ff928a15027c..770a477edda1 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,13 +1,5 @@
-AUX audiofile-0.2.6-constantise.patch 11783 RMD160 7477baadd07b8e0b9ffad8f1274062626eb3310a SHA1 47e32f3a8122d3f7b460a477f04d63b29e9b17b3 SHA256 1c71b33ae0756a56e94f42996e01991fa2b9147d9b21f7ae706df9546a3bc7a4
-AUX audiofile-0.2.6-fmod.patch 404 RMD160 8115847b6bdeb0aea1d87292ae330b50f439e08a SHA1 9a29eead0e2ace7f13c90329952ce91abb32c5fe SHA256 91f638dd3c84cf3a41533c976fe7dfe94b164ee490593cf5f2f22e57f0a10a29
-AUX audiofile-0.2.6-m4.patch 273 RMD160 c9b99a3b3d7c5e9a62d3aec0cfa7ea6e7b3932f5 SHA1 f78b0d1573fc8e2c66e2d3e7a74dda8e504d806c SHA256 4e92a0e146dd4340c7e68e9f0bf301a4ee5c485d2d13cc3d2796b08c112ca74f
AUX audiofile-largefile.patch 673 RMD160 f6a86694351bfeda50cd5f027afb2d637c6c759b SHA1 9b3e0022f7f5b62f584309790dbcc202e45654a8 SHA256 042dbe00d358d46a12ed4e8682f83e51269b44c18713f797d7121fa9effb2996
-AUX sfconvert-eradicator.patch 4387 RMD160 1dc67c79dd5f96e5f790c4da2556118a7d0465c1 SHA1 c2689fdce91f9aea489d86d167c5116b67bea0d6 SHA256 ccb469f70391331145f7f0bbb1d37f2ed3486cd2bf6a9ea38c45d87b1efde3a3
-DIST audiofile-0.2.6-constantise.patch.bz2 4455 RMD160 4b52bf57f168930589d26d22f76a4e74bc44babd SHA1 82904fecdc6d24afd77abe56657e3b95e5d761f0 SHA256 82a7bfc145c014c27f24b88ecbae8e9c3814a5f38caa7f459298e4df22864185
-DIST audiofile-0.2.6.tar.gz 374688 RMD160 b61fbc856768a5838ca5c0fad602f35205e8d037 SHA1 94a6ab8e5122bc1971cf186e5a52d032811c9bc5 SHA256 4b6167b56e21556fb07c9ef06962fe32817064c62181ba47afd3322e0d0f22a9
DIST audiofile-0.2.7.tar.gz 502448 RMD160 70327d38c6a9057045f5c59f67f45e2f6f9bf677 SHA1 1d8a5bb0ca63c7047436f136fb1fb98ea886e920 SHA256 a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2
-EBUILD audiofile-0.2.6-r3.ebuild 1030 RMD160 2d901fbecd2d2c491434dd4203b83151a34e736b SHA1 bce6be5704db2515c2d729f36cce41261f6038c8 SHA256 2e0aeec33475668eb4ec01c1f71939f5e6d0fddc652dcf434b315149876926dc
-EBUILD audiofile-0.2.6-r4.ebuild 1287 RMD160 6b61924e6f58fca749f6fde3e116f582d8b1493f SHA1 58770247217a2a0d41fc082e53efbc5040c6abd9 SHA256 5b965ef8ea46fff9e5dd7de20197e6f8797c5fb5cb0de50fecbbe33e8c7dc9a2
EBUILD audiofile-0.2.7.ebuild 1020 RMD160 55bee30e2d0a6ff9e38fe9295cc422ac6e364991 SHA1 45061fc7a687c400a8ae2e7d4464b8e06697525b SHA256 9aea9469b1866c2a51eebae3eba36487670e35bb0630537e30a3989f6458d0a0
MISC ChangeLog 9836 RMD160 4c1fa71999a60d103f96ce23be59223790029775 SHA1 f31e6fdd94572dbc49cfe8377757139414ac2b63 SHA256 1436768e909f551c7797b002bd1360937170620d2896f09d4e26669a321469a6
MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
diff --git a/media-libs/audiofile/audiofile-0.2.6-r3.ebuild b/media-libs/audiofile/audiofile-0.2.6-r3.ebuild
deleted file mode 100644
index be0fa1d16637..000000000000
--- a/media-libs/audiofile/audiofile-0.2.6-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.6-r3.ebuild,v 1.12 2007/09/22 04:54:01 tgall Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="An elegant API for accessing audio files"
-HOMEPAGE="http://www.68k.org/~michael/audiofile/"
-SRC_URI="http://www.68k.org/~michael/audiofile/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"/sfcommands
- epatch "${FILESDIR}"/sfconvert-eradicator.patch
- cd "${S}"
- epatch "${FILESDIR}"/${P}-m4.patch
- epatch "${FILESDIR}"/${P}-constantise.patch
- epatch "${FILESDIR}"/${P}-fmod.patch
-
- ### Patch for bug #118600
- epatch "${FILESDIR}"/${PN}-largefile.patch
- elibtoolize
-}
-
-src_compile() {
- econf --enable-largefile || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog README TODO NEWS NOTES
-}
diff --git a/media-libs/audiofile/audiofile-0.2.6-r4.ebuild b/media-libs/audiofile/audiofile-0.2.6-r4.ebuild
deleted file mode 100644
index 5accac13e46b..000000000000
--- a/media-libs/audiofile/audiofile-0.2.6-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.6-r4.ebuild,v 1.9 2010/02/21 04:55:25 abcd Exp $
-
-inherit libtool autotools base
-
-DESCRIPTION="An elegant API for accessing audio files"
-HOMEPAGE="http://www.68k.org/~michael/audiofile/"
-SRC_URI="http://www.68k.org/~michael/audiofile/${P}.tar.gz
- mirror://gentoo/${P}-constantise.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}"/sfconvert-eradicator.patch
- "${FILESDIR}"/${P}-m4.patch
- "${WORKDIR}"/${P}-constantise.patch
- "${FILESDIR}"/${P}-fmod.patch
-
- ### Patch for bug #118600
- "${FILESDIR}"/${PN}-largefile.patch
-)
-
-src_unpack() {
- base_src_unpack
- cd "${S}"
-
- sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
- "${S}"/test/Makefile.am \
- || die "unable to disable tests building"
-
- eautoreconf
- elibtoolize
-}
-
-src_compile() {
- econf --enable-largefile || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog README TODO NEWS NOTES
-}
diff --git a/media-libs/audiofile/files/audiofile-0.2.6-constantise.patch b/media-libs/audiofile/files/audiofile-0.2.6-constantise.patch
deleted file mode 100644
index 1be9d55845ea..000000000000
--- a/media-libs/audiofile/files/audiofile-0.2.6-constantise.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-Patch from Jason Allen to minimise memory usage marking constant reference
-tables.
-See http://bmaurer.blogspot.com/2006/03/memory-usage-with-smaps.html .
-
-diff -ur audiofile-0.2.6-orig/libaudiofile/aiff.c audiofile-0.2.6-mine/libaudiofile/aiff.c
---- audiofile-0.2.6-orig/libaudiofile/aiff.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/aiff.c 2006-03-22 02:15:50.058306000 -0500
-@@ -64,7 +64,7 @@
- static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type,
- size_t size);
-
--_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
-+const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
- {
- { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
- { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },
-@@ -77,7 +77,7 @@
- { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} }
- };
-
--int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
-+const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
- {
- AF_COMPRESSION_G711_ULAW,
- AF_COMPRESSION_G711_ALAW
-diff -ur audiofile-0.2.6-orig/libaudiofile/compression.c audiofile-0.2.6-mine/libaudiofile/compression.c
---- audiofile-0.2.6-orig/libaudiofile/compression.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/compression.c 2006-03-22 02:04:44.948739250 -0500
-@@ -37,7 +37,7 @@
- #include "units.h"
- #include "util.h"
-
--extern _CompressionUnit _af_compression[];
-+extern const _CompressionUnit _af_compression[];
-
- int _af_compression_index_from_id (int compressionid)
- {
-@@ -54,7 +54,7 @@
- return -1;
- }
-
--static _CompressionUnit *findCompression (int compressionid)
-+static const _CompressionUnit *findCompression (int compressionid)
- {
- int compressionno;
-
-diff -ur audiofile-0.2.6-orig/libaudiofile/debug.c audiofile-0.2.6-mine/libaudiofile/debug.c
---- audiofile-0.2.6-orig/libaudiofile/debug.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/debug.c 2006-03-22 01:56:31.187180000 -0500
-@@ -49,7 +49,7 @@
- #include "print.h"
- #include "debug.h"
-
--extern _CompressionUnit _af_compression[];
-+extern const _CompressionUnit _af_compression[];
-
- void _af_printid (u_int32_t id)
- {
-diff -ur audiofile-0.2.6-orig/libaudiofile/format.c audiofile-0.2.6-mine/libaudiofile/format.c
---- audiofile-0.2.6-orig/libaudiofile/format.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/format.c 2006-03-22 01:56:21.586580000 -0500
-@@ -43,7 +43,7 @@
- #include "units.h"
- #include "modules.h"
-
--extern _Unit _af_units[];
-+extern const _Unit _af_units[];
-
- AFfileoffset afGetDataOffset (AFfilehandle file, int trackid)
- {
-diff -ur audiofile-0.2.6-orig/libaudiofile/g711.c audiofile-0.2.6-mine/libaudiofile/g711.c
---- audiofile-0.2.6-orig/libaudiofile/g711.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/g711.c 2006-03-21 22:57:37.356130750 -0500
-@@ -38,7 +38,7 @@
- #define SEG_MASK (0x70) /* Segment field mask. */
-
- /* copy from CCITT G.711 specifications */
--static unsigned char _u2a[128] = { /* u- to A-law conversions */
-+static const unsigned char _u2a[128] = { /* u- to A-law conversions */
- 1, 1, 2, 2, 3, 3, 4, 4,
- 5, 5, 6, 6, 7, 7, 8, 8,
- 9, 10, 11, 12, 13, 14, 15, 16,
-@@ -56,7 +56,7 @@
- 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128};
-
--static unsigned char _a2u[128] = { /* A- to u-law conversions */
-+static const unsigned char _a2u[128] = { /* A- to u-law conversions */
- 1, 3, 5, 7, 9, 11, 13, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
-@@ -77,7 +77,7 @@
- /* see libst.h */
- #ifdef SUPERCEDED
-
--static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
-+static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
- 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
-
- static int
-diff -ur audiofile-0.2.6-orig/libaudiofile/instrument.c audiofile-0.2.6-mine/libaudiofile/instrument.c
---- audiofile-0.2.6-orig/libaudiofile/instrument.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/instrument.c 2006-03-22 01:56:12.642021000 -0500
-@@ -55,7 +55,7 @@
-
- #include <stdio.h>
-
--extern _Unit _af_units[];
-+extern const _Unit _af_units[];
-
- /*
- Initialize instrument id list for audio file.
-diff -ur audiofile-0.2.6-orig/libaudiofile/modules.c audiofile-0.2.6-mine/libaudiofile/modules.c
---- audiofile-0.2.6-orig/libaudiofile/modules.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/modules.c 2006-03-22 02:07:29.411017500 -0500
-@@ -56,15 +56,15 @@
-
- #define NULLMODULEPARAM
-
--extern _PCMInfo _af_default_signed_integer_pcm_mappings[];
--extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
--extern _PCMInfo _af_default_float_pcm_mapping;
--extern _PCMInfo _af_default_double_pcm_mapping;
-+extern const _PCMInfo _af_default_signed_integer_pcm_mappings[];
-+extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
-+extern const _PCMInfo _af_default_float_pcm_mapping;
-+extern const _PCMInfo _af_default_double_pcm_mapping;
-
- extern _CompressionUnit _af_compression[];
-
- /* Define rebuffering modules. */
--extern _AFmodule int2rebufferv2f, int2rebufferf2v;
-+extern const _AFmodule int2rebufferv2f, int2rebufferf2v;
-
- /*
- module utility routines
-@@ -1511,7 +1511,7 @@
- }
- };
-
--static _PCMInfo *intmappings[6] =
-+static const _PCMInfo *intmappings[6] =
- {
- &_af_default_signed_integer_pcm_mappings[1],
- &_af_default_signed_integer_pcm_mappings[2],
-diff -ur audiofile-0.2.6-orig/libaudiofile/next.c audiofile-0.2.6-mine/libaudiofile/next.c
---- audiofile-0.2.6-orig/libaudiofile/next.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/next.c 2006-03-22 02:15:59.742911250 -0500
-@@ -47,7 +47,7 @@
- #include "setup.h"
- #include "byteorder.h"
-
--int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
-+const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
- {
- AF_COMPRESSION_G711_ULAW,
- AF_COMPRESSION_G711_ALAW
-diff -ur audiofile-0.2.6-orig/libaudiofile/openclose.c audiofile-0.2.6-mine/libaudiofile/openclose.c
---- audiofile-0.2.6-orig/libaudiofile/openclose.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/openclose.c 2006-03-22 01:55:33.067547750 -0500
-@@ -45,7 +45,7 @@
- #define SETBINARYMODE(x)
- #endif /* WIN32 || __CYGWIN__ */
-
--extern _Unit _af_units[];
-+extern const _Unit _af_units[];
-
- static void freeFileHandle (AFfilehandle filehandle);
- static void freeInstParams (AFPVu *values, int fileFormat);
-diff -ur audiofile-0.2.6-orig/libaudiofile/pcm.c audiofile-0.2.6-mine/libaudiofile/pcm.c
---- audiofile-0.2.6-orig/libaudiofile/pcm.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/pcm.c 2006-03-21 22:56:53.581395000 -0500
-@@ -33,7 +33,7 @@
- #include "pcm.h"
- #include "util.h"
-
--_PCMInfo _af_default_signed_integer_pcm_mappings[] =
-+const _PCMInfo _af_default_signed_integer_pcm_mappings[] =
- {
- {0, 0, 0, 0},
- {SLOPE_INT8, 0, MIN_INT8, MAX_INT8},
-@@ -42,7 +42,7 @@
- {SLOPE_INT32, 0, MIN_INT32, MAX_INT32}
- };
-
--_PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
-+const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
- {
- {0, 0, 0, 0},
- {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8},
-@@ -51,10 +51,10 @@
- {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32}
- };
-
--_PCMInfo _af_default_float_pcm_mapping =
-+const _PCMInfo _af_default_float_pcm_mapping =
- {1, 0, 0, 0};
-
--_PCMInfo _af_default_double_pcm_mapping =
-+const _PCMInfo _af_default_double_pcm_mapping =
- {1, 0, 0, 0};
-
- /*
-diff -ur audiofile-0.2.6-orig/libaudiofile/query.c audiofile-0.2.6-mine/libaudiofile/query.c
---- audiofile-0.2.6-orig/libaudiofile/query.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/query.c 2006-03-22 01:55:23.070923000 -0500
-@@ -43,8 +43,8 @@
- #include "compression.h"
- #include "instrument.h"
-
--extern _Unit _af_units[];
--extern _CompressionUnit _af_compression[];
-+extern const _Unit _af_units[];
-+extern const _CompressionUnit _af_compression[];
-
- AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4);
- AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4);
-diff -ur audiofile-0.2.6-orig/libaudiofile/raw.c audiofile-0.2.6-mine/libaudiofile/raw.c
---- audiofile-0.2.6-orig/libaudiofile/raw.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/raw.c 2006-03-22 02:16:08.563462500 -0500
-@@ -50,7 +50,7 @@
- NULL /* miscellaneous */
- };
-
--int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
-+const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
- {
- AF_COMPRESSION_G711_ULAW,
- AF_COMPRESSION_G711_ALAW
-diff -ur audiofile-0.2.6-orig/libaudiofile/setup.c audiofile-0.2.6-mine/libaudiofile/setup.c
---- audiofile-0.2.6-orig/libaudiofile/setup.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/setup.c 2006-03-22 02:16:14.567837750 -0500
-@@ -39,7 +39,7 @@
-
- extern _Unit _af_units[];
-
--_AFfilesetup _af_default_file_setup =
-+const _AFfilesetup _af_default_file_setup =
- {
- _AF_VALID_FILESETUP, /* valid */
- #if WORDS_BIGENDIAN
-@@ -58,7 +58,7 @@
- NULL /* miscellaneous */
- };
-
--_InstrumentSetup _af_default_instrumentsetup =
-+const _InstrumentSetup _af_default_instrumentsetup =
- {
- 0, /* id */
- 2, /* loopCount */
-@@ -66,7 +66,7 @@
- AF_FALSE /* loopSet */
- };
-
--_TrackSetup _af_default_tracksetup =
-+const _TrackSetup _af_default_tracksetup =
- {
- 0,
- {
-diff -ur audiofile-0.2.6-orig/libaudiofile/units.c audiofile-0.2.6-mine/libaudiofile/units.c
---- audiofile-0.2.6-orig/libaudiofile/units.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/units.c 2006-03-22 02:02:12.335201500 -0500
-@@ -56,7 +56,7 @@
- extern int _af_next_compression_types[];
- extern int _af_wave_compression_types[];
-
--_Unit _af_units[_AF_NUM_UNITS] =
-+const _Unit _af_units[_AF_NUM_UNITS] =
- {
- {
- AF_FILE_RAWDATA,
-@@ -221,7 +221,7 @@
- }
- };
-
--_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
-+const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
- {
- {
- AF_COMPRESSION_NONE,
-diff -ur audiofile-0.2.6-orig/libaudiofile/util.c audiofile-0.2.6-mine/libaudiofile/util.c
---- audiofile-0.2.6-orig/libaudiofile/util.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/util.c 2006-03-22 01:54:41.944352750 -0500
-@@ -46,12 +46,12 @@
- #include "byteorder.h"
- #include "aupvinternal.h"
-
--extern _PCMInfo _af_default_signed_integer_pcm_mappings[];
--extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
--extern _PCMInfo _af_default_float_pcm_mapping;
--extern _PCMInfo _af_default_double_pcm_mapping;
-+extern const _PCMInfo _af_default_signed_integer_pcm_mappings[];
-+extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
-+extern const _PCMInfo _af_default_float_pcm_mapping;
-+extern const _PCMInfo _af_default_double_pcm_mapping;
-
--extern _CompressionUnit _af_compression[];
-+extern const _CompressionUnit _af_compression[];
-
- /*
- _af_filesetup_ok and _af_filehandle_ok are sanity check routines
-diff -ur audiofile-0.2.6-orig/libaudiofile/wave.c audiofile-0.2.6-mine/libaudiofile/wave.c
---- audiofile-0.2.6-orig/libaudiofile/wave.c 2004-03-06 01:39:23.000000000 -0500
-+++ audiofile-0.2.6-mine/libaudiofile/wave.c 2006-03-22 02:16:29.568775250 -0500
-@@ -49,13 +49,13 @@
- #include "setup.h"
- #include "marker.h"
-
--int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
-+const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
- {
- AF_COMPRESSION_G711_ULAW,
- AF_COMPRESSION_G711_ALAW
- };
-
--_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
-+const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
- {
- { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
- { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },
diff --git a/media-libs/audiofile/files/audiofile-0.2.6-fmod.patch b/media-libs/audiofile/files/audiofile-0.2.6-fmod.patch
deleted file mode 100644
index 9bd985a9e495..000000000000
--- a/media-libs/audiofile/files/audiofile-0.2.6-fmod.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur audiofile-0.2.6.orig/test/printmarkers.c audiofile-0.2.6/test/printmarkers.c
---- audiofile-0.2.6.orig/test/printmarkers.c 2004-03-06 08:39:23.000000000 +0200
-+++ audiofile-0.2.6/test/printmarkers.c 2007-07-28 12:23:04.000000000 +0300
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <audiofile.h>
-+#include <math.h>
-
- void printtime (AFframecount position, double rate)
- {
diff --git a/media-libs/audiofile/files/audiofile-0.2.6-m4.patch b/media-libs/audiofile/files/audiofile-0.2.6-m4.patch
deleted file mode 100644
index 5aca7b14a5c1..000000000000
--- a/media-libs/audiofile/files/audiofile-0.2.6-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Get rid of aclocal warning:
-/usr/share/aclocal/audiofile.m4:12: warning: underquoted definition of AM_PATH_AUDIOFILE
---- audiofile-0.2.6/audiofile.m4
-+++ audiofile-0.2.6/audiofile.m4
-@@ -11,3 +11,3 @@
- dnl
--AC_DEFUN(AM_PATH_AUDIOFILE,
-+AC_DEFUN([AM_PATH_AUDIOFILE],
- [dnl
diff --git a/media-libs/audiofile/files/sfconvert-eradicator.patch b/media-libs/audiofile/files/sfconvert-eradicator.patch
deleted file mode 100644
index 8959947b86e7..000000000000
--- a/media-libs/audiofile/files/sfconvert-eradicator.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- audiofile/sfcommands/sfconvert.c.orig 2004-04-04 23:39:56.000000000 -0700
-+++ audiofile/sfcommands/sfconvert.c 2004-04-05 00:00:25.000000000 -0700
-@@ -66,12 +66,14 @@
-
- AFfilehandle infile, outfile;
- AFfilesetup outfilesetup;
-- int sampleFormat, sampleWidth, channelCount;
-- double sampleRate;
-+ int sampleFormat, sampleWidth, channelCount, byteOrder;
-+ double sampleRate, outSampleRate;
-+ int outSampleRateInt = -1;
- int outSampleFormat = -1, outSampleWidth = -1,
-- outChannelCount = -1;
-+ outChannelCount = -1, outByteOrder = -1;
- double outMaxAmp = 1.0;
-
-+
- AFframecount totalFrames;
-
- if (argc < 3)
-@@ -88,7 +90,10 @@
- {
- if (i + 1 >= argc)
- usageerror();
-- if (!strcmp(argv[i+1], "aiff"))
-+
-+ if (!strcmp(argv[i+1], "raw"))
-+ outFileFormat = AF_FILE_RAWDATA;
-+ else if (!strcmp(argv[i+1], "aiff"))
- outFileFormat = AF_FILE_AIFF;
- else if (!strcmp(argv[i+1], "aifc"))
- outFileFormat = AF_FILE_AIFFC;
-@@ -98,6 +103,12 @@
- outFileFormat = AF_FILE_NEXTSND;
- else if (!strcmp(argv[i+1], "bics"))
- outFileFormat = AF_FILE_BICSF;
-+ else if (!strcmp(argv[i+1], "avr"))
-+ outFileFormat = AF_FILE_AVR;
-+ else if (!strcmp(argv[i+1], "iff"))
-+ outFileFormat = AF_FILE_IFF_8SVX;
-+ else if (!strcmp(argv[i+1], "nist"))
-+ outFileFormat = AF_FILE_NIST_SPHERE;
- else
- {
- fprintf(stderr, "sfconvert: Unknown format %s.\n", argv[i+1]);
-@@ -107,6 +118,22 @@
- /* Increment for argument. */
- i++;
- }
-+ else if (!strcmp(argv[i], "byteorder"))
-+ {
-+ if (i + 1 >= argc)
-+ usageerror();
-+
-+ if(!strcmp("big", argv[i+1])) {
-+ outByteOrder = AF_BYTEORDER_BIGENDIAN;
-+ } else if(!strcmp("little", argv[i+1])) {
-+ outByteOrder = AF_BYTEORDER_LITTLEENDIAN;
-+ } else {
-+ usageerror();
-+ }
-+
-+ /* Increment for argument. */
-+ i++;
-+ }
- else if (!strcmp(argv[i], "channels"))
- {
- if (i + 1 >= argc)
-@@ -119,6 +146,20 @@
- /* Increment for argument. */
- i++;
- }
-+ else if (!strcmp(argv[i], "rate"))
-+ {
-+ if (i + 1 >= argc)
-+ usageerror();
-+
-+ outSampleRateInt = atoi(argv[i+1]);
-+ if (outSampleRateInt <= 0)
-+ usageerror();
-+
-+ outSampleRate = (double)outSampleRateInt;
-+
-+ /* Increment for argument. */
-+ i++;
-+ }
- else if (!strcmp(argv[i], "float"))
- {
- if (i + 1 >= argc)
-@@ -170,6 +211,7 @@
- totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK);
- channelCount = afGetChannels(infile, AF_DEFAULT_TRACK);
- sampleRate = afGetRate(infile, AF_DEFAULT_TRACK);
-+ byteOrder = afGetByteOrder(infile, AF_DEFAULT_TRACK);
- afGetSampleFormat(infile, AF_DEFAULT_TRACK, &sampleFormat, &sampleWidth);
-
- /* Initialize output audio format parameters. */
-@@ -184,14 +226,21 @@
- outSampleWidth = sampleWidth;
- }
-
-+ if (outByteOrder == -1)
-+ outByteOrder = byteOrder;
-+
- if (outChannelCount == -1)
- outChannelCount = channelCount;
-
-+ if (outSampleRateInt == -1)
-+ outSampleRate = sampleRate;
-+
- afInitFileFormat(outfilesetup, outFileFormat);
- afInitSampleFormat(outfilesetup, AF_DEFAULT_TRACK, outSampleFormat,
- outSampleWidth);
- afInitChannels(outfilesetup, AF_DEFAULT_TRACK, outChannelCount);
-- afInitRate(outfilesetup, AF_DEFAULT_TRACK, sampleRate);
-+ afInitRate(outfilesetup, AF_DEFAULT_TRACK, outSampleRate);
-+ afInitByteOrder(outfilesetup, AF_DEFAULT_TRACK, outByteOrder);
-
- outfile = afOpenFile(outfilename, "w", outfilesetup);
- if (outfile == AF_NULL_FILEHANDLE)
-@@ -228,6 +277,7 @@
- printf("\n");
-
- printf("Where keywords specify format of input or output soundfile:\n");
-+ printf(" rate n sample rate (22050, 44100, 48000, etc.)\n");
- printf(" byteorder e endian (e is big or little)\n");
- printf(" channels n n-channel file (1 or 2)\n");
- printf(" format f file format f (see below)\n");
-@@ -239,11 +289,15 @@
-
- printf("Currently supported formats are:\n");
- printf("\n");
-+ printf(" raw \n");
- printf(" aiff Audio Interchange File Format\n");
- printf(" aifc AIFF-C File Format\n");
- printf(" next NeXT/Sun Format\n");
- printf(" wave MS RIFF WAVE Format\n");
- printf(" bics Berkeley/IRCAM/CARL Sound File Format\n");
-+ printf(" avr Audio Visual Research File Format\n");
-+ printf(" iff Amiga IFF/8SVX Sound File Format\n");
-+ printf(" nist NIST SPHERE File Format\n");
- printf("\n");
-
- exit(EXIT_FAILURE);