* [gentoo-commits] proj/voip:master commit in: media-libs/mediastreamer/, media-libs/mediastreamer/files/
@ 2013-10-10 5:54 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2013-10-10 5:54 UTC (permalink / raw
To: gentoo-commits
commit: c84df95b5d9c00cf45aa7e890db2c3af760f485e
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Thu Oct 10 05:24:02 2013 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Thu Oct 10 05:24:02 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=c84df95b
mediastreamer: add slot versioning
---
media-libs/mediastreamer/ChangeLog | 310 +++++++++++++++++++++
media-libs/mediastreamer/Manifest | 8 +
.../files/mediastreamer-2.9.0-libav9.patch | 120 ++++++++
.../files/mediastreamer-2.9.0-tests.patch | 26 ++
.../files/mediastreamer-2.9.0-underlinking.patch | 57 ++++
.../files/mediastreamer-2.9.0-v4l-automagic.patch | 55 ++++
.../mediastreamer/mediastreamer-2.9.0-r1.ebuild | 165 +++++++++++
media-libs/mediastreamer/metadata.xml | 25 ++
8 files changed, 766 insertions(+)
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
new file mode 100644
index 0000000..2e41412
--- /dev/null
+++ b/media-libs/mediastreamer/ChangeLog
@@ -0,0 +1,310 @@
+# ChangeLog for media-libs/mediastreamer
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.71 2013/10/09 19:36:13 hasufell Exp $
+
+*mediastreamer-2.9.0-r1 (10 Oct 2013)
+
+ 10 Oct 2013; Andrew Savchenko <bircoph@gmail.com>
+ +mediastreamer-2.9.0-r1.ebuild, +files/mediastreamer-2.9.0-libav9.patch,
+ +files/mediastreamer-2.9.0-tests.patch,
+ +files/mediastreamer-2.9.0-underlinking.patch,
+ +files/mediastreamer-2.9.0-v4l-automagic.patch, +metadata.xml:
+ Add slot version
+
+ Plugins need to be rebuild on slot update.
+
+ 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild,
+ +files/mediastreamer-2.9.0-tests.patch:
+ fix tests
+
+*mediastreamer-2.9.0 (09 Oct 2013)
+
+ 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> +mediastreamer-2.9.0.ebuild,
+ +files/mediastreamer-2.9.0-libav9.patch,
+ +files/mediastreamer-2.9.0-underlinking.patch,
+ +files/mediastreamer-2.9.0-v4l-automagic.patch, metadata.xml:
+ version bump wrt #486500
+
+ 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for ppc64, wrt bug #464536
+
+ 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for ppc, wrt bug #464536
+
+ 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for amd64, wrt bug #464536
+
+ 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for x86, wrt bug #464536
+
+ 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Depend on intltool wrt bug#474340.
+
+ 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/mediastreamer-2.8.2-libav9.patch, mediastreamer-2.8.2.ebuild:
+ Append simple patch for new api usage. Fixes build with libav9. Wrt
+ bug#457860.
+
+ 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Stable for ppc64, wrt bug #462890
+
+ 16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Cleanup due bug #96436
+
+ 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mediastreamer-2.8.2.ebuild,
+ +files/mediastreamer-2.8.2-ffmpeg-1.0.patch:
+ Fix build with latest ffmpeg. By Reuben Martin, bug #445168.
+
+ 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Add ~ppc64, wrt bug #443964
+
+ 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Add ~ppc, wrt bug #443964
+
+ 16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Cleanup due retirement, #260683
+
+ 22 Nov 2012; Michał Górny <mgorny@gentoo.org>
+ files/mediastreamer-2.8.2-v4l-automagic.patch:
+ Replace the V4L patch with a correct one.
+
+*mediastreamer-2.8.2 (19 Nov 2012)
+
+ 19 Nov 2012; Michał Górny <mgorny@gentoo.org>
+ +files/mediastreamer-2.8.2-autopoint.patch,
+ +files/mediastreamer-2.8.2-v4l-automagic.patch, +mediastreamer-2.8.2.ebuild,
+ metadata.xml:
+ Version bump wrt bug #399737. Thanks to Andrew Savchenko for his effort on
+ linphone ebuilds.
+
+ 07 Nov 2012; Alexis Ballier <aballier@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild, +files/mediastreamer-2.7.3-ffmpeg-0.11.patch,
+ +files/mediastreamer-2.7.3-videoenc_282.patch:
+ Fix build with recent ffmpeg versions, bug #419453
+
+ 16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ -mediastreamer-2.3.0-r1.ebuild:
+ Punt version that depended only on media-video/ffmpeg.
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> mediastreamer-2.3.0-r1.ebuild,
+ mediastreamer-2.7.3-r3.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
+
+ 25 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Set volkmar as second maintainer as talked with him.
+
+ 06 Jan 2012; Brent Baude <ranger@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Marking mediastreamer-2.7.3-r3 ppc stable for bug 363311
+
+ 06 Nov 2011; Fabian Groffen <grobian@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Drop ~ppc-macos, since 2.7 no longer compiles on OSX 10.5 (last ppc version)
+
+ 23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -mediastreamer-2.2.3_p1-r1.ebuild,
+ -files/mediastreamer-2.2.3_p1-autodeps.patch, -mediastreamer-2.5.0.ebuild,
+ -mediastreamer-2.6.0.ebuild, mediastreamer-2.7.3-r3.ebuild:
+ Punt static libraries and libtool archives, remove overshadowed versions.
+
+ 14 Oct 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Allow building with pulseaudio only, bug #384961 wrt niks1024 AT gmail.com
+
+ 01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Rename USE="v4l2" to USE="v4l" wrt #385241
+
+ 29 Aug 2011; Fabian Groffen <grobian@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Marked *-macos, bug #362691
+
+ 16 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Marked ~ppc/~ppc64 wrt #362691
+
+ 15 May 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3.ebuild,
+ -mediastreamer-2.7.3-r2.ebuild, mediastreamer-2.7.3-r3.ebuild:
+ Drop xv USE flag as it is not optional, bug #365653 thank Willard Dawson
+ for report.
+
+ 14 May 2011; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ x86 stable per bug 363311
+
+ 01 May 2011; Markos Chandras <hwoarang@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Stable on amd64 wrt bug #363311
+
+ 30 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Update REQUIRED_USE to avoid build failure, bug #364657, wrt Diego Elio
+ Pettenò
+
+*mediastreamer-2.7.3-r3 (20 Apr 2011)
+
+ 20 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r3.ebuild:
+ Fixed undefined reference on v4l_desc, bug #363603 thank Fred Röhner for
+ report and tests.
+
+*mediastreamer-2.7.3-r2 (14 Apr 2011)
+
+ 14 Apr 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3-r1.ebuild,
+ +mediastreamer-2.7.3-r2.ebuild:
+ Revision bump for bug #362883 wrt Andrei Slavoiu
+
+ 12 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r1.ebuild,
+ +files/mediastreamer-2.7.3-sdl-build.patch:
+ Added patch to fix build issue with USE=sdl, bug #362883 thank Luigi 'Comio'
+ Mantellini for report and for help.
+
+*mediastreamer-2.7.3-r1 (09 Apr 2011)
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r1.ebuild,
+ metadata.xml:
+ Added amr plugin dependency, bug 356977 wrt Andrew Savchenko.
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3.ebuild,
+ +files/mediastreamer-2.7.3-v4l-automagic.patch:
+ Finally fix v4l1 automagic and inability to be built with
+ linux-headers-2.6.38, bug 361107 thank Guillaume BINET for report and Ted
+ Rodgers, hirakendu and for help.
+
+*mediastreamer-2.7.3 (09 Apr 2011)
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3.ebuild:
+ Version bump, bug #356977 wrt Andrew Savchenko. Use virtual/ffmpeg, bug
+ #356977 by Tomáš Chvátal. Always depend on v4l2 as ./configure.ac
+ suggests, fixes automagic dep on v4l, bug 352713 thank Markus Oehme for
+ report.
+
+ 01 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+ mediastreamer-2.6.0.ebuild:
+ Stable on amd64 wrt bug #349258
+
+ 27 Dec 2010; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.6.0.ebuild:
+ x86 stable per bug 349258
+
+ 04 Dec 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.6.0.ebuild:
+ Fix automagick dependency on pulseaudio, bug #347163, thank Markus Oehme for
+ report.
+
+*mediastreamer-2.6.0 (23 Jul 2010)
+
+ 23 Jul 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.6.0.ebuild:
+ Version bump.
+
+ 18 Jul 2010; <nixnut@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
+ ppc stable #317235
+
+ 10 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ mediastreamer-2.3.0-r1.ebuild:
+ x86 stable wrt bug #317235
+
+*mediastreamer-2.5.0 (07 Jun 2010)
+
+ 07 Jun 2010; Peter Volkov <pva@gentoo.org> -mediastreamer-2.2.4.ebuild,
+ -mediastreamer-2.3.0.ebuild, -mediastreamer-2.4.0.ebuild,
+ +mediastreamer-2.5.0.ebuild:
+ Version bump. Drop old.
+
+ 21 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.4.0.ebuild:
+ mediastreamer-2.4.0 requires ortp-0.16.2, bug 320751, thank Nikoli for
+ report. Use nongnu mirrors.
+
+*mediastreamer-2.4.0 (20 May 2010)
+
+ 20 May 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.4.0.ebuild:
+ Version bump.
+
+ 20 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
+ amd64 stable, bug 317235.
+
+*mediastreamer-2.3.0-r1 (21 Mar 2010)
+
+ 21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+ +mediastreamer-2.3.0-r1.ebuild:
+ Revbump for Darwin (coreaudio) support, bump to EAPI=3 for Prefix support,
+ marked ~ppc-macos and ~x86-macos, bug #310215
+
+ 23 Feb 2010; Joseph Jezak <josejx@gentoo.org> mediastreamer-2.3.0.ebuild:
+ Marked ~ppc64.
+
+*mediastreamer-2.3.0 (08 Feb 2010)
+
+ 08 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org>
+ +mediastreamer-2.3.0.ebuild:
+ Version bump
+
+ 15 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild,
+ -files/mediastreamer-2.2.3_p1-arts.patch, mediastreamer-2.2.4.ebuild:
+ Remove arts related patch and clean ebuilds, wrt bug 291546
+
+ 11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild, mediastreamer-2.2.4.ebuild:
+ Remove USE arts (deprecated).
+
+*mediastreamer-2.2.4 (20 Aug 2009)
+
+ 20 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+ +mediastreamer-2.2.4.ebuild:
+ Version bump.
+
+ 19 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+ -mediastreamer-2.2.3-r1.ebuild, -files/mediastreamer-2.2.3-arts.patch,
+ -files/mediastreamer-2.2.3-autodeps.patch:
+ Removing old ebuilds and patches
+
+ 08 Jul 2009; Markus Meier <maekke@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ amd64 stable, bug #259172
+
+ 03 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ Stable on ppc, bug 259172
+
+ 02 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ stable x86, bug 259172
+
+ 12 Jun 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
+ Add alsa as default USE flag. Fix bug 273762.
+
+ 16 May 2009; Mounir Lamouri <volkmar@gentoo.org> metadata.xml:
+ Use global gsm USE flag instead of local one.
+
+ 15 May 2009; Markus Meier <maekke@gentoo.org>
+ mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
+ add ~amd64, bug #267491
+
+ 13 May 2009; Christian Faulhammer <fauli@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ keyworded ~arch for x86, bug 267491
+
+ 30 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ Add missing x264 USE flag.
+
+*mediastreamer-2.2.3_p1-r1 (28 Apr 2009)
+*mediastreamer-2.2.3-r1 (28 Apr 2009)
+
+ 28 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ -mediastreamer-2.2.3.ebuild, +mediastreamer-2.2.3-r1.ebuild,
+ -mediastreamer-2.2.3_p1.ebuild, +mediastreamer-2.2.3_p1-r1.ebuild:
+ Add mediastreamer plugins in PDEPEND and speex has a default use flag.
+
+*mediastreamer-2.2.3_p1 (27 Apr 2009)
+
+ 27 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ +files/mediastreamer-2.2.3_p1-arts.patch,
+ +files/mediastreamer-2.2.3_p1-autodeps.patch,
+ +mediastreamer-2.2.3_p1.ebuild:
+ Add mediastreamer-2.2.3 with diff from bundled on in linphone-3.1.1 to make it
+ working with it.
+
+*mediastreamer-2.2.3 (25 Apr 2009)
+
+ 25 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ +files/mediastreamer-2.2.3-arts.patch,
+ +files/mediastreamer-2.2.3-autodeps.patch, +metadata.xml,
+ +mediastreamer-2.2.3.ebuild:
+ Initial commit. Actually, new-born (and bump) for this package removed a few
+ months ago.
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
new file mode 100644
index 0000000..21c122a
--- /dev/null
+++ b/media-libs/mediastreamer/Manifest
@@ -0,0 +1,8 @@
+AUX mediastreamer-2.9.0-libav9.patch 4535 SHA256 dc42bcd66c81dec0ab38058c640f575b75a6c0688db2bd7dc4a8e45fafaa196a SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde WHIRLPOOL eddab46d033521e95b8dbdc4602a2441fb28a3e086ee2b21cf60113127738cf1ab868e24f65dd0f0ab0e52f2bf8a33a86747f316bc5cf0ee716bcd118c21ef08
+AUX mediastreamer-2.9.0-tests.patch 587 SHA256 80fc8b229e41adde9d00fd38a0ad44ab028db9e4acbf5c7c5e612e581e7541c3 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011 WHIRLPOOL 7e55e8b284c58a3ab36899bc078600da205cacf5e947a954f289d3a898f1940083ff43e35222d4bb566b260055950f314b4c70169bd796b4f8ed205dfbcf65e2
+AUX mediastreamer-2.9.0-underlinking.patch 1969 SHA256 03cdca023eaf4e787a179c1e373b5d6c3728a69ba761c8e89a508cce7e2db27c SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e WHIRLPOOL 3201cd07595865a3dd42efd53b2a13f3ec2d2a87c53c2313776e0ee1e0b3e155153bad0a0789b74aab2d57ef8c59ff5a9d44fc79a99effb0ec90f6e3a02a2f53
+AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 SHA256 e5dcb6b61e3536a60d38ed96ac0ff9d9c9044042bb8356bedd3ef2594ff7b64d SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf WHIRLPOOL 9e7864f87e3976963198632c45756a15015f45aa6b11f327026b9c3a1e0e5d8af9e4a9d9bf312b8255fabbbc7b71df9d38990cfbb07e3a41f164296005548e4f
+DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce29ce78de0afe1e191f4f3c62656acd5 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0 WHIRLPOOL 9e425ff2e461ceb6dae3890e6bd8035de65f5b3fd0590e01b75259c0d27dd54cfd37cb88d43752c2903c954ac44e353e4ed63588d3f08ec690da77293a31ba68
+EBUILD mediastreamer-2.9.0-r1.ebuild 4414 SHA256 ebda9de951d3994f0a9533fe9cdf311165aa6d655e73a555dfb41cbffe391581 SHA512 3a37158e0e31d5c070c998cbd5ec5db453d5618062a4fbaa1242f9daace70aca34093d0747df1c48d81cf84c3179b6cce09727721613e8e2493bc6cc664c3ac4 WHIRLPOOL 9df5df50e7f3ac2471b99159b9a3077633785b3993d423bd9987abfb82d268af687516ad803fe0dcb7ceff336be3097ccdcef283dfd3f1eff68901cf509d916c
+MISC ChangeLog 11421 SHA256 96694a3b938939685825c5c612185796fc30342885bcf68104f33d9459e0011b SHA512 9c595ede1aecefc8db56b2ef84fc6dd1fb828bc105d181b5786027c6353a313885379296d45417c683ab6991fec6abcf9d1cd5c4c2f3bf88d507bb32c68b2816 WHIRLPOOL 6d7e07472c2e852a784197e96595aa62dfc7fbc8961fc65595b94216e403e511ea0775154f429ff0f741ec29bc5fed4c715b5948ebe2b60765d33d664a5c17c7
+MISC metadata.xml 1037 SHA256 108a3e247cf1bbdb0c650b96f12ca1e8a57c6fa4117b2cb6ca805f942f2766f3 SHA512 e94f5284f668b943028d829164553258858a37da0cf5da1d49125cf790aba9c7dabd3f590dc9640cfeb8e8198a92392e8179d03d92e1a22ad7672706d2c36632 WHIRLPOOL 3a62c886fd7ad845d6da928d5e6bc1f61edcace4f774fb51b5d823bde40c76ab355447cf15a7fbef9f20728a16c32431c93a3a3fcad186b7f63f2aef3af75554
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
new file mode 100644
index 0000000..078f360
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
@@ -0,0 +1,120 @@
+diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
+index 38881c1..f306723 100644
+--- a/src/videofilters/h264dec.c
++++ b/src/videofilters/h264dec.c
+@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
+ int error;
+ codec=avcodec_find_decoder(CODEC_ID_H264);
+ if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
+- avcodec_get_context_defaults(&d->av_context);
+- error=avcodec_open(&d->av_context,codec);
++ avcodec_get_context_defaults3(&d->av_context, NULL);
++ error=avcodec_open2(&d->av_context,codec, NULL);
+ if (error!=0){
+- ms_fatal("avcodec_open() failed.");
++ ms_fatal("avcodec_open2() failed.");
+ }
+ }
+
+diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
+index 891f618..96f5d7f 100644
+--- a/src/videofilters/jpegwriter.c
++++ b/src/videofilters/jpegwriter.c
+@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
+ mblk_t *jpegm;
+ struct SwsContext *sws_ctx;
+
+- AVCodecContext *avctx=avcodec_alloc_context();
++ AVCodecContext *avctx=avcodec_alloc_context3(NULL);
+
+ avctx->width=yuvbuf.w;
+ avctx->height=yuvbuf.h;
+@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
+ avctx->time_base.den =1;
+ avctx->pix_fmt=PIX_FMT_YUVJ420P;
+
+- error=avcodec_open(avctx,s->codec);
++ error=avcodec_open2(avctx,s->codec,NULL);
+ if (error!=0) {
+- ms_error("avcodec_open() failed: %i",error);
++ ms_error("avcodec_open2() failed: %i",error);
+ cleanup(s,NULL);
+ av_free(avctx);
+ return;
+diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
+index 60e3853..329c453 100644
+--- a/src/videofilters/nowebcam.c
++++ b/src/videofilters/nowebcam.c
+@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
+ return NULL;
+ }
+
+- avcodec_get_context_defaults(&av_context);
+- if (avcodec_open(&av_context,codec)<0){
+- ms_error("jpeg2yuv: avcodec_open failed");
++ avcodec_get_context_defaults3(&av_context, NULL);
++ if (avcodec_open2(&av_context,codec,NULL)<0){
++ ms_error("jpeg2yuv: avcodec_open2 failed");
+ return NULL;
+ }
+ av_init_packet(&pkt);
+diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
+index 494debf..c52e207 100644
+--- a/src/videofilters/videodec.c
++++ b/src/videofilters/videodec.c
+@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
+ DecState *s=(DecState *)ms_new0(DecState,1);
+ ms_ffmpeg_check_init();
+
+- avcodec_get_context_defaults(&s->av_context);
++ avcodec_get_context_defaults3(&s->av_context, NULL);
+ s->av_codec=NULL;
+ s->codec=cid;
+ s->input=NULL;
+@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
+ if (s->av_context.codec==NULL){
+ /* we must know picture size before initializing snow decoder*/
+ if (s->codec!=CODEC_ID_SNOW){
+- error=avcodec_open(&s->av_context, s->av_codec);
+- if (error!=0) ms_error("avcodec_open() failed: %i",error);
++ error=avcodec_open2(&s->av_context, s->av_codec,NULL);
++ if (error!=0) ms_error("avcodec_open2() failed: %i",error);
+ if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
+ s->av_context.extradata=s->dci;
+ s->av_context.extradata_size=s->dci_size;
+@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
+ int error;
+ s->av_context.width=h>>16;
+ s->av_context.height=h&0xffff;
+- error=avcodec_open(&s->av_context, s->av_codec);
+- if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
++ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
++ if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
+ else {
+ s->snow_initialized=TRUE;
+ ms_message("Snow decoder initialized,size=%ix%i",
+diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
+index da35592..09dcc9d 100644
+--- a/src/videofilters/videoenc.c
++++ b/src/videofilters/videoenc.c
+@@ -242,7 +242,7 @@ static void prepare(EncState *s){
+ AVCodecContext *c=&s->av_context;
+ const int max_br_vbv=128000;
+
+- avcodec_get_context_defaults(c);
++ avcodec_get_context_defaults3(c, NULL);
+ if (s->codec==CODEC_ID_MJPEG)
+ {
+ ms_message("Codec bitrate set to %i",c->bit_rate);
+@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
+ ms_error("could not find encoder for codec id %i",s->codec);
+ return;
+ }
+- error=avcodec_open(&s->av_context, s->av_codec);
++ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
+ if (error!=0) {
+- ms_error("avcodec_open() failed: %i",error);
++ ms_error("avcodec_open2() failed: %i",error);
+ return;
+ }
+ video_starter_init(&s->starter);
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
new file mode 100644
index 0000000..3bcb8bd
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
@@ -0,0 +1,26 @@
+From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 21:18:28 +0200
+Subject: [PATCH] fix tests
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4b923a9..4aec221 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -873,6 +873,9 @@ case "$target_os" in
+ #hack for macport
+ CUNIT_LIBS+=" -lncurses"
+ ;;
++ *linux*)
++ CUNIT_LIBS+=" -lncurses"
++ ;;
+ *mingw*)
+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
+ LIBS="$LIBS -lws2_32 -liphlpapi"
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
new file mode 100644
index 0000000..19d6af8
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
@@ -0,0 +1,57 @@
+From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 18:24:28 +0200
+Subject: [PATCH] fix underlinking
+
+---
+ configure.ac | 20 ++++++++++++++++++++
+ src/Makefile.am | 2 +-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f402bd..4b923a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -893,6 +893,26 @@ fi
+
+ AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
+
++dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
++dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
++LIB_CLOCK_GETTIME=
++clk_saved_libs=$LIBS
++AC_SEARCH_LIBS([clock_gettime], [rt posix4],
++ [test "$ac_cv_search_clock_gettime" = "none required" ||
++ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
++AC_SUBST([LIB_CLOCK_GETTIME])
++
++AC_MSG_CHECKING([for working clock_gettime])
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
++ [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
++AC_MSG_RESULT($gnupg_cv_clock_gettime)
++
++if test x"$gnupg_cv_clock_gettime" = xyes; then
++ AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
++ [Define to 1 if you have the `clock_gettime' function.])
++fi
++LIBS=$clk_saved_libs
++
+
+ dnl ##################################################
+ dnl # Check for doxygen
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a315e92..a5e144c 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -266,7 +266,7 @@ voipdescs.h: Makefile $(libmediastreamer_voip_la_SOURCES)
+ awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
+
+
+-libmediastreamer_base_la_LIBADD= $(ORTP_LIBS)
++libmediastreamer_base_la_LIBADD= $(ORTP_LIBS) @LIB_CLOCK_GETTIME@
+ libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
+
+ if !BUILD_WIN32
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
new file mode 100644
index 0000000..c590aef
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
@@ -0,0 +1,55 @@
+From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 18:12:46 +0200
+Subject: [PATCH] Support disabling V4L support completely
+
+---
+ configure.ac | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94b6f18..9f402bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data])
+ AC_SUBST(PACKAGE_DATA_DIR)
+
++AC_ARG_ENABLE(v4l,
++ [ --disable-v4l Disable usage of v4l],
++ [case "${enableval}" in
++ yes) v4l=yes ;;
++ no) v4l=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
++ esac],[v4l=yes])
++
++if test "$v4l" = "yes" ; then
++
+ dnl check for video4linux headers
+ AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
+ if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
+@@ -759,9 +769,6 @@ else
+ found_v4l2=no
+ fi
+
+-AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
+-AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
+-
+ AC_ARG_ENABLE(libv4l1,
+ [AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
+ [case "${enableval}" in
+@@ -805,6 +812,11 @@ this check.
+ fi
+ fi
+
++fi
++
++AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
++AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
++
+
+ AC_PATH_PROG(PCAP,pcap-config,false)
+ AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
new file mode 100644
index 0000000..5aeafe7
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild,v 1.2 2013/10/09 19:36:13 hasufell Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/2.9"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Many cameras will not work or will crash an application if mediastreamer2 is
+# not built with v4l2 support (taken from configure.ac)
+# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
+IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
+ ipv6 ntp-timestamp opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
+ static-libs test theora upnp v4l video x264 X"
+
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
+ video? ( || ( sdl X ) )
+ theora? ( video )
+ X? ( video )
+ v4l? ( video )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ g726? ( >=media-libs/spandsp-0.0.6_pre1 )
+ gsm? ( media-sound/gsm )
+ opus? ( media-libs/opus )
+ ortp? ( >=net-libs/ortp-0.17[ipv6?] )
+ pcap? ( sys-libs/libcap )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+ speex? ( >=media-libs/speex-1.2_beta3 )
+ upnp? ( net-libs/libupnp )
+ video? (
+ virtual/ffmpeg
+ v4l? ( media-libs/libv4l
+ sys-kernel/linux-headers )
+ theora? ( media-libs/libtheora )
+ sdl? ( media-libs/libsdl[video,X] )
+ X? ( x11-libs/libX11
+ x11-libs/libXv ) )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cunit-2.1_p2[ncurses] )
+ X? ( x11-proto/videoproto )"
+
+PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+ g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
+ ilbc? ( media-plugins/mediastreamer-ilbc )
+ video? ( x264? ( media-plugins/mediastreamer-x264 ) )
+ silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
+
+src_prepare() {
+ # variable causes "command not found" warning and is not
+ # needed anyway
+ sed -i \
+ -e 's/$(ACLOCAL_MACOS_FLAGS)//' \
+ Makefile.am || die
+
+ # respect user's CFLAGS
+ sed -i \
+ -e "s:-O2::;s: -g::" \
+ configure.ac || die "patching configure.ac failed"
+
+ # change default paths
+ sed -i \
+ -e "s:\(prefix/share\):\1/${PN}:" \
+ configure.ac || die "patching configure.ac failed"
+
+ # fix doc installation dir
+ sed -i \
+ -e "s:\$(pkgdocdir):\$(docdir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # fix html installation dir
+ sed -i \
+ -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # linux/videodev.h dropped in 2.6.38
+ sed -i \
+ -e 's:linux/videodev.h ::' \
+ configure.ac || die
+
+ epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
+ "${FILESDIR}/${P}-libav9.patch" \
+ "${FILESDIR}/${P}-underlinking.patch" \
+ "${FILESDIR}/${P}-tests.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ --datadir="${EPREFIX}"/usr/share/${PN}
+ # arts is deprecated
+ --disable-artsc
+ # don't want -Werror
+ --disable-strict
+ --disable-libv4l1
+ # don't use bundled libs
+ --enable-external-ortp
+ $(use_enable alsa)
+ $(use_enable pulseaudio)
+ $(use_enable coreaudio macsnd)
+ $(use_enable debug)
+ $(use_enable filters)
+ $(use_enable g726 spandsp)
+ $(use_enable gsm)
+ $(use_enable ipv6)
+ $(use_enable ntp-timestamp)
+ $(use_enable opus)
+ $(use_enable ortp)
+ $(use_enable oss)
+ $(use_enable pcap)
+ $(use_enable portaudio)
+ $(use_enable speex)
+ $(use_enable static-libs static)
+ $(use_enable theora)
+ $(use_enable upnp)
+ $(use_enable video)
+ $(use_enable v4l)
+ $(use_enable v4l libv4l2)
+ $(use_enable sdl)
+ $(use_enable X x11)
+ $(use_enable X xv)
+
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ # Mac OS X Audio Queue is an audio recording facility, available on
+ # 10.5 (Leopard, Darwin9) and onward
+ if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
+ then
+ myeconfargs+=( --enable-macaqsnd )
+ else
+ myeconfargs+=( --disable-macaqsnd )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ default
+ cd tester || die
+ ./mediastreamer2_tester || die
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins tester/*.c
+ fi
+}
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
new file mode 100644
index 0000000..3596cd9
--- /dev/null
+++ b/media-libs/mediastreamer/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>voip</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bircoph@gmail.com</email>
+ <name>Andrew Savchenko</name>
+ <description>Proxy maintainer. Assign bugs to him.</description>
+ </maintainer>
+ <use>
+ <flag name="amr">Use of AMR Narrow Band codec plugin</flag>
+ <flag name="filters">Enable compilation of filters</flag>
+ <flag name="g726">Support g726 codec</flag>
+ <flag name="g729">Use g726 codec plugin</flag>
+ <flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
+ <flag name="ntp-timestamp">Turn on NTP timestamping on received
+ packet</flag>
+ <flag name="opus">Enable opus codec support</flag>
+ <flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
+ <flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
+ <flag name="silk">Use silk (skype protocol) codec plugin</flag>
+ <flag name="video">Enable video support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/voip:master commit in: media-libs/mediastreamer/, media-libs/mediastreamer/files/
@ 2013-10-13 2:28 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2013-10-13 2:28 UTC (permalink / raw
To: gentoo-commits
commit: 87257a7b1aa0b638587ecf9bd40d90b2377bd258
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Oct 13 02:13:53 2013 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Oct 13 02:13:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=87257a7b
mediastreamer: fixed in portage
---
media-libs/mediastreamer/ChangeLog | 313 ---------------------
media-libs/mediastreamer/Manifest | 8 -
.../files/mediastreamer-2.9.0-libav9.patch | 120 --------
.../files/mediastreamer-2.9.0-tests.patch | 26 --
.../files/mediastreamer-2.9.0-underlinking.patch | 57 ----
.../files/mediastreamer-2.9.0-v4l-automagic.patch | 55 ----
.../mediastreamer/mediastreamer-2.9.0.ebuild | 171 -----------
media-libs/mediastreamer/metadata.xml | 25 --
8 files changed, 775 deletions(-)
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
deleted file mode 100644
index 69f8707..0000000
--- a/media-libs/mediastreamer/ChangeLog
+++ /dev/null
@@ -1,313 +0,0 @@
-# ChangeLog for media-libs/mediastreamer
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.71 2013/10/09 19:36:13 hasufell Exp $
-
- 11 Oct 2013; Andrew Savchenko <bircoph@gmail.com>
- +mediastreamer-2.9.0.ebuild, -mediastreamer-2.9.0-r1.ebuild:
- Sync with portage.
-
-*mediastreamer-2.9.0-r1 (10 Oct 2013)
-
- 10 Oct 2013; Andrew Savchenko <bircoph@gmail.com>
- +mediastreamer-2.9.0-r1.ebuild, +files/mediastreamer-2.9.0-libav9.patch,
- +files/mediastreamer-2.9.0-tests.patch,
- +files/mediastreamer-2.9.0-underlinking.patch,
- +files/mediastreamer-2.9.0-v4l-automagic.patch, +metadata.xml:
- Add slot version. Plugins need to be rebuild on slot update.
- Depend on vim-core, because xxd is used in the Makefile.
-
- 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild,
- +files/mediastreamer-2.9.0-tests.patch:
- fix tests
-
-*mediastreamer-2.9.0 (09 Oct 2013)
-
- 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> +mediastreamer-2.9.0.ebuild,
- +files/mediastreamer-2.9.0-libav9.patch,
- +files/mediastreamer-2.9.0-underlinking.patch,
- +files/mediastreamer-2.9.0-v4l-automagic.patch, metadata.xml:
- version bump wrt #486500
-
- 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Stable for ppc64, wrt bug #464536
-
- 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Stable for ppc, wrt bug #464536
-
- 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Stable for amd64, wrt bug #464536
-
- 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Stable for x86, wrt bug #464536
-
- 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> mediastreamer-2.8.2.ebuild:
- Depend on intltool wrt bug#474340.
-
- 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
- +files/mediastreamer-2.8.2-libav9.patch, mediastreamer-2.8.2.ebuild:
- Append simple patch for new api usage. Fixes build with libav9. Wrt
- bug#457860.
-
- 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
- Stable for ppc64, wrt bug #462890
-
- 16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Cleanup due bug #96436
-
- 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mediastreamer-2.8.2.ebuild,
- +files/mediastreamer-2.8.2-ffmpeg-1.0.patch:
- Fix build with latest ffmpeg. By Reuben Martin, bug #445168.
-
- 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Add ~ppc64, wrt bug #443964
-
- 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
- Add ~ppc, wrt bug #443964
-
- 16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Cleanup due retirement, #260683
-
- 22 Nov 2012; Michał Górny <mgorny@gentoo.org>
- files/mediastreamer-2.8.2-v4l-automagic.patch:
- Replace the V4L patch with a correct one.
-
-*mediastreamer-2.8.2 (19 Nov 2012)
-
- 19 Nov 2012; Michał Górny <mgorny@gentoo.org>
- +files/mediastreamer-2.8.2-autopoint.patch,
- +files/mediastreamer-2.8.2-v4l-automagic.patch, +mediastreamer-2.8.2.ebuild,
- metadata.xml:
- Version bump wrt bug #399737. Thanks to Andrew Savchenko for his effort on
- linphone ebuilds.
-
- 07 Nov 2012; Alexis Ballier <aballier@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild, +files/mediastreamer-2.7.3-ffmpeg-0.11.patch,
- +files/mediastreamer-2.7.3-videoenc_282.patch:
- Fix build with recent ffmpeg versions, bug #419453
-
- 16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
- -mediastreamer-2.3.0-r1.ebuild:
- Punt version that depended only on media-video/ffmpeg.
-
- 05 May 2012; Jeff Horelick <jdhore@gentoo.org> mediastreamer-2.3.0-r1.ebuild,
- mediastreamer-2.7.3-r3.ebuild:
- dev-util/pkgconfig -> virtual/pkgconfig
-
- 25 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Set volkmar as second maintainer as talked with him.
-
- 06 Jan 2012; Brent Baude <ranger@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
- Marking mediastreamer-2.7.3-r3 ppc stable for bug 363311
-
- 06 Nov 2011; Fabian Groffen <grobian@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild:
- Drop ~ppc-macos, since 2.7 no longer compiles on OSX 10.5 (last ppc version)
-
- 23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
- -mediastreamer-2.2.3_p1-r1.ebuild,
- -files/mediastreamer-2.2.3_p1-autodeps.patch, -mediastreamer-2.5.0.ebuild,
- -mediastreamer-2.6.0.ebuild, mediastreamer-2.7.3-r3.ebuild:
- Punt static libraries and libtool archives, remove overshadowed versions.
-
- 14 Oct 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
- Allow building with pulseaudio only, bug #384961 wrt niks1024 AT gmail.com
-
- 01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild:
- Rename USE="v4l2" to USE="v4l" wrt #385241
-
- 29 Aug 2011; Fabian Groffen <grobian@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild:
- Marked *-macos, bug #362691
-
- 16 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild:
- Marked ~ppc/~ppc64 wrt #362691
-
- 15 May 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3.ebuild,
- -mediastreamer-2.7.3-r2.ebuild, mediastreamer-2.7.3-r3.ebuild:
- Drop xv USE flag as it is not optional, bug #365653 thank Willard Dawson
- for report.
-
- 14 May 2011; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
- x86 stable per bug 363311
-
- 01 May 2011; Markos Chandras <hwoarang@gentoo.org>
- mediastreamer-2.7.3-r3.ebuild:
- Stable on amd64 wrt bug #363311
-
- 30 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
- Update REQUIRED_USE to avoid build failure, bug #364657, wrt Diego Elio
- Pettenò
-
-*mediastreamer-2.7.3-r3 (20 Apr 2011)
-
- 20 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r3.ebuild:
- Fixed undefined reference on v4l_desc, bug #363603 thank Fred Röhner for
- report and tests.
-
-*mediastreamer-2.7.3-r2 (14 Apr 2011)
-
- 14 Apr 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3-r1.ebuild,
- +mediastreamer-2.7.3-r2.ebuild:
- Revision bump for bug #362883 wrt Andrei Slavoiu
-
- 12 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r1.ebuild,
- +files/mediastreamer-2.7.3-sdl-build.patch:
- Added patch to fix build issue with USE=sdl, bug #362883 thank Luigi 'Comio'
- Mantellini for report and for help.
-
-*mediastreamer-2.7.3-r1 (09 Apr 2011)
-
- 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r1.ebuild,
- metadata.xml:
- Added amr plugin dependency, bug 356977 wrt Andrew Savchenko.
-
- 09 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3.ebuild,
- +files/mediastreamer-2.7.3-v4l-automagic.patch:
- Finally fix v4l1 automagic and inability to be built with
- linux-headers-2.6.38, bug 361107 thank Guillaume BINET for report and Ted
- Rodgers, hirakendu and for help.
-
-*mediastreamer-2.7.3 (09 Apr 2011)
-
- 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3.ebuild:
- Version bump, bug #356977 wrt Andrew Savchenko. Use virtual/ffmpeg, bug
- #356977 by Tomáš Chvátal. Always depend on v4l2 as ./configure.ac
- suggests, fixes automagic dep on v4l, bug 352713 thank Markus Oehme for
- report.
-
- 01 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
- mediastreamer-2.6.0.ebuild:
- Stable on amd64 wrt bug #349258
-
- 27 Dec 2010; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.6.0.ebuild:
- x86 stable per bug 349258
-
- 04 Dec 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.6.0.ebuild:
- Fix automagick dependency on pulseaudio, bug #347163, thank Markus Oehme for
- report.
-
-*mediastreamer-2.6.0 (23 Jul 2010)
-
- 23 Jul 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.6.0.ebuild:
- Version bump.
-
- 18 Jul 2010; <nixnut@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
- ppc stable #317235
-
- 10 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- mediastreamer-2.3.0-r1.ebuild:
- x86 stable wrt bug #317235
-
-*mediastreamer-2.5.0 (07 Jun 2010)
-
- 07 Jun 2010; Peter Volkov <pva@gentoo.org> -mediastreamer-2.2.4.ebuild,
- -mediastreamer-2.3.0.ebuild, -mediastreamer-2.4.0.ebuild,
- +mediastreamer-2.5.0.ebuild:
- Version bump. Drop old.
-
- 21 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.4.0.ebuild:
- mediastreamer-2.4.0 requires ortp-0.16.2, bug 320751, thank Nikoli for
- report. Use nongnu mirrors.
-
-*mediastreamer-2.4.0 (20 May 2010)
-
- 20 May 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.4.0.ebuild:
- Version bump.
-
- 20 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
- amd64 stable, bug 317235.
-
-*mediastreamer-2.3.0-r1 (21 Mar 2010)
-
- 21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
- +mediastreamer-2.3.0-r1.ebuild:
- Revbump for Darwin (coreaudio) support, bump to EAPI=3 for Prefix support,
- marked ~ppc-macos and ~x86-macos, bug #310215
-
- 23 Feb 2010; Joseph Jezak <josejx@gentoo.org> mediastreamer-2.3.0.ebuild:
- Marked ~ppc64.
-
-*mediastreamer-2.3.0 (08 Feb 2010)
-
- 08 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org>
- +mediastreamer-2.3.0.ebuild:
- Version bump
-
- 15 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild,
- -files/mediastreamer-2.2.3_p1-arts.patch, mediastreamer-2.2.4.ebuild:
- Remove arts related patch and clean ebuilds, wrt bug 291546
-
- 11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild, mediastreamer-2.2.4.ebuild:
- Remove USE arts (deprecated).
-
-*mediastreamer-2.2.4 (20 Aug 2009)
-
- 20 Aug 2009; Mike Frysinger <vapier@gentoo.org>
- +mediastreamer-2.2.4.ebuild:
- Version bump.
-
- 19 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
- -mediastreamer-2.2.3-r1.ebuild, -files/mediastreamer-2.2.3-arts.patch,
- -files/mediastreamer-2.2.3-autodeps.patch:
- Removing old ebuilds and patches
-
- 08 Jul 2009; Markus Meier <maekke@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild:
- amd64 stable, bug #259172
-
- 03 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild:
- Stable on ppc, bug 259172
-
- 02 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild:
- stable x86, bug 259172
-
- 12 Jun 2009; Mounir Lamouri <volkmar@gentoo.org>
- mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
- Add alsa as default USE flag. Fix bug 273762.
-
- 16 May 2009; Mounir Lamouri <volkmar@gentoo.org> metadata.xml:
- Use global gsm USE flag instead of local one.
-
- 15 May 2009; Markus Meier <maekke@gentoo.org>
- mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
- add ~amd64, bug #267491
-
- 13 May 2009; Christian Faulhammer <fauli@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild:
- keyworded ~arch for x86, bug 267491
-
- 30 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
- mediastreamer-2.2.3_p1-r1.ebuild:
- Add missing x264 USE flag.
-
-*mediastreamer-2.2.3_p1-r1 (28 Apr 2009)
-*mediastreamer-2.2.3-r1 (28 Apr 2009)
-
- 28 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
- -mediastreamer-2.2.3.ebuild, +mediastreamer-2.2.3-r1.ebuild,
- -mediastreamer-2.2.3_p1.ebuild, +mediastreamer-2.2.3_p1-r1.ebuild:
- Add mediastreamer plugins in PDEPEND and speex has a default use flag.
-
-*mediastreamer-2.2.3_p1 (27 Apr 2009)
-
- 27 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
- +files/mediastreamer-2.2.3_p1-arts.patch,
- +files/mediastreamer-2.2.3_p1-autodeps.patch,
- +mediastreamer-2.2.3_p1.ebuild:
- Add mediastreamer-2.2.3 with diff from bundled on in linphone-3.1.1 to make it
- working with it.
-
-*mediastreamer-2.2.3 (25 Apr 2009)
-
- 25 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
- +files/mediastreamer-2.2.3-arts.patch,
- +files/mediastreamer-2.2.3-autodeps.patch, +metadata.xml,
- +mediastreamer-2.2.3.ebuild:
- Initial commit. Actually, new-born (and bump) for this package removed a few
- months ago.
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
deleted file mode 100644
index 55120a1..0000000
--- a/media-libs/mediastreamer/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX mediastreamer-2.9.0-libav9.patch 4535 SHA256 dc42bcd66c81dec0ab38058c640f575b75a6c0688db2bd7dc4a8e45fafaa196a SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde WHIRLPOOL eddab46d033521e95b8dbdc4602a2441fb28a3e086ee2b21cf60113127738cf1ab868e24f65dd0f0ab0e52f2bf8a33a86747f316bc5cf0ee716bcd118c21ef08
-AUX mediastreamer-2.9.0-tests.patch 587 SHA256 80fc8b229e41adde9d00fd38a0ad44ab028db9e4acbf5c7c5e612e581e7541c3 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011 WHIRLPOOL 7e55e8b284c58a3ab36899bc078600da205cacf5e947a954f289d3a898f1940083ff43e35222d4bb566b260055950f314b4c70169bd796b4f8ed205dfbcf65e2
-AUX mediastreamer-2.9.0-underlinking.patch 1969 SHA256 03cdca023eaf4e787a179c1e373b5d6c3728a69ba761c8e89a508cce7e2db27c SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e WHIRLPOOL 3201cd07595865a3dd42efd53b2a13f3ec2d2a87c53c2313776e0ee1e0b3e155153bad0a0789b74aab2d57ef8c59ff5a9d44fc79a99effb0ec90f6e3a02a2f53
-AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 SHA256 e5dcb6b61e3536a60d38ed96ac0ff9d9c9044042bb8356bedd3ef2594ff7b64d SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf WHIRLPOOL 9e7864f87e3976963198632c45756a15015f45aa6b11f327026b9c3a1e0e5d8af9e4a9d9bf312b8255fabbbc7b71df9d38990cfbb07e3a41f164296005548e4f
-DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce29ce78de0afe1e191f4f3c62656acd5 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0 WHIRLPOOL 9e425ff2e461ceb6dae3890e6bd8035de65f5b3fd0590e01b75259c0d27dd54cfd37cb88d43752c2903c954ac44e353e4ed63588d3f08ec690da77293a31ba68
-EBUILD mediastreamer-2.9.0.ebuild 4561 SHA256 5ad0350da81cbae246ac86d64e850644a6d951323fc3bb62bacd430044fe63a1 SHA512 df58950abec0ead890f9b64f0cb5be2dbfc05bbec2649fc149e8fbd736e1a60642db3d7ca601418cd3491dc344d4d00c154043eb1901d3528391c1825e54b115 WHIRLPOOL 1c0ea82eb7ca3a098de09df000b546027467905bd18504433435ed01cd154978f911dfeb9d538915eecde41c9f22d069c78f9ca2f779a29191db5b28936015b3
-MISC ChangeLog 11615 SHA256 fb531d5a48944a2315c4fb0d1a1069cdf2e725a2b3becbb5f7ac7c5bbb45af4a SHA512 35bc7bdd2e8866fd1c40b1f1f6bcf7cfc8ca61096dcf66866cb277dfcc7cdea2ac1d1c75fe5c31b1331631b9bb7147a1d0b8bfa3ba046cc93b630cb6f808410a WHIRLPOOL dbdf8fddd64590f7153b3370c64f5c197298eca3983b3832c2d07a127916548972ddc2240efa7d24786996eea7adbf87065c82c5a29ed95c0cc0f588c9bd98dd
-MISC metadata.xml 1037 SHA256 108a3e247cf1bbdb0c650b96f12ca1e8a57c6fa4117b2cb6ca805f942f2766f3 SHA512 e94f5284f668b943028d829164553258858a37da0cf5da1d49125cf790aba9c7dabd3f590dc9640cfeb8e8198a92392e8179d03d92e1a22ad7672706d2c36632 WHIRLPOOL 3a62c886fd7ad845d6da928d5e6bc1f61edcace4f774fb51b5d823bde40c76ab355447cf15a7fbef9f20728a16c32431c93a3a3fcad186b7f63f2aef3af75554
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
deleted file mode 100644
index 078f360..0000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
-index 38881c1..f306723 100644
---- a/src/videofilters/h264dec.c
-+++ b/src/videofilters/h264dec.c
-@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
- int error;
- codec=avcodec_find_decoder(CODEC_ID_H264);
- if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
-- avcodec_get_context_defaults(&d->av_context);
-- error=avcodec_open(&d->av_context,codec);
-+ avcodec_get_context_defaults3(&d->av_context, NULL);
-+ error=avcodec_open2(&d->av_context,codec, NULL);
- if (error!=0){
-- ms_fatal("avcodec_open() failed.");
-+ ms_fatal("avcodec_open2() failed.");
- }
- }
-
-diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
-index 891f618..96f5d7f 100644
---- a/src/videofilters/jpegwriter.c
-+++ b/src/videofilters/jpegwriter.c
-@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
- mblk_t *jpegm;
- struct SwsContext *sws_ctx;
-
-- AVCodecContext *avctx=avcodec_alloc_context();
-+ AVCodecContext *avctx=avcodec_alloc_context3(NULL);
-
- avctx->width=yuvbuf.w;
- avctx->height=yuvbuf.h;
-@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
- avctx->time_base.den =1;
- avctx->pix_fmt=PIX_FMT_YUVJ420P;
-
-- error=avcodec_open(avctx,s->codec);
-+ error=avcodec_open2(avctx,s->codec,NULL);
- if (error!=0) {
-- ms_error("avcodec_open() failed: %i",error);
-+ ms_error("avcodec_open2() failed: %i",error);
- cleanup(s,NULL);
- av_free(avctx);
- return;
-diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
-index 60e3853..329c453 100644
---- a/src/videofilters/nowebcam.c
-+++ b/src/videofilters/nowebcam.c
-@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
- return NULL;
- }
-
-- avcodec_get_context_defaults(&av_context);
-- if (avcodec_open(&av_context,codec)<0){
-- ms_error("jpeg2yuv: avcodec_open failed");
-+ avcodec_get_context_defaults3(&av_context, NULL);
-+ if (avcodec_open2(&av_context,codec,NULL)<0){
-+ ms_error("jpeg2yuv: avcodec_open2 failed");
- return NULL;
- }
- av_init_packet(&pkt);
-diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
-index 494debf..c52e207 100644
---- a/src/videofilters/videodec.c
-+++ b/src/videofilters/videodec.c
-@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
- DecState *s=(DecState *)ms_new0(DecState,1);
- ms_ffmpeg_check_init();
-
-- avcodec_get_context_defaults(&s->av_context);
-+ avcodec_get_context_defaults3(&s->av_context, NULL);
- s->av_codec=NULL;
- s->codec=cid;
- s->input=NULL;
-@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
- if (s->av_context.codec==NULL){
- /* we must know picture size before initializing snow decoder*/
- if (s->codec!=CODEC_ID_SNOW){
-- error=avcodec_open(&s->av_context, s->av_codec);
-- if (error!=0) ms_error("avcodec_open() failed: %i",error);
-+ error=avcodec_open2(&s->av_context, s->av_codec,NULL);
-+ if (error!=0) ms_error("avcodec_open2() failed: %i",error);
- if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
- s->av_context.extradata=s->dci;
- s->av_context.extradata_size=s->dci_size;
-@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
- int error;
- s->av_context.width=h>>16;
- s->av_context.height=h&0xffff;
-- error=avcodec_open(&s->av_context, s->av_codec);
-- if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
-+ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
-+ if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
- else {
- s->snow_initialized=TRUE;
- ms_message("Snow decoder initialized,size=%ix%i",
-diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
-index da35592..09dcc9d 100644
---- a/src/videofilters/videoenc.c
-+++ b/src/videofilters/videoenc.c
-@@ -242,7 +242,7 @@ static void prepare(EncState *s){
- AVCodecContext *c=&s->av_context;
- const int max_br_vbv=128000;
-
-- avcodec_get_context_defaults(c);
-+ avcodec_get_context_defaults3(c, NULL);
- if (s->codec==CODEC_ID_MJPEG)
- {
- ms_message("Codec bitrate set to %i",c->bit_rate);
-@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
- ms_error("could not find encoder for codec id %i",s->codec);
- return;
- }
-- error=avcodec_open(&s->av_context, s->av_codec);
-+ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
- if (error!=0) {
-- ms_error("avcodec_open() failed: %i",error);
-+ ms_error("avcodec_open2() failed: %i",error);
- return;
- }
- video_starter_init(&s->starter);
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
deleted file mode 100644
index 3bcb8bd..0000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 21:18:28 +0200
-Subject: [PATCH] fix tests
-
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4b923a9..4aec221 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -873,6 +873,9 @@ case "$target_os" in
- #hack for macport
- CUNIT_LIBS+=" -lncurses"
- ;;
-+ *linux*)
-+ CUNIT_LIBS+=" -lncurses"
-+ ;;
- *mingw*)
- CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
- LIBS="$LIBS -lws2_32 -liphlpapi"
---
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
deleted file mode 100644
index 19d6af8..0000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 18:24:28 +0200
-Subject: [PATCH] fix underlinking
-
----
- configure.ac | 20 ++++++++++++++++++++
- src/Makefile.am | 2 +-
- 2 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f402bd..4b923a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -893,6 +893,26 @@ fi
-
- AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
-
-+dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
-+dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
-+LIB_CLOCK_GETTIME=
-+clk_saved_libs=$LIBS
-+AC_SEARCH_LIBS([clock_gettime], [rt posix4],
-+ [test "$ac_cv_search_clock_gettime" = "none required" ||
-+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-+AC_SUBST([LIB_CLOCK_GETTIME])
-+
-+AC_MSG_CHECKING([for working clock_gettime])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
-+ [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
-+AC_MSG_RESULT($gnupg_cv_clock_gettime)
-+
-+if test x"$gnupg_cv_clock_gettime" = xyes; then
-+ AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
-+ [Define to 1 if you have the `clock_gettime' function.])
-+fi
-+LIBS=$clk_saved_libs
-+
-
- dnl ##################################################
- dnl # Check for doxygen
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a315e92..a5e144c 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -266,7 +266,7 @@ voipdescs.h: Makefile $(libmediastreamer_voip_la_SOURCES)
- awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
-
-
--libmediastreamer_base_la_LIBADD= $(ORTP_LIBS)
-+libmediastreamer_base_la_LIBADD= $(ORTP_LIBS) @LIB_CLOCK_GETTIME@
- libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
-
- if !BUILD_WIN32
---
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
deleted file mode 100644
index c590aef..0000000
--- a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Wed, 9 Oct 2013 18:12:46 +0200
-Subject: [PATCH] Support disabling V4L support completely
-
----
- configure.ac | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 94b6f18..9f402bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data])
- AC_SUBST(PACKAGE_DATA_DIR)
-
-+AC_ARG_ENABLE(v4l,
-+ [ --disable-v4l Disable usage of v4l],
-+ [case "${enableval}" in
-+ yes) v4l=yes ;;
-+ no) v4l=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
-+ esac],[v4l=yes])
-+
-+if test "$v4l" = "yes" ; then
-+
- dnl check for video4linux headers
- AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
- if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
-@@ -759,9 +769,6 @@ else
- found_v4l2=no
- fi
-
--AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
--AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
--
- AC_ARG_ENABLE(libv4l1,
- [AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
- [case "${enableval}" in
-@@ -805,6 +812,11 @@ this check.
- fi
- fi
-
-+fi
-+
-+AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
-+AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
-+
-
- AC_PATH_PROG(PCAP,pcap-config,false)
- AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
---
-1.8.3.2
-
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
deleted file mode 100644
index cdd84a9..0000000
--- a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild,v 1.3 2013/10/10 10:20:17 hasufell Exp $
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Mediastreaming library for telephony application"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Many cameras will not work or will crash an application if mediastreamer2 is
-# not built with v4l2 support (taken from configure.ac)
-# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
-IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
- ipv6 ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
- static-libs test theora upnp v4l video x264 X"
-
-REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
- video? ( || ( opengl sdl X ) )
- theora? ( video )
- X? ( video )
- v4l? ( video )
- opengl? ( video )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
- g726? ( >=media-libs/spandsp-0.0.6_pre1 )
- gsm? ( media-sound/gsm )
- opus? ( media-libs/opus )
- ortp? ( >=net-libs/ortp-0.17[ipv6?] )
- pcap? ( sys-libs/libcap )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
- speex? ( >=media-libs/speex-1.2_beta3 )
- upnp? ( net-libs/libupnp )
- video? (
- virtual/ffmpeg
- opengl? ( media-libs/glew
- virtual/opengl
- x11-libs/libX11 )
- v4l? ( media-libs/libv4l
- sys-kernel/linux-headers )
- theora? ( media-libs/libtheora )
- sdl? ( media-libs/libsdl[video,X] )
- X? ( x11-libs/libX11
- x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
- app-editors/vim-core
- dev-util/intltool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cunit-2.1_p2[ncurses] )
- X? ( x11-proto/videoproto )"
-
-PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
- g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
- ilbc? ( media-plugins/mediastreamer-ilbc )
- video? ( x264? ( media-plugins/mediastreamer-x264 ) )
- silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
-
-src_prepare() {
- # variable causes "command not found" warning and is not
- # needed anyway
- sed -i \
- -e 's/$(ACLOCAL_MACOS_FLAGS)//' \
- Makefile.am || die
-
- # respect user's CFLAGS
- sed -i \
- -e "s:-O2::;s: -g::" \
- configure.ac || die "patching configure.ac failed"
-
- # change default paths
- sed -i \
- -e "s:\(prefix/share\):\1/${PN}:" \
- configure.ac || die "patching configure.ac failed"
-
- # fix doc installation dir
- sed -i \
- -e "s:\$(pkgdocdir):\$(docdir):" \
- help/Makefile.am || die "patching help/Makefile.am failed"
-
- # fix html installation dir
- sed -i \
- -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
- help/Makefile.am || die "patching help/Makefile.am failed"
-
- # linux/videodev.h dropped in 2.6.38
- sed -i \
- -e 's:linux/videodev.h ::' \
- configure.ac || die
-
- epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
- "${FILESDIR}/${P}-libav9.patch" \
- "${FILESDIR}/${P}-underlinking.patch" \
- "${FILESDIR}/${P}-tests.patch"
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- --datadir="${EPREFIX}"/usr/share/${PN}
- # arts is deprecated
- --disable-artsc
- # don't want -Werror
- --disable-strict
- --disable-libv4l1
- # don't use bundled libs
- --enable-external-ortp
- $(use_enable alsa)
- $(use_enable pulseaudio)
- $(use_enable coreaudio macsnd)
- $(use_enable debug)
- $(use_enable filters)
- $(use_enable g726 spandsp)
- $(use_enable gsm)
- $(use_enable ipv6)
- $(use_enable ntp-timestamp)
- $(use_enable opengl glx)
- $(use_enable opus)
- $(use_enable ortp)
- $(use_enable oss)
- $(use_enable pcap)
- $(use_enable portaudio)
- $(use_enable speex)
- $(use_enable static-libs static)
- $(use_enable theora)
- $(use_enable upnp)
- $(use_enable video)
- $(use_enable v4l)
- $(use_enable v4l libv4l2)
- $(use_enable sdl)
- $(use_enable X x11)
- $(use_enable X xv)
-
- $(use doc || echo ac_cv_path_DOXYGEN=false)
- )
-
- # Mac OS X Audio Queue is an audio recording facility, available on
- # 10.5 (Leopard, Darwin9) and onward
- if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
- then
- myeconfargs+=( --enable-macaqsnd )
- else
- myeconfargs+=( --disable-macaqsnd )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- default
- cd tester || die
- ./mediastreamer2_tester || die
-}
-
-src_install() {
- default
- prune_libtool_files
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins tester/*.c
- fi
-}
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
deleted file mode 100644
index 3596cd9..0000000
--- a/media-libs/mediastreamer/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>voip</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>bircoph@gmail.com</email>
- <name>Andrew Savchenko</name>
- <description>Proxy maintainer. Assign bugs to him.</description>
- </maintainer>
- <use>
- <flag name="amr">Use of AMR Narrow Band codec plugin</flag>
- <flag name="filters">Enable compilation of filters</flag>
- <flag name="g726">Support g726 codec</flag>
- <flag name="g729">Use g726 codec plugin</flag>
- <flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
- <flag name="ntp-timestamp">Turn on NTP timestamping on received
- packet</flag>
- <flag name="opus">Enable opus codec support</flag>
- <flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
- <flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
- <flag name="silk">Use silk (skype protocol) codec plugin</flag>
- <flag name="video">Enable video support</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/voip:master commit in: media-libs/mediastreamer/, media-libs/mediastreamer/files/
@ 2013-10-13 3:02 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2013-10-13 3:02 UTC (permalink / raw
To: gentoo-commits
commit: e35001e424e27aea436ce57c71975ccba817bf7e
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Oct 13 02:57:08 2013 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Oct 13 03:01:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=e35001e4
mediastreamer: add bindist description
This fixes bug 448930.
---
media-libs/mediastreamer/ChangeLog | 306 +++++++++++++++++++++
media-libs/mediastreamer/Manifest | 9 +
.../files/mediastreamer-2.9.0-libav9.patch | 120 ++++++++
.../files/mediastreamer-2.9.0-tests.patch | 26 ++
.../files/mediastreamer-2.9.0-underlinking.patch | 57 ++++
.../files/mediastreamer-2.9.0-v4l-automagic.patch | 55 ++++
.../files/mediastreamer-2.9.0-xxd.patch | 18 ++
.../mediastreamer/mediastreamer-2.9.0.ebuild | 172 ++++++++++++
media-libs/mediastreamer/metadata.xml | 28 ++
9 files changed, 791 insertions(+)
diff --git a/media-libs/mediastreamer/ChangeLog b/media-libs/mediastreamer/ChangeLog
new file mode 100644
index 0000000..98462b1
--- /dev/null
+++ b/media-libs/mediastreamer/ChangeLog
@@ -0,0 +1,306 @@
+# ChangeLog for media-libs/mediastreamer
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/ChangeLog,v 1.73 2013/10/11 17:39:12 hasufell Exp $
+
+ 11 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild,
+ +files/mediastreamer-2.9.0-xxd.patch:
+ fix opengl useflag wrt #487486
+
+ 10 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild:
+ add opengl useflag, add subslot
+
+ 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> mediastreamer-2.9.0.ebuild,
+ +files/mediastreamer-2.9.0-tests.patch:
+ fix tests
+
+*mediastreamer-2.9.0 (09 Oct 2013)
+
+ 09 Oct 2013; Julian Ospald <hasufell@gentoo.org> +mediastreamer-2.9.0.ebuild,
+ +files/mediastreamer-2.9.0-libav9.patch,
+ +files/mediastreamer-2.9.0-underlinking.patch,
+ +files/mediastreamer-2.9.0-v4l-automagic.patch, metadata.xml:
+ version bump wrt #486500
+
+ 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for ppc64, wrt bug #464536
+
+ 29 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for ppc, wrt bug #464536
+
+ 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for amd64, wrt bug #464536
+
+ 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Stable for x86, wrt bug #464536
+
+ 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Depend on intltool wrt bug#474340.
+
+ 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/mediastreamer-2.8.2-libav9.patch, mediastreamer-2.8.2.ebuild:
+ Append simple patch for new api usage. Fixes build with libav9. Wrt
+ bug#457860.
+
+ 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Stable for ppc64, wrt bug #462890
+
+ 16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Cleanup due bug #96436
+
+ 17 Jan 2013; Alexis Ballier <aballier@gentoo.org> mediastreamer-2.8.2.ebuild,
+ +files/mediastreamer-2.8.2-ffmpeg-1.0.patch:
+ Fix build with latest ffmpeg. By Reuben Martin, bug #445168.
+
+ 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Add ~ppc64, wrt bug #443964
+
+ 17 Dec 2012; Agostino Sarubbo <ago@gentoo.org> mediastreamer-2.8.2.ebuild:
+ Add ~ppc, wrt bug #443964
+
+ 16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Cleanup due retirement, #260683
+
+ 22 Nov 2012; Michał Górny <mgorny@gentoo.org>
+ files/mediastreamer-2.8.2-v4l-automagic.patch:
+ Replace the V4L patch with a correct one.
+
+*mediastreamer-2.8.2 (19 Nov 2012)
+
+ 19 Nov 2012; Michał Górny <mgorny@gentoo.org>
+ +files/mediastreamer-2.8.2-autopoint.patch,
+ +files/mediastreamer-2.8.2-v4l-automagic.patch, +mediastreamer-2.8.2.ebuild,
+ metadata.xml:
+ Version bump wrt bug #399737. Thanks to Andrew Savchenko for his effort on
+ linphone ebuilds.
+
+ 07 Nov 2012; Alexis Ballier <aballier@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild, +files/mediastreamer-2.7.3-ffmpeg-0.11.patch,
+ +files/mediastreamer-2.7.3-videoenc_282.patch:
+ Fix build with recent ffmpeg versions, bug #419453
+
+ 16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ -mediastreamer-2.3.0-r1.ebuild:
+ Punt version that depended only on media-video/ffmpeg.
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> mediastreamer-2.3.0-r1.ebuild,
+ mediastreamer-2.7.3-r3.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
+
+ 25 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Set volkmar as second maintainer as talked with him.
+
+ 06 Jan 2012; Brent Baude <ranger@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Marking mediastreamer-2.7.3-r3 ppc stable for bug 363311
+
+ 06 Nov 2011; Fabian Groffen <grobian@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Drop ~ppc-macos, since 2.7 no longer compiles on OSX 10.5 (last ppc version)
+
+ 23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -mediastreamer-2.2.3_p1-r1.ebuild,
+ -files/mediastreamer-2.2.3_p1-autodeps.patch, -mediastreamer-2.5.0.ebuild,
+ -mediastreamer-2.6.0.ebuild, mediastreamer-2.7.3-r3.ebuild:
+ Punt static libraries and libtool archives, remove overshadowed versions.
+
+ 14 Oct 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Allow building with pulseaudio only, bug #384961 wrt niks1024 AT gmail.com
+
+ 01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Rename USE="v4l2" to USE="v4l" wrt #385241
+
+ 29 Aug 2011; Fabian Groffen <grobian@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Marked *-macos, bug #362691
+
+ 16 May 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Marked ~ppc/~ppc64 wrt #362691
+
+ 15 May 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3.ebuild,
+ -mediastreamer-2.7.3-r2.ebuild, mediastreamer-2.7.3-r3.ebuild:
+ Drop xv USE flag as it is not optional, bug #365653 thank Willard Dawson
+ for report.
+
+ 14 May 2011; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ x86 stable per bug 363311
+
+ 01 May 2011; Markos Chandras <hwoarang@gentoo.org>
+ mediastreamer-2.7.3-r3.ebuild:
+ Stable on amd64 wrt bug #363311
+
+ 30 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r3.ebuild:
+ Update REQUIRED_USE to avoid build failure, bug #364657, wrt Diego Elio
+ Pettenò
+
+*mediastreamer-2.7.3-r3 (20 Apr 2011)
+
+ 20 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r3.ebuild:
+ Fixed undefined reference on v4l_desc, bug #363603 thank Fred Röhner for
+ report and tests.
+
+*mediastreamer-2.7.3-r2 (14 Apr 2011)
+
+ 14 Apr 2011; Peter Volkov <pva@gentoo.org> -mediastreamer-2.7.3-r1.ebuild,
+ +mediastreamer-2.7.3-r2.ebuild:
+ Revision bump for bug #362883 wrt Andrei Slavoiu
+
+ 12 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3-r1.ebuild,
+ +files/mediastreamer-2.7.3-sdl-build.patch:
+ Added patch to fix build issue with USE=sdl, bug #362883 thank Luigi 'Comio'
+ Mantellini for report and for help.
+
+*mediastreamer-2.7.3-r1 (09 Apr 2011)
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3-r1.ebuild,
+ metadata.xml:
+ Added amr plugin dependency, bug 356977 wrt Andrew Savchenko.
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> mediastreamer-2.7.3.ebuild,
+ +files/mediastreamer-2.7.3-v4l-automagic.patch:
+ Finally fix v4l1 automagic and inability to be built with
+ linux-headers-2.6.38, bug 361107 thank Guillaume BINET for report and Ted
+ Rodgers, hirakendu and for help.
+
+*mediastreamer-2.7.3 (09 Apr 2011)
+
+ 09 Apr 2011; Peter Volkov <pva@gentoo.org> +mediastreamer-2.7.3.ebuild:
+ Version bump, bug #356977 wrt Andrew Savchenko. Use virtual/ffmpeg, bug
+ #356977 by Tomáš Chvátal. Always depend on v4l2 as ./configure.ac
+ suggests, fixes automagic dep on v4l, bug 352713 thank Markus Oehme for
+ report.
+
+ 01 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+ mediastreamer-2.6.0.ebuild:
+ Stable on amd64 wrt bug #349258
+
+ 27 Dec 2010; Thomas Kahle <tomka@gentoo.org> mediastreamer-2.6.0.ebuild:
+ x86 stable per bug 349258
+
+ 04 Dec 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.6.0.ebuild:
+ Fix automagick dependency on pulseaudio, bug #347163, thank Markus Oehme for
+ report.
+
+*mediastreamer-2.6.0 (23 Jul 2010)
+
+ 23 Jul 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.6.0.ebuild:
+ Version bump.
+
+ 18 Jul 2010; <nixnut@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
+ ppc stable #317235
+
+ 10 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ mediastreamer-2.3.0-r1.ebuild:
+ x86 stable wrt bug #317235
+
+*mediastreamer-2.5.0 (07 Jun 2010)
+
+ 07 Jun 2010; Peter Volkov <pva@gentoo.org> -mediastreamer-2.2.4.ebuild,
+ -mediastreamer-2.3.0.ebuild, -mediastreamer-2.4.0.ebuild,
+ +mediastreamer-2.5.0.ebuild:
+ Version bump. Drop old.
+
+ 21 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.4.0.ebuild:
+ mediastreamer-2.4.0 requires ortp-0.16.2, bug 320751, thank Nikoli for
+ report. Use nongnu mirrors.
+
+*mediastreamer-2.4.0 (20 May 2010)
+
+ 20 May 2010; Peter Volkov <pva@gentoo.org> +mediastreamer-2.4.0.ebuild:
+ Version bump.
+
+ 20 May 2010; Peter Volkov <pva@gentoo.org> mediastreamer-2.3.0-r1.ebuild:
+ amd64 stable, bug 317235.
+
+*mediastreamer-2.3.0-r1 (21 Mar 2010)
+
+ 21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+ +mediastreamer-2.3.0-r1.ebuild:
+ Revbump for Darwin (coreaudio) support, bump to EAPI=3 for Prefix support,
+ marked ~ppc-macos and ~x86-macos, bug #310215
+
+ 23 Feb 2010; Joseph Jezak <josejx@gentoo.org> mediastreamer-2.3.0.ebuild:
+ Marked ~ppc64.
+
+*mediastreamer-2.3.0 (08 Feb 2010)
+
+ 08 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org>
+ +mediastreamer-2.3.0.ebuild:
+ Version bump
+
+ 15 Nov 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild,
+ -files/mediastreamer-2.2.3_p1-arts.patch, mediastreamer-2.2.4.ebuild:
+ Remove arts related patch and clean ebuilds, wrt bug 291546
+
+ 11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild, mediastreamer-2.2.4.ebuild:
+ Remove USE arts (deprecated).
+
+*mediastreamer-2.2.4 (20 Aug 2009)
+
+ 20 Aug 2009; Mike Frysinger <vapier@gentoo.org>
+ +mediastreamer-2.2.4.ebuild:
+ Version bump.
+
+ 19 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+ -mediastreamer-2.2.3-r1.ebuild, -files/mediastreamer-2.2.3-arts.patch,
+ -files/mediastreamer-2.2.3-autodeps.patch:
+ Removing old ebuilds and patches
+
+ 08 Jul 2009; Markus Meier <maekke@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ amd64 stable, bug #259172
+
+ 03 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ Stable on ppc, bug 259172
+
+ 02 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ stable x86, bug 259172
+
+ 12 Jun 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
+ Add alsa as default USE flag. Fix bug 273762.
+
+ 16 May 2009; Mounir Lamouri <volkmar@gentoo.org> metadata.xml:
+ Use global gsm USE flag instead of local one.
+
+ 15 May 2009; Markus Meier <maekke@gentoo.org>
+ mediastreamer-2.2.3-r1.ebuild, mediastreamer-2.2.3_p1-r1.ebuild:
+ add ~amd64, bug #267491
+
+ 13 May 2009; Christian Faulhammer <fauli@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ keyworded ~arch for x86, bug 267491
+
+ 30 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ mediastreamer-2.2.3_p1-r1.ebuild:
+ Add missing x264 USE flag.
+
+*mediastreamer-2.2.3_p1-r1 (28 Apr 2009)
+*mediastreamer-2.2.3-r1 (28 Apr 2009)
+
+ 28 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ -mediastreamer-2.2.3.ebuild, +mediastreamer-2.2.3-r1.ebuild,
+ -mediastreamer-2.2.3_p1.ebuild, +mediastreamer-2.2.3_p1-r1.ebuild:
+ Add mediastreamer plugins in PDEPEND and speex has a default use flag.
+
+*mediastreamer-2.2.3_p1 (27 Apr 2009)
+
+ 27 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ +files/mediastreamer-2.2.3_p1-arts.patch,
+ +files/mediastreamer-2.2.3_p1-autodeps.patch,
+ +mediastreamer-2.2.3_p1.ebuild:
+ Add mediastreamer-2.2.3 with diff from bundled on in linphone-3.1.1 to make it
+ working with it.
+
+*mediastreamer-2.2.3 (25 Apr 2009)
+
+ 25 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+ +files/mediastreamer-2.2.3-arts.patch,
+ +files/mediastreamer-2.2.3-autodeps.patch, +metadata.xml,
+ +mediastreamer-2.2.3.ebuild:
+ Initial commit. Actually, new-born (and bump) for this package removed a few
+ months ago.
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
new file mode 100644
index 0000000..73edeb8
--- /dev/null
+++ b/media-libs/mediastreamer/Manifest
@@ -0,0 +1,9 @@
+AUX mediastreamer-2.9.0-libav9.patch 4535 SHA256 dc42bcd66c81dec0ab38058c640f575b75a6c0688db2bd7dc4a8e45fafaa196a SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde WHIRLPOOL eddab46d033521e95b8dbdc4602a2441fb28a3e086ee2b21cf60113127738cf1ab868e24f65dd0f0ab0e52f2bf8a33a86747f316bc5cf0ee716bcd118c21ef08
+AUX mediastreamer-2.9.0-tests.patch 587 SHA256 80fc8b229e41adde9d00fd38a0ad44ab028db9e4acbf5c7c5e612e581e7541c3 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011 WHIRLPOOL 7e55e8b284c58a3ab36899bc078600da205cacf5e947a954f289d3a898f1940083ff43e35222d4bb566b260055950f314b4c70169bd796b4f8ed205dfbcf65e2
+AUX mediastreamer-2.9.0-underlinking.patch 1969 SHA256 03cdca023eaf4e787a179c1e373b5d6c3728a69ba761c8e89a508cce7e2db27c SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e WHIRLPOOL 3201cd07595865a3dd42efd53b2a13f3ec2d2a87c53c2313776e0ee1e0b3e155153bad0a0789b74aab2d57ef8c59ff5a9d44fc79a99effb0ec90f6e3a02a2f53
+AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 SHA256 e5dcb6b61e3536a60d38ed96ac0ff9d9c9044042bb8356bedd3ef2594ff7b64d SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf WHIRLPOOL 9e7864f87e3976963198632c45756a15015f45aa6b11f327026b9c3a1e0e5d8af9e4a9d9bf312b8255fabbbc7b71df9d38990cfbb07e3a41f164296005548e4f
+AUX mediastreamer-2.9.0-xxd.patch 642 SHA256 3beec8ca23aede692902ec02e003e96c485845368a69aacdd928f606aa0f1403 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2 WHIRLPOOL 6e1a835b50f53762a90d77946eb58d0569d423b53de3ae21d5d1f409be96a774b176b490db26682d17e7a7bed9d7879df89a6dc3f943bb70c47f234ebea0f7d8
+DIST mediastreamer-2.9.0.tar.gz 3578877 SHA256 c245b9444c2abb4c84433606e01f0b3ce29ce78de0afe1e191f4f3c62656acd5 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0 WHIRLPOOL 9e425ff2e461ceb6dae3890e6bd8035de65f5b3fd0590e01b75259c0d27dd54cfd37cb88d43752c2903c954ac44e353e4ed63588d3f08ec690da77293a31ba68
+EBUILD mediastreamer-2.9.0.ebuild 4599 SHA256 daf9006ac0ddd4c3f428d5893ea2e1892e56b612d486684804a930331e7bdf05 SHA512 4951ffd909ee85dfff44b187ae17e73b02a7e613ce15eb11eaa64adb7975c4c83e2432db2e225eb954a8bfd042013780f2ea7a7d4b1bd45d9eecce471a9aa70a WHIRLPOOL e35bfb4b922ad9f8ba29fab6d8b7013ae394045148915777f0bcb6ef0358b25ab13c9c9e5a5f16907f2696164320c3c6bc29cbdcf379f21b7966b63bc0c2ecc5
+MISC ChangeLog 11300 SHA256 e3c27bf6e842cf3076da14133a8f762ca8f493a13e658dc30bb4cf0c817a5327 SHA512 4531db79cfea71988aea751434c60096b4297975a412c5b0b66bad6c9cafa3d3733d430dcff66b5e722b3494ad30ede4b4d98d4bfbc1b479161b2954d8cdeaaf WHIRLPOOL 8d4e70bfdffd552bc85528072cd7552b3f311b21a24f2cdbe8662e9dc3e655068d3fefe08b1988f26c97cb04dcfeaa05162642cc31a23893453ed1a3e0f378a5
+MISC metadata.xml 1225 SHA256 c6465bd5ff3127a06de7a7001c699e546fcb8e4f2a6fa8f0f2cddbe7b9b333ea SHA512 2fc0f853779eadc2ab0d97131310ebc6cb98f94cab1dfbd9a3684c11033f3c0539dcd86924b658306341f15d08aa793c46edfc67259aa5e01f2798781e667320 WHIRLPOOL a29af232b9b57ab7ac7887874e504e6202e70d23439790934c406cde4c42d950d53621df771f4d31fe75539ee7ccedf1f9e4b6dd9b836bcc543705280dce6e0a
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
new file mode 100644
index 0000000..078f360
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
@@ -0,0 +1,120 @@
+diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
+index 38881c1..f306723 100644
+--- a/src/videofilters/h264dec.c
++++ b/src/videofilters/h264dec.c
+@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
+ int error;
+ codec=avcodec_find_decoder(CODEC_ID_H264);
+ if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
+- avcodec_get_context_defaults(&d->av_context);
+- error=avcodec_open(&d->av_context,codec);
++ avcodec_get_context_defaults3(&d->av_context, NULL);
++ error=avcodec_open2(&d->av_context,codec, NULL);
+ if (error!=0){
+- ms_fatal("avcodec_open() failed.");
++ ms_fatal("avcodec_open2() failed.");
+ }
+ }
+
+diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
+index 891f618..96f5d7f 100644
+--- a/src/videofilters/jpegwriter.c
++++ b/src/videofilters/jpegwriter.c
+@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
+ mblk_t *jpegm;
+ struct SwsContext *sws_ctx;
+
+- AVCodecContext *avctx=avcodec_alloc_context();
++ AVCodecContext *avctx=avcodec_alloc_context3(NULL);
+
+ avctx->width=yuvbuf.w;
+ avctx->height=yuvbuf.h;
+@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
+ avctx->time_base.den =1;
+ avctx->pix_fmt=PIX_FMT_YUVJ420P;
+
+- error=avcodec_open(avctx,s->codec);
++ error=avcodec_open2(avctx,s->codec,NULL);
+ if (error!=0) {
+- ms_error("avcodec_open() failed: %i",error);
++ ms_error("avcodec_open2() failed: %i",error);
+ cleanup(s,NULL);
+ av_free(avctx);
+ return;
+diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
+index 60e3853..329c453 100644
+--- a/src/videofilters/nowebcam.c
++++ b/src/videofilters/nowebcam.c
+@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
+ return NULL;
+ }
+
+- avcodec_get_context_defaults(&av_context);
+- if (avcodec_open(&av_context,codec)<0){
+- ms_error("jpeg2yuv: avcodec_open failed");
++ avcodec_get_context_defaults3(&av_context, NULL);
++ if (avcodec_open2(&av_context,codec,NULL)<0){
++ ms_error("jpeg2yuv: avcodec_open2 failed");
+ return NULL;
+ }
+ av_init_packet(&pkt);
+diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
+index 494debf..c52e207 100644
+--- a/src/videofilters/videodec.c
++++ b/src/videofilters/videodec.c
+@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
+ DecState *s=(DecState *)ms_new0(DecState,1);
+ ms_ffmpeg_check_init();
+
+- avcodec_get_context_defaults(&s->av_context);
++ avcodec_get_context_defaults3(&s->av_context, NULL);
+ s->av_codec=NULL;
+ s->codec=cid;
+ s->input=NULL;
+@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
+ if (s->av_context.codec==NULL){
+ /* we must know picture size before initializing snow decoder*/
+ if (s->codec!=CODEC_ID_SNOW){
+- error=avcodec_open(&s->av_context, s->av_codec);
+- if (error!=0) ms_error("avcodec_open() failed: %i",error);
++ error=avcodec_open2(&s->av_context, s->av_codec,NULL);
++ if (error!=0) ms_error("avcodec_open2() failed: %i",error);
+ if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
+ s->av_context.extradata=s->dci;
+ s->av_context.extradata_size=s->dci_size;
+@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
+ int error;
+ s->av_context.width=h>>16;
+ s->av_context.height=h&0xffff;
+- error=avcodec_open(&s->av_context, s->av_codec);
+- if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
++ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
++ if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
+ else {
+ s->snow_initialized=TRUE;
+ ms_message("Snow decoder initialized,size=%ix%i",
+diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
+index da35592..09dcc9d 100644
+--- a/src/videofilters/videoenc.c
++++ b/src/videofilters/videoenc.c
+@@ -242,7 +242,7 @@ static void prepare(EncState *s){
+ AVCodecContext *c=&s->av_context;
+ const int max_br_vbv=128000;
+
+- avcodec_get_context_defaults(c);
++ avcodec_get_context_defaults3(c, NULL);
+ if (s->codec==CODEC_ID_MJPEG)
+ {
+ ms_message("Codec bitrate set to %i",c->bit_rate);
+@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
+ ms_error("could not find encoder for codec id %i",s->codec);
+ return;
+ }
+- error=avcodec_open(&s->av_context, s->av_codec);
++ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
+ if (error!=0) {
+- ms_error("avcodec_open() failed: %i",error);
++ ms_error("avcodec_open2() failed: %i",error);
+ return;
+ }
+ video_starter_init(&s->starter);
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
new file mode 100644
index 0000000..3bcb8bd
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-tests.patch
@@ -0,0 +1,26 @@
+From d9f448013bd5ea92ce42c99ef3338932ec694b62 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 21:18:28 +0200
+Subject: [PATCH] fix tests
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4b923a9..4aec221 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -873,6 +873,9 @@ case "$target_os" in
+ #hack for macport
+ CUNIT_LIBS+=" -lncurses"
+ ;;
++ *linux*)
++ CUNIT_LIBS+=" -lncurses"
++ ;;
+ *mingw*)
+ CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501"
+ LIBS="$LIBS -lws2_32 -liphlpapi"
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
new file mode 100644
index 0000000..19d6af8
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
@@ -0,0 +1,57 @@
+From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 18:24:28 +0200
+Subject: [PATCH] fix underlinking
+
+---
+ configure.ac | 20 ++++++++++++++++++++
+ src/Makefile.am | 2 +-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f402bd..4b923a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -893,6 +893,26 @@ fi
+
+ AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
+
++dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
++dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
++LIB_CLOCK_GETTIME=
++clk_saved_libs=$LIBS
++AC_SEARCH_LIBS([clock_gettime], [rt posix4],
++ [test "$ac_cv_search_clock_gettime" = "none required" ||
++ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
++AC_SUBST([LIB_CLOCK_GETTIME])
++
++AC_MSG_CHECKING([for working clock_gettime])
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
++ [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
++AC_MSG_RESULT($gnupg_cv_clock_gettime)
++
++if test x"$gnupg_cv_clock_gettime" = xyes; then
++ AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
++ [Define to 1 if you have the `clock_gettime' function.])
++fi
++LIBS=$clk_saved_libs
++
+
+ dnl ##################################################
+ dnl # Check for doxygen
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a315e92..a5e144c 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -266,7 +266,7 @@ voipdescs.h: Makefile $(libmediastreamer_voip_la_SOURCES)
+ awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
+
+
+-libmediastreamer_base_la_LIBADD= $(ORTP_LIBS)
++libmediastreamer_base_la_LIBADD= $(ORTP_LIBS) @LIB_CLOCK_GETTIME@
+ libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
+
+ if !BUILD_WIN32
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
new file mode 100644
index 0000000..c590aef
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
@@ -0,0 +1,55 @@
+From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Wed, 9 Oct 2013 18:12:46 +0200
+Subject: [PATCH] Support disabling V4L support completely
+
+---
+ configure.ac | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94b6f18..9f402bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data])
+ AC_SUBST(PACKAGE_DATA_DIR)
+
++AC_ARG_ENABLE(v4l,
++ [ --disable-v4l Disable usage of v4l],
++ [case "${enableval}" in
++ yes) v4l=yes ;;
++ no) v4l=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
++ esac],[v4l=yes])
++
++if test "$v4l" = "yes" ; then
++
+ dnl check for video4linux headers
+ AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
+ if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
+@@ -759,9 +769,6 @@ else
+ found_v4l2=no
+ fi
+
+-AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
+-AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
+-
+ AC_ARG_ENABLE(libv4l1,
+ [AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
+ [case "${enableval}" in
+@@ -805,6 +812,11 @@ this check.
+ fi
+ fi
+
++fi
++
++AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
++AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
++
+
+ AC_PATH_PROG(PCAP,pcap-config,false)
+ AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
+--
+1.8.3.2
+
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
new file mode 100644
index 0000000..2337e13
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-xxd.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Oct 11 11:37:19 UTC 2013
+Subject: avoid dependency on vim-core
+
+--- mediastreamer-2.9.0/src/Makefile.am
++++ mediastreamer-2.9.0/src/Makefile.am
+@@ -385,9 +385,9 @@
+ yuv2rgb.fs.h: yuv2rgb.fs
+ builddir=`pwd` && \
+ cd $(top_srcdir)/src && \
+- xxd -i yuv2rgb.fs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.fs.h
++ xxdi.pl yuv2rgb.fs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.fs.h
+
+ yuv2rgb.vs.h: yuv2rgb.vs
+ builddir=`pwd` && \
+ cd $(top_srcdir)/src && \
+- xxd -i yuv2rgb.vs | sed s/}\;/,0x00}\;/ > $$builddir/yuv2rgb.vs.h
++ xxdi.pl yuv2rgb.vs | sed s/}\;/0x00}\;/ > $$builddir/yuv2rgb.vs.h
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
new file mode 100644
index 0000000..9d834b7
--- /dev/null
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.9.0.ebuild,v 1.4 2013/10/11 17:39:12 hasufell Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Mediastreaming library for telephony application"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/linphone/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Many cameras will not work or will crash an application if mediastreamer2 is
+# not built with v4l2 support (taken from configure.ac)
+# TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
+IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
+ ipv6 ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl silk +speex
+ static-libs test theora upnp v4l video x264 X"
+
+REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
+ video? ( || ( opengl sdl X ) )
+ theora? ( video )
+ X? ( video )
+ v4l? ( video )
+ opengl? ( video )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ g726? ( >=media-libs/spandsp-0.0.6_pre1 )
+ gsm? ( media-sound/gsm )
+ opus? ( media-libs/opus )
+ ortp? ( >=net-libs/ortp-0.17[ipv6?] )
+ pcap? ( sys-libs/libcap )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+ speex? ( >=media-libs/speex-1.2_beta3 )
+ upnp? ( net-libs/libupnp )
+ video? (
+ virtual/ffmpeg
+ opengl? ( media-libs/glew
+ virtual/opengl
+ x11-libs/libX11 )
+ v4l? ( media-libs/libv4l
+ sys-kernel/linux-headers )
+ theora? ( media-libs/libtheora )
+ sdl? ( media-libs/libsdl[video,X] )
+ X? ( x11-libs/libX11
+ x11-libs/libXv ) )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ opengl? ( dev-util/xxdi )
+ test? ( >=dev-util/cunit-2.1_p2[ncurses] )
+ X? ( x11-proto/videoproto )"
+
+PDEPEND="amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
+ g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
+ ilbc? ( media-plugins/mediastreamer-ilbc )
+ video? ( x264? ( media-plugins/mediastreamer-x264 ) )
+ silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )"
+
+src_prepare() {
+ # variable causes "command not found" warning and is not
+ # needed anyway
+ sed -i \
+ -e 's/$(ACLOCAL_MACOS_FLAGS)//' \
+ Makefile.am || die
+
+ # respect user's CFLAGS
+ sed -i \
+ -e "s:-O2::;s: -g::" \
+ configure.ac || die "patching configure.ac failed"
+
+ # change default paths
+ sed -i \
+ -e "s:\(prefix/share\):\1/${PN}:" \
+ configure.ac || die "patching configure.ac failed"
+
+ # fix doc installation dir
+ sed -i \
+ -e "s:\$(pkgdocdir):\$(docdir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # fix html installation dir
+ sed -i \
+ -e "s:\(doc_htmldir=\).*:\1\$(htmldir):" \
+ help/Makefile.am || die "patching help/Makefile.am failed"
+
+ # linux/videodev.h dropped in 2.6.38
+ sed -i \
+ -e 's:linux/videodev.h ::' \
+ configure.ac || die
+
+ epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
+ "${FILESDIR}/${P}-libav9.patch" \
+ "${FILESDIR}/${P}-underlinking.patch" \
+ "${FILESDIR}/${P}-tests.patch" \
+ "${FILESDIR}/${P}-xxd.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ --datadir="${EPREFIX}"/usr/share/${PN}
+ # arts is deprecated
+ --disable-artsc
+ # don't want -Werror
+ --disable-strict
+ --disable-libv4l1
+ # don't use bundled libs
+ --enable-external-ortp
+ $(use_enable alsa)
+ $(use_enable pulseaudio)
+ $(use_enable coreaudio macsnd)
+ $(use_enable debug)
+ $(use_enable filters)
+ $(use_enable g726 spandsp)
+ $(use_enable gsm)
+ $(use_enable ipv6)
+ $(use_enable ntp-timestamp)
+ $(use_enable opengl glx)
+ $(use_enable opus)
+ $(use_enable ortp)
+ $(use_enable oss)
+ $(use_enable pcap)
+ $(use_enable portaudio)
+ $(use_enable speex)
+ $(use_enable static-libs static)
+ $(use_enable theora)
+ $(use_enable upnp)
+ $(use_enable video)
+ $(use_enable v4l)
+ $(use_enable v4l libv4l2)
+ $(use_enable sdl)
+ $(use_enable X x11)
+ $(use_enable X xv)
+
+ $(use doc || echo ac_cv_path_DOXYGEN=false)
+ )
+
+ # Mac OS X Audio Queue is an audio recording facility, available on
+ # 10.5 (Leopard, Darwin9) and onward
+ if use coreaudio && [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -ge 9 ]]
+ then
+ myeconfargs+=( --enable-macaqsnd )
+ else
+ myeconfargs+=( --disable-macaqsnd )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ default
+ cd tester || die
+ ./mediastreamer2_tester || die
+}
+
+src_install() {
+ default
+ prune_libtool_files
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins tester/*.c
+ fi
+}
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
new file mode 100644
index 0000000..a7c40bc
--- /dev/null
+++ b/media-libs/mediastreamer/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>voip</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>bircoph@gmail.com</email>
+ <name>Andrew Savchenko</name>
+ <description>Proxy maintainer. Assign bugs to him.</description>
+ </maintainer>
+ <use>
+ <flag name="amr">Use of AMR Narrow Band codec plugin</flag>
+ <flag name="bindist">Disable codecs with potential license/patent
+ issues: amr has incompatible license, bcg729 is potentially
+ patent-encumbered, silk is not redistributable</flag>
+ <flag name="filters">Enable compilation of filters</flag>
+ <flag name="g726">Support g726 codec</flag>
+ <flag name="g729">Use g726 codec plugin</flag>
+ <flag name="ilbc">Use of iLBC (RFC3951) codec plugin</flag>
+ <flag name="ntp-timestamp">Turn on NTP timestamping on received
+ packet</flag>
+ <flag name="opus">Enable opus codec support</flag>
+ <flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
+ <flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
+ <flag name="silk">Use silk (skype protocol) codec plugin</flag>
+ <flag name="video">Enable video support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-13 3:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-10 5:54 [gentoo-commits] proj/voip:master commit in: media-libs/mediastreamer/, media-libs/mediastreamer/files/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2013-10-13 2:28 Andrew Savchenko
2013-10-13 3:02 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox