Adapt to the latest ffmpeg API. Bug #540150

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

4 files changed, 48 insertions, 7 deletions

diff --git a/media-libs/libdlna/ChangeLog b/media-libs/libdlna/ChangeLog
index 72f5755ad586..fbf5e26808b4 100644
--- a/media-libs/libdlna/ChangeLog
+++ b/media-libs/libdlna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdlna
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.12 2015/02/16 19:03:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.13 2015/03/13 20:08:38 hwoarang Exp $
+
+  13 Mar 2015; Markos Chandras <hwoarang@gentoo.org>
+  +files/libdlna-0.2.4-ffmpeg.patch, libdlna-0.2.4.ebuild:
+  Adapt to the latest ffmpeg API. Bug #540150
 
   16 Feb 2015; Jeroen Roovers <jer@gentoo.org> libdlna-0.2.4.ebuild,
   +files/libdlna-0.2.4-libav9.patch, -files/libdlna-libav9.patch:
diff --git a/media-libs/libdlna/Manifest b/media-libs/libdlna/Manifest
index 98ac69e2eb8e..0876220fd159 100644
--- a/media-libs/libdlna/Manifest
+++ b/media-libs/libdlna/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libdlna-0.2.4-ffmpeg.patch 565 SHA256 6714d1dfeff5d4336ec461f8a6eb3861c74c6f35a104d32ba210dbacf560a2a8 SHA512 5ace37ddd77e19b209eb5f283c58e3e4388d905cfb4f972cfdda440bac5db68bf429caf50a21bd39dee20c1cf78c5485508ea9e4134d43ddb4ab6815dcf3b53a WHIRLPOOL e87222d135f0d549edba0147388f45d5cb1006545b50f3477c06cf60969e7172089b0ab86f6d2f340360fd95628aeef3292f266e3716bb5cb4330e952be4b0a1
 AUX libdlna-0.2.4-libav9.patch 259 SHA256 7d60c4dd1ab57ef63169b58c703b6d7bdf619f28805f1e402507d2694d6637fe SHA512 52aab4d308a437c1b83f90f2786d48010b41249166daf073c0740d55412885f8f2eec5c54d7accf4b93c40afc8ea1d7ca2c43c4b22513fe9c43c07d54e26d084 WHIRLPOOL acd9a58fdf829daaf313d8c79089719d5534076a5c51c03b25528020a8bd4f80df2ef0e88203275e9f90ab811b395c9961806cafa5d80645193817f2b8542d13
 DIST libdlna-0.2.4.tar.bz2 37579 SHA256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5 SHA512 2d6185e0d7f9d449fe48e5e6c7331a46fb795794c6b8f229e730e47ae519e28d012a79227c2bb43d3a62442560e0d65c8a84ef48e714a99848b854495d6bf7e6 WHIRLPOOL c2977ca71891cd64b12342b6ceb509c7c03ddb3ae1cbda44c0517796e990c07c9306c7372fcd112d7f211d7f79ae476fe146eaf2197065d5aebf6ba7dc20fda9
