[arch-commits] Commit in moc/trunk (PKGBUILD curl-streams.diff)

[Eric Bélanger]

    Date: Monday, May 30, 2011 @ 16:58:06
  Author: eric
Revision: 125870

upgpkg: moc 20110528-1
Updated with recent svn snapshot

Modified:
  moc/trunk/PKGBUILD
Deleted:
  moc/trunk/curl-streams.diff

-------------------+
 PKGBUILD          |   24 +++++++++++-------------
 curl-streams.diff |   28 ----------------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-30 17:16:24 UTC (rev 125869)
+++ PKGBUILD	2011-05-30 20:58:06 UTC (rev 125870)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=moc
-pkgver=2.4.4
-pkgrel=4
+pkgver=20110528
+pkgrel=1
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
@@ -17,22 +17,20 @@
             'wavpack: for using the wavpack plugin' 
 	    'libmodplug: for using the modplug plugin')
 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')
+source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
+        gcc-undefined-symbols.diff)
+md5sums=('e9394640fecb725ad8146575a3091134'
+         'efacb8559e9145e15b0c25f8fa2a9d79')
+sha1sums=('d09c27602a60e3e9fde476e13d7c1a8b21489505'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   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)
+  ./autogen.sh
   ./configure --prefix=/usr --without-rcc --without-aac \
     --with-oss  --with-alsa  --with-jack --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -42,6 +40,6 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   make DESTDIR="${pkgdir}" install
 }

Deleted: curl-streams.diff
===================================================================
--- curl-streams.diff	2011-05-30 17:16:24 UTC (rev 125869)
+++ curl-streams.diff	2011-05-30 20:58:06 UTC (rev 125870)
@@ -1,28 +0,0 @@
-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");