Add recent libav fix from sabayon / upstream, bug 392369

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

diff --git a/media-sound/kradio/ChangeLog b/media-sound/kradio/ChangeLog
index e3159562df6b3a4c82bfcd78ae1f4c02cd4f2d9c..a6f6b82b03b1706d25e917fbb8de1316cca44745 100644 (file)
--- a/media-sound/kradio/ChangeLog
+++ b/media-sound/kradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kradio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.29 2011/10/28 23:34:35 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.30 2011/12/01 21:55:03 dilfridge Exp $
+
+  01 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> kradio-4.0.2.ebuild,
+  +files/kradio-4.0.2-libav.patch:
+  Add recent libav fix from sabayon / upstream, bug 392369
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> kradio-4.0.2.ebuild:
   Bump to EAPI=4

diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 43ee2e3932fdb444ce78d9c74357507028781ca9..cab7031c84b408e0554a307b45bc30a7f2d50f0c 100644 (file)
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX kradio-4.0.2-libav.patch 1954 RMD160 d7ba1d89eeb8c5077880ec5ae209f7ae34dabc7f SHA1 d5dc5d3b4086bbd2ec90e6e2f57a9c1434a416a8 SHA256 844a491a7f5dd87defe209e05c149ade90ce8e862ee21340d8bc72d9ce9c8b44
 DIST kradio4-4.0.2.tar.bz2 1604179 RMD160 2273737c772f47ed4c6124f9b9e994883b5124ae SHA1 d5ceac0e9260fc2fd1f4a0a567811b06edb0d175 SHA256 8d18fd2bac52133c712c0aef1dfd67ce503e0135860c248bdbe99c4b7ed97870
-EBUILD kradio-4.0.2.ebuild 1135 RMD160 8753c0f6e7167ecf08b5a823eec6b8c1c868a390 SHA1 d8fb956ea04fbe996ab37d49caa0012ba4f513f8 SHA256 66823db0aecad18798ff2ece7a79aab84813190b0258fffbfea6373a39132195
-MISC ChangeLog 4784 RMD160 bf8d617692f60f3d299de22688750b32a90083aa SHA1 5f4c7cc6d313259760e3b1e5831d950ccce6f66e SHA256 f2c89aabd43e1098dd77f12b2c41d0e1e8308e3ec79fb4ec460092b5ea486b39
+EBUILD kradio-4.0.2.ebuild 1184 RMD160 92c65704aaa89381809569ba7e4e27ff0add4b3e SHA1 25583287347794444b9dca3801ad5a31841862b5 SHA256 af9b4e546a1b61ed9abe20c3d2d28da0bd8fa70fa5fcb192548c8152cef4183f
+MISC ChangeLog 4962 RMD160 9729dee884406eb23bddc9ed55b752a435cb0c63 SHA1 de77bef7cddd955f90363dc93719663a934f2b27 SHA256 978a7ef1fb30a32efe34a0734eda07b4084e93158443e647ed056f75cf4b7aa6
 MISC metadata.xml 220 RMD160 a7adf69690c8573ceceff9b8efa22e074c1c2499 SHA1 41f9fb9f2920aa457ff68d560d1a1a3d90a09915 SHA256 b3e0af69cc34497798ede4df65665f7e1ef13913da5ade30ed744343152648da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOqzwRAAoJELHSF2kinlg4WowP/iCiZdlwNaK2JCfzxBvugAgf
