[arch-commits] Commit in kradio/repos (12 files)
Andrea Scarpino
andrea at archlinux.org
Sat Nov 12 15:00:10 UTC 2011
Date: Saturday, November 12, 2011 @ 10:00:10
Author: andrea
Revision: 142606
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kradio/repos/testing-i686/PKGBUILD
(from rev 142605, kradio/trunk/PKGBUILD)
kradio/repos/testing-i686/kradio-ffmpeg.diff
(from rev 142605, kradio/trunk/kradio-ffmpeg.diff)
kradio/repos/testing-i686/kradio.install
(from rev 142605, kradio/trunk/kradio.install)
kradio/repos/testing-x86_64/PKGBUILD
(from rev 142605, kradio/trunk/PKGBUILD)
kradio/repos/testing-x86_64/kradio-ffmpeg.diff
(from rev 142605, kradio/trunk/kradio-ffmpeg.diff)
kradio/repos/testing-x86_64/kradio.install
(from rev 142605, kradio/trunk/kradio.install)
Deleted:
kradio/repos/testing-i686/PKGBUILD
kradio/repos/testing-i686/kradio-ffmpeg.diff
kradio/repos/testing-i686/kradio.install
kradio/repos/testing-x86_64/PKGBUILD
kradio/repos/testing-x86_64/kradio-ffmpeg.diff
kradio/repos/testing-x86_64/kradio.install
-----------------------------------+
testing-i686/PKGBUILD | 64 ++++++++++++++++-----------------
testing-i686/kradio-ffmpeg.diff | 68 ++++++++++++++++++------------------
testing-i686/kradio.install | 22 +++++------
testing-x86_64/PKGBUILD | 64 ++++++++++++++++-----------------
testing-x86_64/kradio-ffmpeg.diff | 68 ++++++++++++++++++------------------
testing-x86_64/kradio.install | 22 +++++------
6 files changed, 154 insertions(+), 154 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-i686/PKGBUILD 2011-11-12 15:00:10 UTC (rev 142606)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.2
-pkgrel=2
-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')
-install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
-options=(!libtool)
-
-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
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
-}
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
- '5f407eb75536f39e79c77a70613e8704'
- '7d31a4f54602bc109f39cc0a7a1dc50c')
Copied: kradio/repos/testing-i686/PKGBUILD (from rev 142605, kradio/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kradio
+pkgver=4.0.2
+pkgrel=3
+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')
+install=kradio.install
+source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
+options=(!libtool)
+
+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
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR="$pkgdir" install
+}
+md5sums=('18fea3e2bc7100882075187c6a89f7bd'
+ '5f407eb75536f39e79c77a70613e8704'
+ '7d31a4f54602bc109f39cc0a7a1dc50c')
Deleted: testing-i686/kradio-ffmpeg.diff
===================================================================
--- testing-i686/kradio-ffmpeg.diff 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-i686/kradio-ffmpeg.diff 2011-11-12 15:00:10 UTC (rev 142606)
@@ -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;
- }
Copied: kradio/repos/testing-i686/kradio-ffmpeg.diff (from rev 142605, kradio/trunk/kradio-ffmpeg.diff)
===================================================================
--- testing-i686/kradio-ffmpeg.diff (rev 0)
+++ testing-i686/kradio-ffmpeg.diff 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,34 @@
+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;
+ }
Deleted: testing-i686/kradio.install
===================================================================
--- testing-i686/kradio.install 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-i686/kradio.install 2011-11-12 15:00:10 UTC (rev 142606)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
Copied: kradio/repos/testing-i686/kradio.install (from rev 142605, kradio/trunk/kradio.install)
===================================================================
--- testing-i686/kradio.install (rev 0)
+++ testing-i686/kradio.install 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_upgrade() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-x86_64/PKGBUILD 2011-11-12 15:00:10 UTC (rev 142606)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.2
-pkgrel=2
-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')
-install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
-options=(!libtool)
-
-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
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
-}
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
- '5f407eb75536f39e79c77a70613e8704'
- '7d31a4f54602bc109f39cc0a7a1dc50c')
Copied: kradio/repos/testing-x86_64/PKGBUILD (from rev 142605, kradio/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kradio
+pkgver=4.0.2
+pkgrel=3
+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')
+install=kradio.install
+source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
+options=(!libtool)
+
+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
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR="$pkgdir" install
+}
+md5sums=('18fea3e2bc7100882075187c6a89f7bd'
+ '5f407eb75536f39e79c77a70613e8704'
+ '7d31a4f54602bc109f39cc0a7a1dc50c')
Deleted: testing-x86_64/kradio-ffmpeg.diff
===================================================================
--- testing-x86_64/kradio-ffmpeg.diff 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-x86_64/kradio-ffmpeg.diff 2011-11-12 15:00:10 UTC (rev 142606)
@@ -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;
- }
Copied: kradio/repos/testing-x86_64/kradio-ffmpeg.diff (from rev 142605, kradio/trunk/kradio-ffmpeg.diff)
===================================================================
--- testing-x86_64/kradio-ffmpeg.diff (rev 0)
+++ testing-x86_64/kradio-ffmpeg.diff 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,34 @@
+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;
+ }
Deleted: testing-x86_64/kradio.install
===================================================================
--- testing-x86_64/kradio.install 2011-11-12 14:59:37 UTC (rev 142605)
+++ testing-x86_64/kradio.install 2011-11-12 15:00:10 UTC (rev 142606)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
Copied: kradio/repos/testing-x86_64/kradio.install (from rev 142605, kradio/trunk/kradio.install)
===================================================================
--- testing-x86_64/kradio.install (rev 0)
+++ testing-x86_64/kradio.install 2011-11-12 15:00:10 UTC (rev 142606)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_upgrade() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+}
More information about the arch-commits
mailing list