Fix building against latest ffmpeg. Bug #516290. Thanks to Marcel Pennewiß <gentoo@pennewiss.de>

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

4 files changed, 52 insertions, 8 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/Manifest b/net-voip/homer/Manifest
index 10a00f06d967..e04652618bce 100644
--- a/net-voip/homer/Manifest
+++ b/net-voip/homer/Manifest
@@ -2,20 +2,33 @@
 Hash: SHA256
 
 AUX homer-0.24.1-libav-9.patch 3754 SHA256 70b90b79f82eb380df37e5c0dbed397b533675d0dab58ec5f55e7d5c1cf63c56 SHA512 077c8622af82719273ccb168ce7a1c49b9818361dd647c5a98c9f20ebe97aa86703b5ada25bc9ec317c6b917cb5e9820120b115123d29ebc4702f11a538b9651 WHIRLPOOL 209b7ef3ac573d8d99480770a6c77d2617c24f5da2f77e51b6dd6e1e515492eb1ede715ce90817993c777e9382482972605d33cb7f75cb39e9b0a3aecce16beb
+AUX homer-0.25-ffmpeg-avstream.patch 987 SHA256 57a86158702a3fc82713f771f2eb1a0a762f3a82e0442237610dc0cd42411231 SHA512 8087242482f01f801ef7643dcacbd3c94d59b32a2d85bc1414d03d80cc8b39f2d60cf9b12b6fdc6bca09ecfd58d224c03bfc9f8fe70895ace11c5aadfaf21e65 WHIRLPOOL 895fc5a15a0204a44aab43d7da49fcbff13cbe7ab91a2e555bf2bcd5ac1f0192453aec286fdb0f86d8660313869e415687e671ff03382849c52377d646f247c3
 DIST homer-0.24.1.tar.gz 1297045 SHA256 738cd4a1e8b437936c904bdea649c0ee12ecca2caa1bef5c585925eabe84ff44 SHA512 ea2d1a5224048668e20a62f142370910f337b3b56b94c9a92a9b7530652ceed67a59223fac57ee0d835c31545d2d06c21329a0463680936d32a1455dbb2fac33 WHIRLPOOL b16ccdea6c5ea0845aca4f31a2d6258cf6a71258c531ee36a02b2844814df73b26229ffc96129532b4f9c1f2070a9cd279b720b7286e691e488bc7b524c47278
 DIST homer-0.25-ffmpeg2.patch 65617 SHA256 ce1327a59dc20c2fbe23e968786ecce21126cdb2119916bf2227594dc8c0a229 SHA512 fb4ca0bd161c94999b54b86337220f3f018672e4a5031788d8292273515fe68d4364574645d96e04b19bdb64f1b032119503cf823c7604d625015ba0cdabf030 WHIRLPOOL 909069e830b9ef473a006f686a5e5e9f7279c5b0fc8fb8f212a30b767106055970441fa4fdbe2d443fce500024bc00494c112ebb3b95a65a475b2731e8d361c7
 DIST homer-0.25.tar.gz 1404242 SHA256 1c3e67a7f7134a317bc32dfb691679a2997fbfa129c70d5d165ccfd0272a752d SHA512 92254f9cc133589760a4c3081e1636232ace8eb972f7800c4fb5aaeba52e22546c6772e4c93625aa31a5d7b366f441cf8155f52d85ca44dade60edebf98b6340 WHIRLPOOL 944277b8248a1037dd27881456b6fb304d19d2f12cc7bc4268ba3dbf876de668fde25749dfbfd424950fe641d7dc65f5f14a29e9d14d5c1e738dc555af201ffe
 EBUILD homer-0.24.1-r1.ebuild 1627 SHA256 4eb42efbf6c79bd31385890b8262a0dc398bc19d981815d2f5e4f3297c43d8ea SHA512 1027cab7f7aa0f8ebe80e87ef5237f2e731aa464ee0a52536bef3879935fe2287bcf528bff81f584606855379a38ff98f57112247dee69d71439ec1e064ed0a4 WHIRLPOOL 4b15c349c2e72dcdaddc6099e66e4da4ea9d95b81bcd213752391f5794740ac76e781cf42eaeeb56d2336d510973131e78b79b2858308944d7cf555f0a29b347
 EBUILD homer-0.24.1.ebuild 1572 SHA256 ef8d5cdef412b5385d6908585f70a41d6b547f48f32b6c3d5bc5364c4105cd39 SHA512 765dd360c622025caec8310e3aea28ab48dad6ccc2c30f1d0cc3ea03e89e1103bd321370ab0cf6b01baaf972f4ff6015b928f607fc7e6252e1a56cc56f5b4ab7 WHIRLPOOL 0229b81597e1bdb6172f862ab314b2438f27bbc5c071987598fcb552a682510a4b67b02b861b227e8773ebc405b8b25990179b238e05da42cb90a48d748a0efc