-EBUILD libdlna-0.2.4.ebuild 946 SHA256 8233155c362fd0ea456adaad9f3550b0be035178d5e5710234bb5892012a89dc SHA512 96594dcb299ef4cfeabc839407e35b4e606447ae0bee231d7d35f110b569bfd5257f329807ecf8e7d6a603c5b25adaf6c0424f955292619b284b04272260daf4 WHIRLPOOL 6abaddf934b0f1f5ce7781ce808a0bcb75d17828738b5cc9723d8e3c99cda4c2bbbf6011db31278b95ace1461a188190ab005b29a9318e279d24334e2ba6da6b
-MISC ChangeLog 2251 SHA256 0669874319defcd4e0e0795aed5c8de868a9463492696ab1a93915b381b4f1d8 SHA512 49d250674660684f4fa762b952d522d4de271261fb1f417221c02aa2191fbcbdc447bf9528867c7a5892519023e2d8c0d0596262c713bf6b62312c2b06698392 WHIRLPOOL 60dcc0f63300cdd3ce8afd1095c571272c5e3c4a73e2954849f0ccafdd2bf882074ca966f072c6cc0b606b152a1a996294be9b7539cab1fc1b15de8834745e25
+EBUILD libdlna-0.2.4.ebuild 1001 SHA256 8d60a13e045d0a61998fc333c1b50731305b0c200890957261813f8355caa0dc SHA512 82444b036d6aa3676f72da4281642498e80bad0c426c83a35a4f3f939032bc720afb905545241a907a5f18ba63c256e2a3e2fcf7ca69c2905f0017595c1f8f3c WHIRLPOOL e44afaa0648b0dee6ecd073e469c4e9f2970425cc4e7fe8f58c3d2429f483d7748e98d8a89e6918a1a0b71424aa9f37b72b8ce78e25d9726d29c9d8383db31b3
+MISC ChangeLog 2415 SHA256 1c4cf06aa9eaf4923424bf3f77b0117c49d9bb5d8aacc94be17289d3ae331731 SHA512 a20e073772e0e11a09d8c77b6c16d563ea7806dff6b86a3fa841ac7f69bfd4278b63641cdeb693f269870a4adceb9e11b19a16bcd2fb771219e8fc078ca3c180 WHIRLPOOL 79c8282e7d5c1e52ac34d7fe883a68e0095c973dfb26f694ca9c2226990d220dc12aa7ce4aec6512c245751e07e4d0546ae08117c10deb100d070c8f16c6fb10
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTiPu8ACgkQVWmRsqeSphMAnACeOpzxtQexC8rM2tvklWJNEHGU
-oFwAoIAGP19o1h3eJvCtn3uEOgHM8tp5
-=mGNI
+iQJ8BAEBCABmBQJVA0PLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88484QAI2kLzFrMq0MBTyblFS8nQ4D
+84EEbh/r/P2WgcLC8sHvgF++rytbSu6R3zd+ZdgsssuC4bqdWRQtHhKghzoJxtqi
+9/ZvbtX0PgeHTqUTwvhU8W/TpTDFo00iRDDjmru4d8f6QMb76FdClCpdn0jVpnNd
+qnBylWee39jvr95ppg9NT0cA46z8QJCxlZhG1lyz8ije5AP0bF1T3McyxNd/0qcv
+wBIhC5Q+LxRSL9mki3ZieuDF8cIktJguCihDb5hebp9EqRPuxcjh5FwiIAtX4LLo
+3QCI+X2auxwEpsclCo5SGgzT9AZmPT1Ipyyj9eS4usDNobYYk/yV/yaG8G0eKKn3
+HsCPW32R8gmRAT3rVRdNKoOm7MHUL83sC57ylB4iLx1yp4okmiin4IAlv2KfamEc
+T+dHZDSJLpPkzKg9+FNNIbyZ0oAkKKPAlN/kkT1GhUpawj/HKK+uhDqaKlvS+kW1
+n9HWhAefHiaxvTe7RFEqckTRMAy2lOtCeCzFdzGckC4+jhIqKPMoSdA7cpf/Qiqc
+4dSYgm4f4ArrhlpOP/X6Cyk5UD5qHgIjI8/ZDSY/KGOINCMvM6umLdc6bGAqhpDL
+qMRPs644TBjJ1laQnqUoHLNrfMJzo3qTAp4qxtkoCzeDonaYvT38Rl141KHoVf//
+3h/npnRTR2dFwNugwREO
+=nVfm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdlna/files/libdlna-0.2.4-ffmpeg.patch b/media-libs/libdlna/files/libdlna-0.2.4-ffmpeg.patch
new file mode 100644
index 000000000000..1a908ac20c94
--- /dev/null
+++ b/media-libs/libdlna/files/libdlna-0.2.4-ffmpeg.patch
@@ -0,0 +1,22 @@
+Adapt to the latest ffmpeg API
+
+Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540150
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+Index: libdlna-0.2.4/src/profiles.c
+===================================================================
+--- libdlna-0.2.4.orig/src/profiles.c
++++ libdlna-0.2.4/src/profiles.c
+@@ -334,7 +334,12 @@ dlna_guess_media_profile (dlna_t *dlna,
+     p = p->next;
+   }
+ 
++#if LIBAVFORMAT_VERSION_MAJOR < 54
+   av_close_input_file (ctx);
++#else
++  avformat_close_input(&ctx);
++#endif
++
+   free (codecs);
+   return profile;
+ }
diff --git a/media-libs/libdlna/libdlna-0.2.4.ebuild b/media-libs/libdlna/libdlna-0.2.4.ebuild
index 7aaf2c774f14..7b68e24cecb7 100644
--- a/media-libs/libdlna/libdlna-0.2.4.ebuild
+++ b/media-libs/libdlna/libdlna-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.7 2015/02/16 19:03:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.8 2015/03/13 20:08:38 hwoarang Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -18,6 +18,8 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libav9.patch
+	# 540150
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
 
 	tc-export CC
 }