diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-19 20:54:52 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-19 20:54:52 +0000 |
| commit | c0b6f5b3db6e2596bb657b4ff7c7004a1c38e505 (patch) | |
| tree | f30cb909ea9c7de6bea232ca832a9a17ac0e980f /media-plugins | |
| parent | Version bump wrt bug #416201. Thanks to Andrew Savchenko for his effort on li... (diff) | |
| download | gentoo-2-c0b6f5b3db6e2596bb657b4ff7c7004a1c38e505.tar.gz gentoo-2-c0b6f5b3db6e2596bb657b4ff7c7004a1c38e505.tar.bz2 gentoo-2-c0b6f5b3db6e2596bb657b4ff7c7004a1c38e505.zip | |
Fix compile error wrt bug #412605, thanks to Andrew Savchenko for the patch. Also do not repeat defaults (dodoc, libdir).
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'media-plugins')
3 files changed, 28 insertions, 12 deletions
diff --git a/media-plugins/mediastreamer-amr/ChangeLog b/media-plugins/mediastreamer-amr/ChangeLog index be14c365f730..6e06cd290b87 100644 --- a/media-plugins/mediastreamer-amr/ChangeLog +++ b/media-plugins/mediastreamer-amr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/mediastreamer-amr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-amr/ChangeLog,v 1.6 2012/04/24 10:10:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-amr/ChangeLog,v 1.7 2012/11/19 20:54:52 mgorny Exp $ + + 19 Nov 2012; Michał Górny <mgorny@gentoo.org> + +files/mediastreamer-amr-0.0.1-include.patch, mediastreamer-amr-0.0.1.ebuild: + Fix compile error wrt bug #412605, thanks to Andrew Savchenko for the patch. + Also do not repeat defaults (dodoc, libdir). 24 Apr 2012; Michał Górny <mgorny@gentoo.org> mediastreamer-amr-0.0.1.ebuild: @@ -25,4 +30,3 @@ 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-amr-0.0.1.ebuild, +metadata.xml: Initial bump, bug #356987 thank Andrew Savchenko for report and work. - diff --git a/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch b/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch new file mode 100644 index 000000000000..c0f8483ea2b3 --- /dev/null +++ b/media-plugins/mediastreamer-amr/files/mediastreamer-amr-0.0.1-include.patch @@ -0,0 +1,13 @@ +--- msamr-0.0.1/src/msamr.c.orig 2012-06-01 21:12:47.000000000 +0400 ++++ msamr-0.0.1/src/msamr.c 2012-06-01 21:12:59.884661902 +0400 +@@ -21,8 +21,8 @@ + + #include <mediastreamer2/msfilter.h> + +-#include <interf_dec.h> +-#include <interf_enc.h> ++#include <opencore-amrnb/interf_dec.h> ++#include <opencore-amrnb/interf_enc.h> + + /* + Class A total speech diff --git a/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild b/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild index 3055abeb6eb5..67c62af01bc5 100644 --- a/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild +++ b/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild,v 1.6 2012/04/24 10:10:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/mediastreamer-amr/mediastreamer-amr-0.0.1.ebuild,v 1.7 2012/11/19 20:54:52 mgorny Exp $ EAPI="4" -inherit multilib +inherit eutils multilib MY_P="msamr-${PV}" @@ -17,20 +17,19 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" -DEPEND=">=media-libs/mediastreamer-2.0.0 +RDEPEND=">=media-libs/mediastreamer-2.0.0 >=media-libs/opencore-amr-0.1.2" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}/${P}-include.patch" +} + src_configure() { # strict: don't want -Werror econf \ - --libdir=/usr/$(get_libdir) \ --disable-strict } - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README -} |