diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2014-12-22 18:31:52 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2014-12-22 18:31:52 +0000 |
| commit | d448407d643fc0280b0fa97378fd228b62572951 (patch) | |
| tree | 422da3c4dd8762c6a88f8bda0e7e6e1d2ecc170c /net-voip | |
| parent | Version bump for Gnome 3.14. (diff) | |
| download | gentoo-2-d448407d643fc0280b0fa97378fd228b62572951.tar.gz gentoo-2-d448407d643fc0280b0fa97378fd228b62572951.tar.bz2 gentoo-2-d448407d643fc0280b0fa97378fd228b62572951.zip | |
Fix building against latest ffmpeg. Bug #516290. Thanks to Marcel Pennewiß <gentoo@pennewiss.de>
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/homer/ChangeLog | 7 | ||||
| -rw-r--r-- | net-voip/homer/files/homer-0.25-ffmpeg-avstream.patch | 24 | ||||
| -rw-r--r-- | net-voip/homer/homer-0.25-r1.ebuild | 6 |
3 files changed, 34 insertions, 3 deletions
diff --git a/net-voip/homer/ChangeLog b/net-voip/homer/ChangeLog index db842b542f03..f902c962d226 100644 --- a/net-voip/homer/ChangeLog +++ b/net-voip/homer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-voip/homer # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/ChangeLog,v 1.15 2014/08/10 20:34:30 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/ChangeLog,v 1.16 2014/12/22 18:31:52 hwoarang Exp $ + + 22 Dec 2014; Markos Chandras <hwoarang@gentoo.org> + +files/homer-0.25-ffmpeg-avstream.patch, homer-0.25-r1.ebuild: + Fix building against latest ffmpeg. Bug #516290. Thanks to Marcel Pennewiß + <gentoo@pennewiss.de> 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> homer-0.24.1-r1.ebuild, homer-0.24.1.ebuild, homer-0.25-r1.ebuild, homer-0.25.ebuild, diff --git a/net-voip/homer/files/homer-0.25-ffmpeg-avstream.patch b/net-voip/homer/files/homer-0.25-ffmpeg-avstream.patch new file mode 100644 index 000000000000..d60f5696cbac --- /dev/null +++ b/net-voip/homer/files/homer-0.25-ffmpeg-avstream.patch @@ -0,0 +1,24 @@ +From 31136f8df53d4d528acb3b301271d4b19274dfc6 Mon Sep 17 00:00:00 2001 +From: ThomasVolkert <thomas@homer-conferencing.com> +Date: Sat, 7 Jun 2014 13:31:51 +0200 +Subject: [PATCH] - fixed: ffmpeg compatibility + +--- + HomerMultimedia/src/RTP.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/HomerMultimedia/src/RTP.cpp b/HomerMultimedia/src/RTP.cpp +index ad4d04b..97b631b 100644 +--- a/HomerMultimedia/src/RTP.cpp ++++ b/HomerMultimedia/src/RTP.cpp +@@ -611,7 +611,9 @@ bool RTP::OpenRtpEncoder(string pTargetHost, unsigned int pTargetPort, AVStream + mRtpEncoderStream->priv_data = NULL; + // create monotone timestamps + mRtpEncoderStream->cur_dts = 0; +- mRtpEncoderStream->reference_dts = 0; ++ #ifndef FF_API_REFERENCE_DTS ++ mRtpEncoderStream->reference_dts = 0; ++ #endif + + // set target coordinates for rtp stream + snprintf(mRtpFormatContext->filename, sizeof(mRtpFormatContext->filename), "rtp://%s:%u", pTargetHost.c_str(), pTargetPort); diff --git a/net-voip/homer/homer-0.25-r1.ebuild b/net-voip/homer/homer-0.25-r1.ebuild index 1eb5e0ec2b7a..8a7d46b17594 100644 --- a/net-voip/homer/homer-0.25-r1.ebuild +++ b/net-voip/homer/homer-0.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-0.25-r1.ebuild,v 1.6 2014/08/10 20:34:30 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-0.25-r1.ebuild,v 1.7 2014/12/22 18:31:52 hwoarang Exp $ EAPI=5 @@ -26,7 +26,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="pulseaudio" -DEPEND=">=dev-libs/openssl-1.0 +DEPEND="dev-util/cmake + >=dev-libs/openssl-1.0 media-libs/alsa-lib media-libs/libsdl[X,sound,video,alsa] media-libs/portaudio[alsa] @@ -48,6 +49,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { epatch "${DISTDIR}/${P}-ffmpeg2.patch" + epatch "${FILESDIR}/${P}-ffmpeg-avstream.patch" if use pulseaudio; then sed -i \ |