diff options
Diffstat (limited to 'media-sound/aqualung')
9 files changed, 15 insertions, 276 deletions
diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog index 6ac218a2b80d..61929dccb3ad 100644 --- a/media-sound/aqualung/ChangeLog +++ b/media-sound/aqualung/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-sound/aqualung # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.37 2015/05/13 08:44:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.38 2015/05/15 12:02:18 billie Exp $ + + 15 May 2015; Daniel Pielmeier <billie@gentoo.org> + -aqualung-0.9_beta11-r2.ebuild, + -files/aqualung-0.9_beta11-automake-1.13.patch, + -files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch, + -files/aqualung-0.9_beta11-ffmpeg.patch, + -files/aqualung-0.9_beta11-libav9.patch, + -files/aqualung-0.9_beta11-libavformat54.patch, + -files/aqualung-0.9_beta11-use_lrdf_cflags.patch: + Remove old. 13 May 2015; Agostino Sarubbo <ago@gentoo.org> aqualung-1.0_rc1.ebuild: Stable for amd64, wrt bug #547610 diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest index 2732d5a75008..6f3212e48a46 100644 --- a/media-sound/aqualung/Manifest +++ b/media-sound/aqualung/Manifest @@ -1,32 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX aqualung-0.9_beta11-automake-1.13.patch 524 SHA256 e256249314c37a1d6347c5ac840bc10d9eaa37bff1aa189c055d622c8ea75441 SHA512 a81f0ee28af7f467a6fbff61a2b5ada5a9ff31344bc0399f2ca6715aeda4012992d1a8f5924e738503418fac8135d8bc9a82f44c858ab122fd3812eaaea5284c WHIRLPOOL cebe36e214a8feb947011a5f097b79c40c3654c706c4ae88d2a39a0824ffceb0e4dfd8d38dfab693826720c9982cb10913ef65e83982f18fd1d337bbab179ed1 -AUX aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch 1078 SHA256 28881367708dc65fe6ef4a9d17a3ab9bf7348dad36cabecb0fdf37a2200f2f5a SHA512 0d5585e865dd38ac63b2b441e8b1936aec3d20333db44440257d20c98550c85fe4cfcccd13a9d1eb64a1510280c09644c1434ef38c43ecd5355c065bf5967ad6 WHIRLPOOL 727b88be12ba4ec4f7cac07330719fdd19ba55f0c11155aa353b844823774dd9eb937734d355706a8139548d26deca01263bfd02aaf364b63181a60090fafd0b -AUX aqualung-0.9_beta11-ffmpeg.patch 880 SHA256 8f4083e2b2b6a54bb7c0da4eb91e3a1ca96fb17a30907b26f6d2384878fe4377 SHA512 5e1c42c640b87b6dda71743a4215bd77a19da8c359afad94f07c08ea4b162d4ad86ca2ed204c5a551299ca656b9c8c9d6fb862ce742817fdc9dbcacc166fc4d7 WHIRLPOOL 11f5d2c2454dea807f1b546ee176aab2506a9bb4fece3449e258fa566fdb33ca345f205bcfa6e170b333519603e55ad06d4486115c4e65e7b276ee481bce5634 -AUX aqualung-0.9_beta11-libav9.patch 1551 SHA256 24ab6cce415e9251b2261d47947394c5b75fd4d612c5794b0b6ec3201283226d SHA512 746f6e47052b3c08f1bef0a0a87fa0f7fb5e087bc69fa4826af29ce4c13536f9e2e2d6f05e63ff69d996c1bcee5d8dbdbae8f9abadb54ec752d69eb5a4ba4cdd WHIRLPOOL e24470a702ebeb1d8e7c97ed970ae120a703cdf237435c4c0f6d61dcd4f1b7b347c5b8b6745c583931c0ad4f2e7f6a78cb97ada616214e38163251b9cdb6092f -AUX aqualung-0.9_beta11-libavformat54.patch 1170 SHA256 1e0d189c36e70ba8e9d49afa4051f8417560c1e016fefcf6027a5622d4931d09 SHA512 e2a9f923fd48add6f36740f87eaed363ea627452a8a88db5bd38438aa62a4c29c014f4aa8b3e9f6512efaeaf5dc6dc2b839e8df2a07c8b388e9677f8d6a5bbc6 WHIRLPOOL 3972d343981ebb1b415284134cdf79a46de9470de1cfaee8f992662345214672e6f56b5ca33233b935cf32505a17c04af7f7726f9b0be6294daf04a919d4eaa9 -AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66 SHA512 611ec971e00226a32d9d402fffab26bb65bec2353d186875ffe9dcc074cca67854c80d86f31c7cccc32df3320dba5427ec4b3b4782f43922cb5294eee9c92631 WHIRLPOOL 1858a5c5c76175c92abd598e164d5bea0563dfb98973b961d5c4efa2c1a0acf8acb1ecfa1dd1fdf26a93fe88400ac62926f6eca2e6d8d33d6a09cfa956740711 -DIST aqualung-0.9beta11.tar.gz 1584700 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd SHA512 b5b7b8b8f10f0ac4bd332d7644e0f22003edc30c24aaac04b21ebe14b2a451ab3b06c6996e77b795a0fa600090a5bd42a8f993a28269dd8ec905c37b2debf399 WHIRLPOOL fc1c3516b55818979ae14080cae9ce9ed7ad8b57cf113fb90c66dec51ae75c9c176a32ad1be02cadac2a96799281d800e283a70743f876319f25e457fa6d672d DIST aqualung-1.0-rc1.tar.gz 1939271 SHA256 4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b SHA512 a8b15eb69dab1b2615562fd25aa6081df293783eef6cf7d171c5373855bab1f3e454e90621feb4f296c407c9d74957130fc359a39315cfdbb173a6f119a859e6 WHIRLPOOL 7aad3bb2dd3740418fe6b0ec87a62772d9e53673b58bd1c534de31c08bbee48748debcb8f82ab6239d8160f1af6933cc4a13a2d185c84f72ecfb02ababdbe0ea -EBUILD aqualung-0.9_beta11-r2.ebuild 2825 SHA256 f918a47f2652e3f2c4acebe2c8bd1a82cb318693d144ea286e32e33ee042c3d1 SHA512 39dff59a1119d6efdfdb632400d4be9b422b5043b9687e95f19613ab18cdba82e7c767230b8b64d3cd0a25379c1f9e4bbc8ad65ed3f917e6ce10bdfc9d01e981 WHIRLPOOL cbbc47de5b6d205049c4fa768f558537122cb18169a2b9dd70fa8ee1c47298983202f27e2367209e5a47f656f86ac2aa8ede8ddfe9255aefc51ef9d47d883d6f EBUILD aqualung-1.0_rc1.ebuild 2462 SHA256 368745be15bf6774739c8b07c66f95dfbca5d642c1e70029f449cfa8687275d3 SHA512 c71b8e0fad83ffa736fdd547ae08473740f5b226bd075244f0a4f3346378364c92920072f736638036cebe34642936e0d9da0203a6a53519f34de59ec5394c59 WHIRLPOOL 0ad781ef9bd5ffc3b54bb9187cca1fe88478313d9ac14a0576fcd8a6a53f1ee92e9898c029df91ee2460a281405b22b01be95b428087a39abb0ecd9a21b2b3b9 -MISC ChangeLog 6584 SHA256 9b6c76e956cb1459e49f70bb91989f4a32b3866b260d2866f290c16b28909310 SHA512 4de5aa99b72c739c98da1befabb3dcd6b5e7a8d6458f3330ebd18d9d430f6a901d9e4558c3b0ee0b3adcabe5498406dc6df5de37f2d140160515a756d90c8d62 WHIRLPOOL f53ddc31765e2906050073c1de7029f9488618cf207d4a405309565584f95d108de95c31ba04c5898ac7b8b10dc33b7aa0ab735415a5fcb094a1d17e523583ba +MISC ChangeLog 6991 SHA256 83ba7218781aacad1bd5f9acecb03ec92086564399769d25d22e5798aa7216c5 SHA512 0fb444265696dfb2a0efad8c4f7976e51e6d73c8bae6e401dfa2527d145b3cab3eafb806edb05e42be47f45a71a7d5cdf9319ebe54bc465335976261a8b7c9a8 WHIRLPOOL ea8f073334c8c2c56100c3e6902fb23962a0471e4526640423ac2eca0f121155b9a492d641b1112d35ce9d5eaeb00e1a3f740f6f88da4c4525585e23b4670a7c MISC metadata.xml 663 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575 SHA512 6e91256f59dd584f7b9c09b1c3704e837691c6b09c65401c828c6f3e9a57defdb4984ec531baeb2e0680edf455210f33b8226cbed317090c2c61ab22305ba574 WHIRLPOOL 75d15bcb548a80baf81bdf25f75c4ec2fb50f2aac4596f550d5b0d4e8e9a120524463408b4bde1f545f7e2ff3ac85523d616ecb3479185c1bc532dae9581a789 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVUw7nAAoJELp701BxlEWfxzAP/At4KpfXvx2P2D5Ovn25wCJ4 -g0guOWbjkeilspfeKQ0n/5zmyCTgSz1n5am5tFIbGgJuLlpD70Mno71gMk0UUJ0g -pK2YzPznvlggw5EBYEQl3vW3ZImVj37RtEhzIx6VRNIY7rfv6zjSxY1JeQYyl+sP -47FMkv/EXkUndZzUwlgx9G0pqr2L4Az4s1ypgYhnsA2Gncgv0M0G/djzABexW7ZS -6FMlWnW8kfQ0CtATl+PhpyDZVr/3C2kpRSIfQ5lJOszoss/Z8ecAZKvX3Ww5GSHW -HfD5z8Mf8DLPQjRm5TcJEDDB8fl6K71w7En4g8+6KQNFjMi9f/vWFdJvN94CIigi -yqD5KmNzPxpr9xJAk4c7S7i8QaJt+EUbFzdMgFwfE8MdTCIHcgOH4b1vjwcd6/Vx -L3EQR8nT0rP8gIDS7VtQVCWGEmWqxvvCjGQlZGXuGqphSzHjoWCwb3B/t8ubgUWX -K9z2EitjLgP8uevEQSuvipkahl5jgI/90YzIzZr8jiHfEPrkPF4alZRoVCSR4yez -uor9nGpOAFdQgfpN4sCLXSYAO772AeHS4Fkyn+SX+cvshFCtqv+RrLjVdagdVnqb -Bs2ef8Y9dwv3njKkFxyYEwQ4Ju7bcz7xIEgmElFfT+/dMsNZbmsl9njfYAl7eV6z -kBc2uP+JVkSz42mRk3ej -=eSYA +iEYEAREIAAYFAlVV4FIACgkQlcuUeyFa0U0p+ACfQMXpADPjsxgDWBmIGHmPVPg4 +OQUAn0mjlMVDMwcDgZTYoFayKY0xxAi6 +=45GF -----END PGP SIGNATURE----- diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild deleted file mode 100644 index 260f6445b73b..000000000000 --- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.7 2014/03/24 17:33:45 billie Exp $ - -EAPI=5 - -inherit autotools eutils - -MY_PV=${PV/_/} - -DESCRIPTION="A music player for a wide range of formats designed for gapless playback" -HOMEPAGE="http://aqualung.factorial.hu/" -SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua - mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack" - -RDEPEND="sys-libs/zlib - app-arch/bzip2 - dev-libs/libxml2 - x11-libs/gtk+:2 - alsa? ( media-libs/alsa-lib ) - jack? ( media-sound/jack-audio-connection-kit ) - pulseaudio? ( media-sound/pulseaudio ) - flac? ( media-libs/flac ) - lame? ( media-sound/lame ) - ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) - mac? ( media-sound/mac ) - modplug? ( media-libs/libmodplug ) - musepack? ( >=media-sound/musepack-tools-444 ) - mp3? ( media-libs/libmad ) - sndfile? ( media-libs/libsndfile ) - speex? ( media-libs/speex media-libs/liboggz ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - ladspa? ( media-libs/liblrdf ) - libsamplerate? ( media-libs/libsamplerate ) - ifp? ( media-libs/libifp ) - cddb? ( media-libs/libcddb ) - lua? ( dev-lang/lua )" - -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -S=${WORKDIR}/${PN}-${MY_PV} - -src_prepare() { - epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \ - "${FILESDIR}"/${P}-ffmpeg.patch \ - "${FILESDIR}"/${P}-libavformat54.patch \ - "${FILESDIR}"/${P}-automake-1.13.patch \ - "${FILESDIR}"/${P}-libav9.patch \ - "${FILESDIR}"/${P}-avcodec_max_audio_frame_size.patch - sed -i \ - -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \ - doc/Makefile.am || die - sed -i \ - -e 's:avcodec_open,:avcodec_open2,:' \ - -e '/BUILD_CFLAGS/s:-O2::' \ - -e '/BUILD_CFLAGS/s: -ggdb -g -O0::' \ - configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_with alsa) \ - $(use_with jack) \ - $(use_with oss) \ - $(use_with pulseaudio pulse) \ - $(use_with flac) \ - $(use_with lame) \ - $(use_with ffmpeg lavc) \ - $(use_with mac) \ - $(use_with modplug mod) \ - $(use_with musepack mpc) \ - $(use_with podcast) \ - $(use_with mp3 mpeg) \ - $(use_with sndfile) \ - $(use_with speex) \ - $(use_with systray) \ - $(use_with vorbis ogg) \ - $(use_with vorbis vorbisenc) \ - --with-loop \ - $(use_with wavpack) \ - $(use_with ladspa) \ - $(use_with libsamplerate src) \ - --without-cdda \ - $(use_with ifp) \ - $(use_with cddb) \ - $(use_with lua) \ - --docdir=/usr/share/doc/${PF} -} - -src_install() { - default - - newicon src/img/icon_64.png aqualung.png - make_desktop_entry aqualung Aqualung -} diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch deleted file mode 100644 index bd8d45919793..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- aqualung-0.9beta11/configure.ac.old 2013-05-02 18:20:45.918789345 +0200 -+++ aqualung-0.9beta11/configure.ac 2013-05-02 18:21:51.471466816 +0200 -@@ -1,9 +1,9 @@ - # Process this file with autoconf to produce a configure script. - --AC_INIT(aqualung, 0.9beta11, http://aqualung.factorial.hu/mantis) --AM_INIT_AUTOMAKE(aqualung, 0.9beta11) -+AC_INIT([aqualung],0.9beta11,[http://aqualung.factorial.hu/mantis]) -+AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([src/core.c]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - - diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch deleted file mode 100644 index bc216d5c14ec..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: src/decoder/dec_lavc.c -=================================================================== ---- src/decoder/dec_lavc.c (revision 1272) -+++ src/decoder/dec_lavc.c (revision 1273) -@@ -84,9 +84,9 @@ - file_decoder_t * fdec = dec->fdec; - - AVPacket packet; -- int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE]; -- float fsamples[AVCODEC_MAX_AUDIO_FRAME_SIZE]; -- int n_bytes = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ int16_t samples[MAX_AUDIO_FRAME_SIZE]; -+ float fsamples[MAX_AUDIO_FRAME_SIZE]; -+ int n_bytes = MAX_AUDIO_FRAME_SIZE; - - if (av_read_frame(pd->avFormatCtx, &packet) < 0) - return 1; -Index: src/decoder/dec_lavc.h -=================================================================== ---- src/decoder/dec_lavc.h (revision 1272) -+++ src/decoder/dec_lavc.h (revision 1273) -@@ -29,7 +29,8 @@ - #include "file_decoder.h" - - --#define RB_LAVC_SIZE (3*AVCODEC_MAX_AUDIO_FRAME_SIZE) -+#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#define RB_LAVC_SIZE (3*MAX_AUDIO_FRAME_SIZE) - - - typedef struct _lavc_pdata_t { diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch deleted file mode 100644 index c8c3ad003be9..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: aqualung-0.9beta11/src/decoder/dec_lavc.c -=================================================================== ---- aqualung-0.9beta11.orig/src/decoder/dec_lavc.c -+++ aqualung-0.9beta11/src/decoder/dec_lavc.c -@@ -53,7 +53,7 @@ decode_lavc(decoder_t * dec) { - - if (packet.stream_index == pd->audioStream) { - -- avcodec_decode_audio2(pd->avCodecCtx, samples, &n_bytes, packet.data, packet.size); -+ avcodec_decode_audio3(pd->avCodecCtx, samples, &n_bytes, &packet); - if (n_bytes > 0) { - int i; - for (i = 0; i < n_bytes/2; i++) { -@@ -124,7 +124,7 @@ lavc_decoder_open(decoder_t * dec, char - - pd->audioStream = -1; - for (i = 0; i < pd->avFormatCtx->nb_streams; i++) { -- if (pd->avFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { -+ if (pd->avFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - pd->audioStream = i; - break; - } diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-libav9.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-libav9.patch deleted file mode 100644 index d7087545122b..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-libav9.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN aqualung-0.9beta11.old/configure.ac aqualung-0.9beta11/configure.ac ---- aqualung-0.9beta11.old/configure.ac 2013-06-22 20:22:58.928689843 +0200 -+++ aqualung-0.9beta11/configure.ac 2013-06-22 20:31:52.203670871 +0200 -@@ -661,7 +661,7 @@ - fi - - AC_CHECK_LIB(avformat, avformat_open_input, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz]) -- AC_CHECK_LIB(avcodec, avcodec_open, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz]) -+ AC_CHECK_LIB(avcodec, avcodec_open2, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz]) - - if test "$avc_hdr" = "yes" -a "$avf_hdr" = "yes" -a "$avc_lib" = "yes" -a "$avf_lib" = "yes" ; then - lavc_LIBS="-lavformat -lavcodec -lavutil -lz" -diff -urN aqualung-0.9beta11.old/src/decoder/dec_lavc.c aqualung-0.9beta11/src/decoder/dec_lavc.c ---- aqualung-0.9beta11.old/src/decoder/dec_lavc.c 2013-06-22 20:22:58.933689843 +0200 -+++ aqualung-0.9beta11/src/decoder/dec_lavc.c 2013-06-22 20:28:17.916678495 +0200 -@@ -114,7 +114,7 @@ - if (avformat_open_input(&pd->avFormatCtx, filename, NULL, NULL) != 0) - return DECODER_OPEN_BADLIB; - -- if (av_find_stream_info(pd->avFormatCtx) < 0) -+ if (avformat_find_stream_info(pd->avFormatCtx, NULL) < 0) - return DECODER_OPEN_BADLIB; - - /* debug */ -@@ -140,7 +140,7 @@ - if (pd->avCodec == NULL) - return DECODER_OPEN_BADLIB; - -- if (avcodec_open(pd->avCodecCtx, pd->avCodec) < 0) -+ if (avcodec_open2(pd->avCodecCtx, pd->avCodec, NULL) < 0) - return DECODER_OPEN_BADLIB; - - if ((pd->avCodecCtx->channels != 1) && (pd->avCodecCtx->channels != 2)) { diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-libavformat54.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-libavformat54.patch deleted file mode 100644 index 103f3f28c5b1..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-libavformat54.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: aqualung-0.9beta11/configure.ac -=================================================================== ---- aqualung-0.9beta11.orig/configure.ac -+++ aqualung-0.9beta11/configure.ac -@@ -660,7 +660,7 @@ else - fi - fi - -- AC_CHECK_LIB(avformat, av_open_input_file, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz]) -+ AC_CHECK_LIB(avformat, avformat_open_input, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz]) - AC_CHECK_LIB(avcodec, avcodec_open, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz]) - - if test "$avc_hdr" = "yes" -a "$avf_hdr" = "yes" -a "$avc_lib" = "yes" -a "$avf_lib" = "yes" ; then -Index: aqualung-0.9beta11/src/decoder/dec_lavc.c -=================================================================== ---- aqualung-0.9beta11.orig/src/decoder/dec_lavc.c -+++ aqualung-0.9beta11/src/decoder/dec_lavc.c -@@ -111,7 +111,7 @@ lavc_decoder_open(decoder_t * dec, char - file_decoder_t * fdec = dec->fdec; - int i; - -- if (av_open_input_file(&pd->avFormatCtx, filename, NULL, 0, NULL) != 0) -+ if (avformat_open_input(&pd->avFormatCtx, filename, NULL, NULL) != 0) - return DECODER_OPEN_BADLIB; - - if (av_find_stream_info(pd->avFormatCtx) < 0) diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch deleted file mode 100644 index 4b840e528978..000000000000 --- a/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Otherwise we end up with missing -I/usr/include/raptor2 for raptor.h - ---- configure.ac -+++ configure.ac -@@ -742,6 +742,7 @@ - AC_MSG_CHECKING(whether liblrdf version >= 0.4.0) - if `pkg-config --exists 'lrdf >= 0.4.0'`; then - AC_MSG_RESULT(yes) -+ lrdf_CFLAGS=`pkg-config --cflags lrdf` - lrdf_LIBS=`pkg-config --libs lrdf` - AC_DEFINE([HAVE_LADSPA], [1], [Defined if compile with LADSPA plugin support]) - else -@@ -957,7 +958,7 @@ - - CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $AQUALUNG_SKINDIR $AQUALUNG_LOCALEDIR $AQUALUNG_DATADIR -D_GNU_SOURCE" - CXXFLAGS="$CFLAGS" --CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS" -+CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS $lrdf_CFLAGS" - LIBS="decoder/libdecoder.a encoder/libencoder.a $gtk_LIBS $glib_LIBS $xml_LIBS $jack_LIBS $lrdf_LIBS $src_LIBS $alsa_LIBS $sndio_LIBS $oss_LIBS $sndfile_LIBS $flac_LIBS $ogg_LIBS $wavpack_LIBS $speex_LIBS $mad_LIBS $mod_LIBS $mpc_LIBS $mac_LIBS $lavc_LIBS $vorbisenc_LIBS $lame_LIBS $cdda_LIBS $cddb_LIBS $ifp_LIBS $PLATFORM_LIBS $z_LIBS $bz2_LIBS $lua_LIBS $pulse_LIBS" - - |