diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-04-17 13:19:58 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-04-17 13:19:58 +0000 |
| commit | 6221baaaab22030c119858a8a82aa2ac6ad1b9ec (patch) | |
| tree | cfaca4f62bd0a1f35ae610efe252ef98dc407541 /media-libs | |
| parent | Re-add xulrunner dependency to the stable version, as it doesn't work with fi... (diff) | |
| download | gentoo-2-6221baaaab22030c119858a8a82aa2ac6ad1b9ec.tar.gz gentoo-2-6221baaaab22030c119858a8a82aa2ac6ad1b9ec.tar.bz2 gentoo-2-6221baaaab22030c119858a8a82aa2ac6ad1b9ec.zip | |
Fix build with libav-0.8.1 (bug 409725).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/FusionSound/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/FusionSound/files/FusionSound-1.1.1-libav-0.8.1.patch | 11 |
3 files changed, 21 insertions, 4 deletions
diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog index da2c98b9fd54..7b5c6248937c 100644 --- a/media-libs/FusionSound/ChangeLog +++ b/media-libs/FusionSound/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/FusionSound # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.17 2012/02/28 16:40:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.18 2012/04/17 13:19:58 pesa Exp $ + + 17 Apr 2012; Davide Pesavento <pesa@gentoo.org> + +files/FusionSound-1.1.1-libav-0.8.1.patch, FusionSound-1.1.1-r1.ebuild: + Fix build with libav-0.8.1 (bug 409725). 28 Feb 2012; Jeroen Roovers <jer@gentoo.org> FusionSound-1.1.1-r1.ebuild: Stable for HPPA (bug #405659). diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild index d69b82d0e8d5..307893dcefd2 100644 --- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild +++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.10 2012/02/28 16:40:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.11 2012/04/17 13:19:58 pesa Exp $ EAPI=2 inherit autotools eutils @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/DirectFB-${PV} vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) - ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 ) + ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) !net-zope/zodb" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -32,7 +32,9 @@ src_prepare() { "${FILESDIR}"/${P}-ffmpeg.patch \ "${FILESDIR}"/${P}-ffmpeg-0.6.90.patch \ "${FILESDIR}"/${P}-ffmpeg-0.10.patch \ - "${FILESDIR}"/${P}-libavformat54.patch + "${FILESDIR}"/${P}-libavformat54.patch \ + "${FILESDIR}"/${P}-libav-0.8.1.patch + sed -i -e 's:-O3 -ffast-math -pipe::' configure.in \ || die "sed failed" AT_M4DIR="m4" eautoreconf diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-libav-0.8.1.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-0.8.1.patch new file mode 100644 index 000000000000..d16fdd17c971 --- /dev/null +++ b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-0.8.1.patch @@ -0,0 +1,11 @@ +diff -Naur FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c +--- FusionSound-1.1.1.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2012-04-17 15:13:57.864935809 +0200 ++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c 2012-04-17 15:15:07.299067761 +0200 +@@ -44,6 +44,7 @@ + #define FF_API_OLD_METADATA2 0 + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> ++#include <libavutil/mathematics.h> + + static DFBResult + Probe( IFusionSoundMusicProvider_ProbeContext *ctx ); |