[arch-commits] Commit in kradio/trunk (PKGBUILD kradio-ffmpeg.diff)

[Eric Bélanger]

    Date: Thursday, February 16, 2012 @ 16:20:43
  Author: eric
Revision: 150325

upgpkg: kradio 4.0.3-1

Upstream update, Remove old patch

Modified:
  kradio/trunk/PKGBUILD
Deleted:
  kradio/trunk/kradio-ffmpeg.diff

--------------------+
 PKGBUILD           |   14 ++++++--------
 kradio-ffmpeg.diff |   34 ----------------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-16 20:41:55 UTC (rev 150324)
+++ PKGBUILD	2012-02-16 21:20:43 UTC (rev 150325)
@@ -2,21 +2,22 @@
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kradio
-pkgver=4.0.2
-pkgrel=3
+pkgver=4.0.3
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 pkgdesc="A comfortable KDE radio application"
 url="http://kradio.sourceforge.net/"
 depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
 makedepends=('pkg-config' 'automoc4' 'cmake')
+options=(!libtool)
 install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
-options=(!libtool)
+source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc})
+md5sums=('f495ce341150ab04515d217bd8c36a32'
+         '42259fac62e427b8c86b7a5e5d4b18bf')
 
 build() {
   cd "$srcdir"
-  (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff")
   mkdir build
   cd build
   cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
@@ -27,6 +28,3 @@
   cd "$srcdir/build"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
-         '5f407eb75536f39e79c77a70613e8704'
-         '7d31a4f54602bc109f39cc0a7a1dc50c')

Deleted: kradio-ffmpeg.diff
===================================================================
--- kradio-ffmpeg.diff	2012-02-16 20:41:55 UTC (rev 150324)
+++ kradio-ffmpeg.diff	2012-02-16 21:20:43 UTC (rev 150325)
@@ -1,34 +0,0 @@
-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;
-         }