-G/tSaisqii14fG4Mfmt0fD9msq2Ipg/ofLyBtisIV8NaAtJ7ixxMDPRqVvj00d21
-6YvRBHd2FOiLlMcHyhjyx7wCT/tJBFrM+c1tWts0S4/ITYo8liEUz6wDLAuknodf
-fQi4rKFt+1XUbnUrvkZeFe3eIsV0GRmheNtbHkD/T/q5m2Qo4WrQjze4j1iKopbX
-SJgr2epfPQy3eTjjdZYegfSnZjt1pqg+RVJMDGy82jxLFhFwrIUUfXElfjfw+yFv
-CSI8SOU+r+eVnh7VaYMBk75AZgBX6tbfWMArSUck8yVVeLETDTgAZhxxW6VdVLBo
-iau3wIwSIzkVizTDRQ7GTTuWNEl6aDsKJVYOM36ZJCrdkbM2N0KXkVJbCCVJZ1nQ
-IQeL2erlAS81dGvNu2o/Gtz4wyjvnODEru0mBdbITR/Ed+G+aChFIGD2/sKvnJ24
-/sPToYkOKSHsn1I/JT1DfrVeAYQUa7vjw4nzkhN5ntX30v+p4xF5zLwj6630pbk0
-eYRTb9oieEViDqxdpyIDf30K2Ng5FvN9u9fijHpw5i1ZZN+/RDoV/Ypd8shzXuNL
-pmjjFPkYjPqupDMnyOL28HTYDg2vmmZ0O6Fef0dc+Ek+RMHEHDARo61He1fbXYad
-S64BcKWfI3GwSQyUmkBt
-=JaPX
+iQIcBAEBCgAGBQJO1/e+AAoJENwGBM22xffet7kQAKrtZWAm7+6pBsOCLKepNRxd
+INXBrJYp38MagPA/VTI6+ReB2KXrl6WRRi21CpNHy7EntzRjhmCp6oMehofx/oYj
+47Difuc09BPIJ2yzMmIUO82YKM8N9Fdso6Ekc27aYjY5MPPoe4fwKcwYprn/abRm
+d3/Ny06XcDqYCk4IKd3gGQNLSl6a96YUEfE+524X9khuoGdh1fjL31PiQsJEipvQ
+yedVjhlrbmIF3Vu1btUgOl4jdMOExQ860s9Tl8h0VRSfmOEoOS75l9PEXaCn0nra
+9rI+Hv+QHoWbP0QUdqlZaSbZr0qzv4rnV682en/GNl7CtqCGTnml6V7+lx5/fCk5
+HbCdlTswClRXKjSkcb6jgA7ve3K79ojTP0Lr1EjzNdUzu8wOZItvdE++juK8UpIO
+4OtNo/gz7N4EmvXiVB+TtBA6g/ygQ+ksUGVonlpCycJNXcPiuEVH5V6ftz2Me+ij
+m9zGy0CDr3womQY/qYtTWUXDYBilG3PEvniNfb5+nLjfSo3B2Zwai7iigOqnuX1N
+o9Qyh6nPqmT0T6hg6Ok3aPY41GtfyO3bmLdC2eZbanx90ddhW66cU3Drxt+TNMXE
+oCsb4KDw4D4tEM6D2K7x1Tc4zxObtsj9PvG3ccygQxPNLbBi4igu0mPX5HzKDHDe
+C6NiAIIX5VWIyp/jut8J
+=dnmW
 -----END PGP SIGNATURE-----

diff --git a/media-sound/kradio/files/kradio-4.0.2-libav.patch b/media-sound/kradio/files/kradio-4.0.2-libav.patch
new file mode 100644 (file)
index 0000000..87d4861
--- /dev/null
+++ b/media-sound/kradio/files/kradio-4.0.2-libav.patch
@@ -0,0 +1,35 @@
+X-Git-Url: 
+http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
+
+diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
+index 4cd6cc0..c74d6e2 100644
+--- a/plugins/internetradio/decoder_thread.cpp
++++ b/plugins/internetradio/decoder_thread.cpp
+@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+ 
+     //av_log_set_level(255);
+     m_av_pFormatCtx = avformat_alloc_context();
+-    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
+     m_av_pFormatCtx->probesize = m_maxProbeSize;
+     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
+ 
+@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+         m_av_pFormatCtx_opened = true;
+     }
+     else {
+-
+ //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
+         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
+             if (warningsNotErrors) {
+@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
+     m_av_audioStream = -1;
+     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
+ //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
++#else
++        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
++#endif
+             m_av_audioStream = i;
+             break;
+         }

diff --git a/media-sound/kradio/kradio-4.0.2.ebuild b/media-sound/kradio/kradio-4.0.2.ebuild
index 8fe99a6c074418a7d04d8798183b680c55e2f2be..d75d8f8c37e819ef73ea09590732dd5b07fb74ca 100644 (file)
--- a/media-sound/kradio/kradio-4.0.2.ebuild
+++ b/media-sound/kradio/kradio-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.2.ebuild,v 1.5 2011/10/28 23:34:35 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.2.ebuild,v 1.6 2011/12/01 21:55:03 dilfridge Exp $
 
 EAPI=4
 
@@ -34,6 +34,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 src_configure() {