-EBUILD homer-0.25-r1.ebuild 1853 SHA256 de8f5e3846c9786bafe5a381330d96c5e583484644dbae2ac7cb7733886331f5 SHA512 80c17d55d5bc80a15057daaed58270a460f08cad9b9a5596b99b402444d77c8cab975e7c37e52702dc8210bd877156d6909c6ec000abf75e0e13f5d9df387fc6 WHIRLPOOL b3c51d6de66d20c2e38dd597a8eaf8373318ecc51370d57c850babac2b1ae08609f7e5ad5cd912b8fcea953c61910f424820bbaa6652c79bcdc9d04f9571a585
+EBUILD homer-0.25-r1.ebuild 1920 SHA256 b0e85b50251e471ecf67d5c68d0a10214a50c0288824484f99e824e3c4119a33 SHA512 69001b074877b4e4d5ee8ca502a4644b497de738becb2111f6369cfbbfb6ae930f5991e5919de9f00fa42a22a8649b153cd56997ed89442ac52bda035093d57e WHIRLPOOL 190e3e92bf2cd0cd8dd1f9484b93b46dff9fd212ca5ccb43a3c4467b08d841a21b8737966ec8d6db4a945e4bf8fe6f2d846738f26e2f4e221d88bcaf0049800e
 EBUILD homer-0.25.ebuild 1747 SHA256 a179797d04a89058ddb984fb0728267a0a08f49b90e51e692b01396abb3998fb SHA512 55a4c84da3ee8e2b070bdcb9fe0968a95d85124adeaac1a5abc34bb988393dc0152a97b16064c0ac57ebea29b127ab41e3c0c018e5c17c37f0ee291adccf396d WHIRLPOOL f393f7317a324f4c183de96349843fefe65f5b3b1f92fd4897ab000cfd9c89bb4eb7807455befcaeb6270cf48d8e6ab6c01832d7ea47e1edecb33a3a7af0738a
 EBUILD homer-9999.ebuild 1749 SHA256 cdfd18a6993589f7e559cccc313bc4fdce013a2ca3b7491c1bbcd3027e73e3a8 SHA512 178b91318c6514212ded3164a42d5a726f88c3cffbffb1a9191dbce52848bc733f656e196876b98d900fe6cc2d1025ea155f2f5229f671678e3cbcec12d8cfeb WHIRLPOOL 31efbb9c7b5745aa8e00449a206cf22ea53e82b69de48115e114aae76d881def8ca88c70f8f12f585b2f434311a262040723517fa44c814dfb2069dc76e76b7c
-MISC ChangeLog 2873 SHA256 3472bb1c6a4b0a39c49b5d34a9ce94db3c5dcbea427d7f784d837696684dc73d SHA512 40653e6b26d14bf59334b441f2f2828e29413b53a99206a6a99707437b50f78724dcd61a49f6256c47336b83fb78554dae34183f1c5616fd2d60d3c436692042 WHIRLPOOL 996e3c2c5892055845f4a6c0316c7b12c9ef719371f26becff027f19c5684d4b8e3b36efe41688ff7287912c7ba8d02514f15bdcace717210c2030261bad807a
+MISC ChangeLog 3096 SHA256 ee7f3753e744ca47d5fd6156805f119e4c11a5a3c7e74931a42791d538ffb146 SHA512 cd19d77b33e28e813e8ee65d367202cd657e27b048d87ed695d275c3644406b2288aedbbacf705aa0612dac8ad16366a8684a37ab5ac1edf6f38e4958be5220f WHIRLPOOL 8e5da37f54982a6d013420c79e5489c77fe5727b43b99987f9ea8c873db2909d532cc6f10a2ff02e0cfc7a8ad77e8697f4870ed29e6bf6e5ce38c0f795a3ed0a
 MISC metadata.xml 310 SHA256 033cdf543570f9dfd2a40e0bd982d3f59b8f47f77cf127c62c8dce9dbd7fa90b SHA512 762d68ba46a64c5e2ae0fa579d53febdcdb4b82702763e6183355ea30c7925499c4704b2a49202f90481c9fa4bcd78174e797bdd085af3ed4532b449993dbdf7 WHIRLPOOL 8fc36d53febd9e11f5c515c1c263509a88680002578699e69877f5cc8e18582fcfc9a21a2ce777b7d82b56d389f4c240f5b2e3af7f6f91bb89063941e0c73514
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn11cACgkQcaHudmEf86oHgwCfRbk0y8m+/s6guJbcIvBACLjc
-cC0AnRvlFcH5dKXa2lyHqHBswOx8yV5r
-=XlBX
+iQJ8BAEBCABmBQJUmGOZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88v5QP/jd4v6+bCpuuCzxBBgDCya3T
+ASwRp7VpIBR5gJnKFKn4G8sB4yJhnJS87ofg7DdlnLYa6laqPMmEz7lLfHiN3Bq8
+7Y5rWJGQc0KPjZ+Qi/xQ03cjMbDnxT0zVIWN3kkKKrCINYMYRjEo0O4oxAaTHf7q
+bU+nKdIJY5iQDgvKL6g3LzWBaZgAPULLdm1B2q8uJY1sRZ5cyTlaCTVq++rRlm0a
+kB2ZG0Zat+xLj+s7zaJIRlgNKdp9c0wHh0FEJCVh23qV2mpRjLsbKeq8m2AWPWT4
+SfsqYa1oAMdg9xK5a8bj+/EvzCkwNuU8oEzIZ0w4J7Q0n8LJN60FSx2IerGYAMeF
+DHv4eIAKnbdtGvrtI9Rw0wV3y5tmz7nD7FkiXMARflEubCV2EiujGBtnM8sWpUdE
+OT5+ATcoFg5ssiYBhNUwSyrUShZeq4F9/PoK0V/UCXCLWZ0zM7VwbeMXyouFjpYn
+VxklNnJVcXY5AVfEnwIuLbsrQjMiDlNZIxtyIzTMBgBwAS4mL6lS4kQjCaS+mCdR
+TKPyxPNy0tF5V/2ET8sqV2v10Pluw86HQDUOGyt363nLdMXD0lLS8SFIY9nSE+US
+qCb6hHo+lWy/JMEU+0zty1XhIIhyZb5gpX2BAAsoJgkY5er/w2TlKnhDJ3Oubg4e
+MytxqSDjv9Bd7vcy2Rse
+=z732
 -----END PGP SIGNATURE-----
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 \