diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-19 20:54:53 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-19 20:54:53 +0000 |
| commit | 8880066205664efdb29b76267619bebe3cde6351 (patch) | |
| tree | 2b32f59aea1f9613b2a563dc96faae1d5e920093 /media-plugins/mediastreamer-amr | |
| parent | Version bump wrt bug #416201. Thanks to Andrew Savchenko for his effort on li... (diff) | |
| download | historical-8880066205664efdb29b76267619bebe3cde6351.tar.gz historical-8880066205664efdb29b76267619bebe3cde6351.tar.bz2 historical-8880066205664efdb29b76267619bebe3cde6351.zip | |
Fix compile error wrt bug #412605, thanks to Andrew Savchenko for the patch. Also do not repeat defaults (dodoc, libdir).
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D
Diffstat (limited to 'media-plugins/mediastreamer-amr')
4 files changed, 38 insertions, 21 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/Manifest b/media-plugins/mediastreamer-amr/Manifest index 23bd8c06c07d..7b5222a80f06 100644 --- a/media-plugins/mediastreamer-amr/Manifest +++ b/media-plugins/mediastreamer-amr/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST msamr-0.0.1.tar.gz 293324 RMD160 e6c5a0f52615dac99d3d2ddda630217a1f4cfb74 SHA1 415f42d4e9a9b17a12dc4ec74c9f65872ac0f871 SHA256 f23f940b4f58286ca427edfea4afeaa24653176f081a20bf36c85d245fd78fdf -EBUILD mediastreamer-amr-0.0.1.ebuild 830 RMD160 0ef2891382c35e1d51a88ad03eff56634edad96d SHA1 c38642d3f3993383aff78091d70774942173f157 SHA256 80514bc14deb01a6c4c830004c241b8c9286d33f124dacd2bd194edee7c4400f -MISC ChangeLog 1040 RMD160 032a4e35f03ae39cf77d16046333d156ee90a67e SHA1 0ac9932ab83dc7b0865d5d7689d44d86964f1435 SHA256 93cf6b71ac616d6be3a4c46c82d82e80add51fb4bda95023f6a8ce50b22684be -MISC metadata.xml 248 RMD160 2c72a2660b2389ac1ce4ac5b4fe49011821924cc SHA1 3ba8f9789fc5f07fa7c8c99b977e25f57b26f93f SHA256 8a91568845cd1625929cfc7b374a184476b250de3b05b567d59555d90251dd3a +AUX mediastreamer-amr-0.0.1-include.patch 382 SHA256 22b3892a0a479a9eb2e83bb8b5df505c58ea3031f6637d0bddf6af62d3f5a6b0 SHA512 5361ca845c3792da8d1135125e3ba2b470bd12e6f445ebcceac645ba707f065b3f33be33f8b44c1841a4668ee3cb89b0726e364b7e4c098c11478464e12c106c WHIRLPOOL d979e8c2ca8695179c7c74841f843b8c277e040234f08129f0ccf55cc9acbf6f000166ba75d97fa0b811920e118ca08065345732ee90245e1852513b8e06d445 +DIST msamr-0.0.1.tar.gz 293324 SHA256 f23f940b4f58286ca427edfea4afeaa24653176f081a20bf36c85d245fd78fdf SHA512 c25d25503eb23e93970d5be3a1317863cb20b0077b2ebf711dbd130e25d83debc4ea7e54eb236342c7073c54fa5002328fba5aafcbc2d495ac7588d639d6b1ab WHIRLPOOL 24ceb4138fcb73391d8b0304929ea5c477c50508fcedc4a2080e2d74463bbcfee3bcfe161c09dff6fb660a83c1145ba8f524a62ce172a4a069f2d695bd924f64 +EBUILD mediastreamer-amr-0.0.1.ebuild 809 SHA256 e7d5f94c97b03fb471a6d3a8c8c235fd83911f6ef10be628a8f8a4255a18c0d8 SHA512 01613a133ff2335a4470fa0736e24c2a0449de4cce022339250eb38e3fdb5f80b1ccc7d830e4a4e763c0f8422506e086b4cc4277c3f2076e37acd5ffa25860d4 WHIRLPOOL 597fefff57ff986d3d7050c3964364bbf02dd56423300b83dcaf7c4d78f85cf74f878ec73c52a08aa0dc57ac33b33abd67ec02260b9b70dd907eb25dcb990b04 +MISC ChangeLog 1296 SHA256 6a016b9ec342ca56c299644380a62f1b8d52d2f15232cd847b02bd1d197ba2aa SHA512 9135d2e67b19e51da4a05ed656315e8bf7888def182e44f44cac6dd12325c173fa4adbfdbd72b9112d2e02a29366e65212792f4b785d9f42abc2a76b088f2d95 WHIRLPOOL a8ab60f20b5fe988e45558421230b2a10d058346b7fd1c0680fd3b7153384603dfb0c68fd10126d8536e923ee8b8fec3428967acb101550186fe335321fe484e +MISC metadata.xml 248 SHA256 8a91568845cd1625929cfc7b374a184476b250de3b05b567d59555d90251dd3a SHA512 6927d09b416d01371cf816dffbce320471ca852f7be873391d4cc8cb9fcf4e16a5956de131a0bca244ea64383d49f4e14cde81531cfaeb11c56f8081cdadb121 WHIRLPOOL 90d5ba4c488e5beffb18e63d1e1b2cfb69cb696144c119034ddf28f535fcefda23d1e8d333e0a964cd24185e25bb1f0a72a7237431e64c4dca0773e78e2fb7b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQEIAAYFAk+WfEEACgkQfXuS5UK5QB2DUgP/cycj7HX7JZd9jbhpD8PTNsxH -ZNmtLvEPNqlWIHbav9eass2PuwJjE0eultVjOFEYp/vmUV+7A06daC6fVSlpDeUx -Pea7WvCPwe5oON0r1h75wD0Dbf3AA9K9BP8jVoweZdLn39J/yOtlbe0ukkEuD0Yy -bZ2WysA8aCyRlHRXV34= -=XhZQ +iJwEAQEIAAYFAlCqnO8ACgkQfXuS5UK5QB0xqAP/RxcYuT/ieMiyrwsVbMjVXfQX +WinsE33gfDEGflXOJSzoaHwOD5ht55H2ejr8sylIlvmoWVhiUiO3BB+5JtVD70jc +e7xAv3Vo5nv6tk42roSHcYplgOult8okc05Ettb/9LBrGl6GuswJhFTZaBaIip5R +ZcEK42t914+CnbaG+Jo= +=4H2B -----END PGP SIGNATURE----- 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 -} |