[arch-commits] Commit in moc/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Thu May 19 04:47:02 UTC 2011
Date: Thursday, May 19, 2011 @ 00:47:01
Author: eric
Revision: 124292
upgpkg: moc 2.4.4-4
Fixed internet radio streaming support (close FS#23193), Added patch for undefined gcc symbol (close FS#23879), Removed force option
Added:
moc/trunk/curl-streams.diff
moc/trunk/gcc-undefined-symbols.diff
Modified:
moc/trunk/PKGBUILD
Deleted:
moc/trunk/ChangeLog
----------------------------+
ChangeLog | 32 -----------------------------
PKGBUILD | 47 ++++++++++++++++++++++---------------------
curl-streams.diff | 28 +++++++++++++++++++++++++
gcc-undefined-symbols.diff | 12 ++++++++++
4 files changed, 65 insertions(+), 54 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2011-05-18 20:26:54 UTC (rev 124291)
+++ ChangeLog 2011-05-19 04:47:01 UTC (rev 124292)
@@ -1,32 +0,0 @@
-2010-02-25 Eric Belanger <eric at archlinux.org>
-
- * moc 2.5.0_alpha4-2
- * Added wavpack and modplug support (close FS#18449)
-
-2010-01-24 Eric Belanger <eric at archlinux.org>
-
- * moc 2.5.0_alpha4-1
- * Upstream update to unstable series
- * Fixed aac support (close FS#13164)
-
-2009-11-07 Eric Belanger <eric at archlinux.org>
-
- * Fixed optdepends array syntax (close FS#16053)
-
-2009-03-21 Eric Belanger <eric at archlinux.org>
-
- * moc 2.4.4-3
- * Added missing libid3tag depends (close FS#13819)
-
-2009-03-07 Eric Belanger <eric at archlinux.org>
-
- * moc 2.4.4-2
- * Added patch to fix playback of WMA files
-
-2009-01-11 Eric Belanger <eric at archlinux.org>
-
- * moc 2.4.4-1
- * Upstream update
- * Added libtool depends
- * Replaced install scriptlet by optdepends
- * Added ChangeLog
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-18 20:26:54 UTC (rev 124291)
+++ PKGBUILD 2011-05-19 04:47:01 UTC (rev 124292)
@@ -1,11 +1,9 @@
# $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: dorphell <dorphell at gmx.net>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=moc
pkgver=2.4.4
-pkgrel=3
+pkgrel=4
pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
arch=('i686' 'x86_64')
url="http://moc.daper.net/"
@@ -18,27 +16,32 @@
'libmpcdec: for using the musepack plugin'
'wavpack: for using the wavpack plugin'
'libmodplug: for using the modplug plugin')
-options=('!libtool' 'force')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('647c770a5542a4ae5437386807a89796')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
+options=('!libtool')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
+ gcc-undefined-symbols.diff curl-streams.diff)
+md5sums=('647c770a5542a4ae5437386807a89796'
+ 'efacb8559e9145e15b0c25f8fa2a9d79'
+ 'bb9be1e80762851c57075c99a612af2f')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
+ 'a811a4ac7e049914aab528d3f06a6be6634c2720'
+ 'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
- sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
- # Disabling aac to use the external ffmpeg to play them (FS#13164)
- ./configure --prefix=/usr --without-rcc --without-aac \
- --with-oss --with-alsa --with-jack --with-mp3 \
- --with-musepack --with-vorbis --with-flac --with-wavpack \
- --with-sndfile --with-modplug --with-ffmpeg --with-speex \
- --with-samplerate --with-curl
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i ../gcc-undefined-symbols.diff
+ patch -p1 -i ../curl-streams.diff
+ sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
+ sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+ ./configure --prefix=/usr --without-rcc --without-aac \
+ --with-oss --with-alsa --with-jack --with-mp3 \
+ --with-musepack --with-vorbis --with-flac --with-wavpack \
+ --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+ --with-samplerate --with-curl
+ make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
Added: curl-streams.diff
===================================================================
--- curl-streams.diff (rev 0)
+++ curl-streams.diff 2011-05-19 04:47:01 UTC (rev 124292)
@@ -0,0 +1,28 @@
+diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
+--- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200
++++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200
+@@ -338,6 +338,8 @@
+ fd_set read_fds, write_fds, exc_fds;
+ int max_fd;
+ int ret;
++ long milliseconds;
++ struct timeval timeout;
+
+ logit ("Doing select()...");
+
+@@ -356,8 +358,14 @@
+ if (s->curl.wake_up_pipe[0] > max_fd)
+ max_fd = s->curl.wake_up_pipe[0];
+
++ curl_multi_timeout(s->curl.multi_handle, &milliseconds);
++ if(milliseconds <= 0)
++ milliseconds = 1000; /* just a cautionary default */
++ timeout.tv_sec = milliseconds / 1000;
++ timeout.tv_usec = (milliseconds % 1000) * 1000;
++
+ ret = select (max_fd + 1, &read_fds, &write_fds,
+- &exc_fds, NULL);
++ &exc_fds, &timeout);
+
+ if (ret < 0 && errno == EINTR) {
+ logit ("Interrupted");
Added: gcc-undefined-symbols.diff
===================================================================
--- gcc-undefined-symbols.diff (rev 0)
+++ gcc-undefined-symbols.diff 2011-05-19 04:47:01 UTC (rev 124292)
@@ -0,0 +1,12 @@
+--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200
++++ decoder.c 2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ for (i = 0; i < plugins_num; i++)
+ if (plugins[i].decoder->destroy)
+ plugins[i].decoder->destroy ();
++ for (i = 0; i < plugins_num; i++)
++ if (plugins[i].handle)
++ lt_dlclose(plugins[i].handle);
+
+ if (lt_dlexit())
+ logit ("lt_exit() failed: %s", lt_dlerror());
More information about the arch-commits
mailing list