[arch-commits] Commit in moc/trunk (PKGBUILD moc-https.patch)

[Felix Yan via arch-commits]

Date: Sunday, March 8, 2020 @ 09:46:21
  Author: felixonmars
Revision: 377132

upgpkg: moc 1:2.5.2-3

fix https in playlist (FS#65098)

Added:
  moc/trunk/moc-https.patch
Modified:
  moc/trunk/PKGBUILD

-+
 PKGBUILD|9 ++---
 moc-https.patch |   10 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-08 09:43:11 UTC (rev 377131)
+++ PKGBUILD2020-03-08 09:46:21 UTC (rev 377132)
@@ -2,7 +2,7 @@
 
 pkgname=moc
 pkgver=2.5.2
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('x86_64')
@@ -18,15 +18,18 @@
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
 
source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig}
-moc-ffmpeg4.patch)
+moc-ffmpeg4.patch
+moc-https.patch)
 sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
   'SKIP'
-  '007a0580ac754e1c318a0d0b6f0d403883797eaf')
+  '007a0580ac754e1c318a0d0b6f0d403883797eaf'
+  'e3362ddd41126e2be874cd372a053fdaccf0f616')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p0 -i ../moc-ffmpeg4.patch # Fix build with ffmpeg 4
+  patch -p0 -i ../moc-https.patch   # Allow https for urls 
https://moc.daper.net/node/1872
 }
 
 build() {

Added: moc-https.patch
===
--- moc-https.patch (rev 0)
+++ moc-https.patch 2020-03-08 09:46:21 UTC (rev 377132)
@@ -0,0 +1,10 @@
+--- files.c.orig
 files.c
+@@ -93,6 +93,7 @@
+ inline int is_url (const char *str)
+ {
+   return !strncasecmp (str, "http://;, sizeof ("http://;) - 1)
++  || !strncasecmp (str, "https://;, sizeof ("https://;) - 1)
+   || !strncasecmp (str, "ftp://;, sizeof ("ftp://;) - 1);
+ }
+ 

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Tuesday, May 7, 2019 @ 20:45:13
  Author: arojas
Revision: 352742

https

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-07 20:44:32 UTC (rev 352741)
+++ PKGBUILD2019-05-07 20:45:13 UTC (rev 352742)
@@ -6,7 +6,7 @@
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('x86_64')
-url="http://moc.daper.net/;
+url="https://moc.daper.net/;
 license=('GPL')
 depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 
'faad2')

[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg4.patch)

[Antonio Rojas via arch-commits]

Date: Tuesday, April 24, 2018 @ 16:18:41
  Author: arojas
Revision: 322926

ffmpeg 4.0 rebuild

Added:
  moc/trunk/moc-ffmpeg4.patch
Modified:
  moc/trunk/PKGBUILD

---+
 PKGBUILD  |   13 ++---
 moc-ffmpeg4.patch |   33 +
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-24 16:10:13 UTC (rev 322925)
+++ PKGBUILD2018-04-24 16:18:41 UTC (rev 322926)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('x86_64')
@@ -18,11 +18,18 @@
 'wavpack: for using the wavpack plugin'
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig}
+moc-ffmpeg4.patch)
 sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
-  'SKIP')
+  'SKIP'
+  '007a0580ac754e1c318a0d0b6f0d403883797eaf')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../moc-ffmpeg4.patch # Fix build with ffmpeg 4
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --without-rcc \

Added: moc-ffmpeg4.patch
===
--- moc-ffmpeg4.patch   (rev 0)
+++ moc-ffmpeg4.patch   2018-04-24 16:18:41 UTC (rev 322926)
@@ -0,0 +1,33 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===
+--- decoder_plugins/ffmpeg/ffmpeg.c(revisión: 2963)
 decoder_plugins/ffmpeg/ffmpeg.c(copia de trabajo)
+@@ -697,7 +697,7 @@
+* FFmpeg/LibAV in use.  For some versions this will be caught in
+* *_find_stream_info() above and misreported as an unfound codec
+* parameters error. */
+-  if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++  if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+   decoder_error (>error, ERROR_FATAL, 0,
+   "The codec is experimental and may damage MOC: 
%s",
+   data->codec->name);
+@@ -705,8 +705,8 @@
+   }
+ 
+   set_downmixing (data);
+-  if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+-  data->enc->flags |= CODEC_FLAG_TRUNCATED;
++  if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++  data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+   if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+   {
+@@ -725,7 +725,7 @@
+ 
+   data->sample_width = sfmt_Bps (data->fmt);
+ 
+-  if (data->codec->capabilities & CODEC_CAP_DELAY)
++  if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+   data->delay = true;
+   data->seek_broken = is_seek_broken (data);
+   data->timing_broken = is_timing_broken (data->ic);

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Antonio Rojas]

Date: Sunday, January 1, 2017 @ 23:33:18
  Author: arojas
Revision: 285187

Update to 2.5.2

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-01 23:33:11 UTC (rev 285186)
+++ PKGBUILD2017-01-01 23:33:18 UTC (rev 285187)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=moc
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
@@ -19,7 +19,7 @@
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
 
source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('9e9a9bf0260cd7d7c170e4ef957041cf2275de32'
+sha1sums=('9d27a929b63099416263471c16367997c0ae6dba'
   'SKIP')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Antonio Rojas]

Date: Monday, June 27, 2016 @ 19:31:29
  Author: arojas
Revision: 270720

Update to 2.5.1

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-27 19:28:51 UTC (rev 270719)
+++ PKGBUILD2016-06-27 19:31:29 UTC (rev 270720)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=moc
-pkgver=2.5.0
-pkgrel=5
+pkgver=2.5.1
+pkgrel=1
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('i686' 'x86_64')
@@ -18,18 +18,11 @@
 'wavpack: for using the wavpack plugin'
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig}
 moc-ffmpeg3.patch)
-sha1sums=('a02c10075541995771dbdccb7f2d0ecd19d70b81'
-  'SKIP'
-  '7d997ac25041010837d5f3ec79920b8afeec87f7')
+source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('9e9a9bf0260cd7d7c170e4ef957041cf2275de32'
+  'SKIP')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
-prepare() {
-  cd $pkgname-$pkgver
-# Fix build with ffmpeg 3.0 (Debian)
-  patch -p1 -i ../moc-ffmpeg3.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --without-rcc \

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Jan de Groot]

Date: Monday, March 7, 2016 @ 16:53:24
  Author: jgc
Revision: 261168

upgpkg: moc 1:2.5.0-5

Rebuild for libmpcdec

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-07 15:50:56 UTC (rev 261167)
+++ PKGBUILD2016-03-07 15:53:24 UTC (rev 261168)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('i686' 'x86_64')

[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg3.patch)

[Antonio Rojas]

Date: Wednesday, February 17, 2016 @ 10:19:38
  Author: arojas
Revision: 259892

ffmpeg 3.0 rebuild

Added:
  moc/trunk/moc-ffmpeg3.patch
Modified:
  moc/trunk/PKGBUILD

---+
 PKGBUILD  |   13 +-
 moc-ffmpeg3.patch |  102 
 2 files changed, 112 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 09:11:03 UTC (rev 259891)
+++ PKGBUILD2016-02-17 09:19:38 UTC (rev 259892)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('i686' 'x86_64')
@@ -18,11 +18,18 @@
 'wavpack: for using the wavpack plugin'
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig}
 moc-ffmpeg3.patch)
 sha1sums=('a02c10075541995771dbdccb7f2d0ecd19d70b81'
-  'SKIP')
+  'SKIP'
+  '7d997ac25041010837d5f3ec79920b8afeec87f7')
 validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
+prepare() {
+  cd $pkgname-$pkgver
+# Fix build with ffmpeg 3.0 (Debian)
+  patch -p1 -i ../moc-ffmpeg3.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --without-rcc \

Added: moc-ffmpeg3.patch
===
--- moc-ffmpeg3.patch   (rev 0)
+++ moc-ffmpeg3.patch   2016-02-17 09:19:38 UTC (rev 259892)
@@ -0,0 +1,102 @@
+--- moc-2.5.0.orig/configure.in
 moc-2.5.0/configure.in
+@@ -557,22 +557,6 @@ then
+   echo
+ fi
+ 
+-dnl
+-dnl  If the warning below gets reported, then for further guidance:
+-dnl
+-dnl vi +/REQUEST_CHANNELS decoder_plugins/ffmpeg/ffmpeg.c
+-dnl
+-if test "x$want_ffmpeg" = "xyes" && \
+-   test "x$ac_cv_member_struct_AVCodecContext_request_channels" != "xyes"
+-then
+-  echo "WARNING: It appears that the FFmpeg/LibAV API has changed and no 
longer"
+-  echo " supports downmixing to stereo as it did previously.  
Report"
+-  echo " this message along with the output of 'ffmpeg -version' 
to"
+-  echo " <$PACKAGE_BUGREPORT>.  Meanwhile, you may have to live 
without"
+-  echo " stereo downmixing."
+-  echo
+-fi
+-
+ echo "WARNING: Since MOC version 2 the executable file name has changed to 
mocp!"
+ echo " Please remove old moc binary if you have installed an older 
version."
+ echo
+--- moc-2.5.0.orig/decoder_plugins/ffmpeg/ffmpeg.c
 moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -67,7 +67,7 @@ GCC_DIAG_OFF(deprecated-declarations)
+ GCC_DIAG_ON(deprecated-declarations)
+ #include 
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include 
++#include 
+ #endif
+ #else
+ #include 
+@@ -823,17 +823,6 @@ static bool is_seek_broken (struct ffmpe
+   return false;
+ }
+ 
+-#ifdef HAVE_STRUCT_AVCODECCONTEXT_REQUEST_CHANNELS
+-/* This warning reset suppresses a deprecation warning message
+- * for the AVCodecContext's 'request_channels' field. */
+-GCC_DIAG_OFF(deprecated-declarations)
+-static inline void set_request_channels (AVCodecContext *enc, int channels)
+-{
+-  enc->request_channels = channels;
+-}
+-GCC_DIAG_ON(deprecated-declarations)
+-#endif
+-
+ /* Downmix multi-channel audios to stereo. */
+ static void set_downmixing (struct ffmpeg_data *data)
+ {
+@@ -847,30 +836,11 @@ static void set_downmixing (struct ffmpe
+ 
+   data->enc->channels = 2;
+ 
+-#ifdef HAVE_STRUCT_AVCODECCONTEXT_REQUEST_CHANNELS
+-
+-  /*
+-   * When FFmpeg breaks its API (and it will), this code will be
+-   * disabled and users will complain that MOC no longer downmixes
+-   * to stereo.  This is because the 'request_channels' field in
+-   * AVCodecContext is marked as deprecated (and so will probably
+-   * be removed at some time) but FFmpeg requires it to be set to
+-   * trigger downmixing (go figure!).  Currently, there is no
+-   * guidance on how it will work in the future, but looking at
+-   * where 's->downmixed' is set near the end of 'ac3_decode_init()'
+-   * in the FFmpeg's source code file 'libavcodec/ac3dec.c' might
+-   * help (in the absence of proper documentation).
+-   */
+-
+-  set_request_channels (data->enc, 2);
+-
+ #ifdef AV_CH_LAYOUT_STEREO_DOWNMIX
+   data->enc->request_channel_layout = AV_CH_LAYOUT_STEREO_DOWNMIX;
+ #else
+   data->enc->request_channel_layout = CH_LAYOUT_STEREO_DOWNMIX;
+ #endif
+-
+-#endif
+ }
+ 
+ static void *ffmpeg_open (const char *file)
+--- moc-2.5.0.orig/decoder_plugins/ffmpeg/ffmpeg.m4
 moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.m4
+@@ -51,14 +51,6 @@ then
+   save_LIBS="$LIBS"
+   

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Monday, September 7, 2015 @ 16:08:07
  Author: foutrelis
Revision: 245464

ncurses 6.0 rebuild.

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-07 14:06:53 UTC (rev 245463)
+++ PKGBUILD2015-09-07 14:08:07 UTC (rev 245464)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to 
use"
 arch=('i686' 'x86_64')

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Thursday, January 1, 2015 @ 03:33:13
  Author: eric
Revision: 228305

Add validpgpkeys array

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-01 02:32:08 UTC (rev 228304)
+++ PKGBUILD2015-01-01 02:33:13 UTC (rev 228305)
@@ -21,6 +21,7 @@
 
source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha1sums=('a02c10075541995771dbdccb7f2d0ecd19d70b81'
   'SKIP')
+validpgpkeys=('59359B80406D9E73E80599BEF3121E4F2885A7AA')
 
 build() {
   cd ${pkgname}-${pkgver}

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Monday, September 15, 2014 @ 17:55:03
  Author: eric
Revision: 221756

upgpkg: moc 1:2.5.0-2

Rebuild against ffmpeg 2.4

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 15:16:24 UTC (rev 221755)
+++ PKGBUILD2014-09-15 15:55:03 UTC (rev 221756)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Tuesday, September 2, 2014 @ 18:11:29
  Author: eric
Revision: 220898

upgpkg: moc 1:2.5.0-1

Upstream update, Clean up PKGBUILD

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 5 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-02 15:36:37 UTC (rev 220897)
+++ PKGBUILD2014-09-02 16:11:29 UTC (rev 220898)
@@ -2,7 +2,7 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=moc
-pkgver=2.5.0beta2
+pkgver=2.5.0
 pkgrel=1
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
@@ -18,28 +18,12 @@
 'wavpack: for using the wavpack plugin'
 'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(http://ftp.daper.net/pub/soft/moc/unstable/moc-${pkgver%b*}-${pkgver#*.*.?}.tar.bz2{,.sig})
-sha1sums=('bf786d719c853c22dec74bc2ee565aae4596fbe7'
+source=(http://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('a02c10075541995771dbdccb7f2d0ecd19d70b81'
   'SKIP')
 
-# source PKGBUILD  mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo svn not found. Install subversion.  
return 1)
-  _svnver=2454
-  _svntrunk=svn://daper.net/moc/trunk
-  _svnmod=${pkgname}-${pkgver}
-  mkdir ${pkgname}-${pkgver}
-  pushd ${pkgname}-${pkgver}
-  svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod}
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
 build() {
-  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --without-rcc \
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -49,6 +33,6 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg.patch)

[Eric Bélanger]

Date: Thursday, February 6, 2014 @ 20:58:04
  Author: eric
Revision: 205534

upgpkg: moc 1:2.5.0beta2-1

Upstream update, Remove unneeded popt depends, Remove old patch

Modified:
  moc/trunk/PKGBUILD
Deleted:
  moc/trunk/moc-ffmpeg.patch

--+
 PKGBUILD |   33 +--
 moc-ffmpeg.patch |  557 -
 2 files changed, 13 insertions(+), 577 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-06 19:32:21 UTC (rev 205533)
+++ PKGBUILD2014-02-06 19:58:04 UTC (rev 205534)
@@ -2,27 +2,25 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=moc
-pkgver=2.5beta1
-pkgrel=5
+pkgver=2.5.0beta2
+pkgrel=1
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file' 'popt')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 
'faad2')
-optdepends=('speex: for using the speex plugin' 
+optdepends=('speex: for using the speex plugin'
'ffmpeg: for using the ffmpeg plugin'
-   'taglib: for using the musepack plugin' 
-   'libmpcdec: for using the musepack plugin' 
-'wavpack: for using the wavpack plugin' 
-'faad2: for using the aac plugin' 
+   'taglib: for using the musepack plugin'
+   'libmpcdec: for using the musepack plugin'
+'wavpack: for using the wavpack plugin'
+'faad2: for using the aac plugin'
'libmodplug: for using the modplug plugin')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig}
 \
-moc-ffmpeg.patch)
-sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-  '29c232c37e1f3737c3b670372732446e9c0786a8'
-  'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
+source=(http://ftp.daper.net/pub/soft/moc/unstable/moc-${pkgver%b*}-${pkgver#*.*.?}.tar.bz2{,.sig})
+sha1sums=('bf786d719c853c22dec74bc2ee565aae4596fbe7'
+  'SKIP')
 
 # source PKGBUILD  mksource
 mksource() {
@@ -40,13 +38,8 @@
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
-prepare() {
-  cd ${pkgname}-2.5.0-beta1
-  patch -p0 -i ${srcdir}/moc-ffmpeg.patch
-}
-
 build() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   ./configure --prefix=/usr --without-rcc \
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -56,6 +49,6 @@
 }
 
 package() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   make DESTDIR=${pkgdir} install
 }

Deleted: moc-ffmpeg.patch
===
--- moc-ffmpeg.patch2014-02-06 19:32:21 UTC (rev 205533)
+++ moc-ffmpeg.patch2014-02-06 19:58:04 UTC (rev 205534)
@@ -1,557 +0,0 @@
-Index: menu.c
-===
 menu.c (revision 2516)
-+++ menu.c (working copy)
-@@ -90,9 +90,14 @@
-   getyx (menu-win, y, x);
-   if (title_width = title_space || mi-align == MENU_ALIGN_LEFT)
-   xwaddnstr (menu-win, mi-title, title_space);
--  else
--  xwaddstr (menu-win, mi-title + title_width - title_space);
-+  else {
-+  char *ptr;
- 
-+  ptr = xstrtail (mi-title, title_space);
-+  xwaddstr (menu-win, ptr);
-+  free (ptr);
-+  }
-+
-   /* Fill the remainder of the title field with spaces. */
-   if (mi == menu-selected) {
-   getyx (menu-win, y, ix);
-Index: utf8.c
-===
 utf8.c (revision 2516)
-+++ utf8.c (working copy)
-@@ -199,47 +199,50 @@
- 
- int xwaddnstr (WINDOW *win, const char *str, const int n)
- {
--  int res;
-+  int res, width, inv_char;
-+  wchar_t *ucs;
-+  char *mstr, *lstr;
-+  size_t size, num_chars;
- 
-   assert (n  0);
-   assert (str != NULL);
- 
--  if (using_utf8) {
-+  mstr = iconv_str (iconv_desc, str);
- 
--  /* This nasty hack is because we need to count n in chars, but
--   * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
--   * longer than 1 byte).  There are also problems with 
[w]addnwstr()
--   * (screen garbled).  I have no better idea. */
-+  size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
-+  ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
-+  xmbstowcs (ucs, mstr, size, inv_char);
-+  width = wcswidth (ucs, WIDTH_MAX);
- 
--  wchar_t *ucs;
--  size_t size;
--  size_t utf_num_chars;
--  int inv_char;
--
--  size = 

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Sunday, August 11, 2013 @ 03:30:42
  Author: eric
Revision: 192414

upgpkg: moc 1:2.5beta1-5

Disable tags cache support to remove db dependency (licensing issue, see 
db-6020 TODO)

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-10 23:42:37 UTC (rev 192413)
+++ PKGBUILD2013-08-11 01:30:42 UTC (rev 192414)
@@ -52,7 +52,7 @@
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
 --with-sndfile --with-modplug --with-ffmpeg --with-speex \
---with-samplerate --with-curl --disable-debug
+--with-samplerate --with-curl  --disable-cache --disable-debug
   make
 }
 

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Monday, August 5, 2013 @ 20:50:27
  Author: eric
Revision: 192085

upgpkg: moc 1:2.5beta1-5

Rebuild against db 6.0.20

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-05 18:40:25 UTC (rev 192084)
+++ PKGBUILD2013-08-05 18:50:27 UTC (rev 192085)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=4
+pkgrel=5
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Friday, July 12, 2013 @ 03:21:12
  Author: eric
Revision: 189964

upgpkg: moc 1:2.5beta1-4

Rebuild against ffmpeg 2.0 and x264 20130702, Add prepare function

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 23:41:17 UTC (rev 189963)
+++ PKGBUILD2013-07-12 01:21:12 UTC (rev 189964)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
@@ -41,9 +41,13 @@
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
+prepare() {
+  cd ${pkgname}-2.5.0-beta1
+  patch -p0 -i ${srcdir}/moc-ffmpeg.patch
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-2.5.0-beta1
-  patch -p0 -i ${srcdir}/moc-ffmpeg.patch
+  cd ${pkgname}-2.5.0-beta1
   ./configure --prefix=/usr --without-rcc \
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -53,6 +57,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-2.5.0-beta1
+  cd ${pkgname}-2.5.0-beta1
   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg.patch)

[Eric Bélanger]

Date: Wednesday, February 20, 2013 @ 06:18:26
  Author: eric
Revision: 178317

upgpkg: moc 1:2.5beta1-3

Add ffmpeg patch (close FS#33942 )

Added:
  moc/trunk/moc-ffmpeg.patch
Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |9 
 moc-ffmpeg.patch |  557 +
 2 files changed, 563 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 02:27:38 UTC (rev 178316)
+++ PKGBUILD2013-02-20 05:18:26 UTC (rev 178317)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
@@ -19,9 +19,11 @@
 'faad2: for using the aac plugin' 
'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig})
+source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig}
 \
+moc-ffmpeg.patch)
 sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-  '29c232c37e1f3737c3b670372732446e9c0786a8')
+  '29c232c37e1f3737c3b670372732446e9c0786a8'
+  'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
 
 # source PKGBUILD  mksource
 mksource() {
@@ -41,6 +43,7 @@
 
 build() {
   cd ${srcdir}/${pkgname}-2.5.0-beta1
+  patch -p0 -i ${srcdir}/moc-ffmpeg.patch
   ./configure --prefix=/usr --without-rcc \
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \

Added: moc-ffmpeg.patch
===
--- moc-ffmpeg.patch(rev 0)
+++ moc-ffmpeg.patch2013-02-20 05:18:26 UTC (rev 178317)
@@ -0,0 +1,557 @@
+Index: menu.c
+===
+--- menu.c (revision 2516)
 menu.c (working copy)
+@@ -90,9 +90,14 @@
+   getyx (menu-win, y, x);
+   if (title_width = title_space || mi-align == MENU_ALIGN_LEFT)
+   xwaddnstr (menu-win, mi-title, title_space);
+-  else
+-  xwaddstr (menu-win, mi-title + title_width - title_space);
++  else {
++  char *ptr;
+ 
++  ptr = xstrtail (mi-title, title_space);
++  xwaddstr (menu-win, ptr);
++  free (ptr);
++  }
++
+   /* Fill the remainder of the title field with spaces. */
+   if (mi == menu-selected) {
+   getyx (menu-win, y, ix);
+Index: utf8.c
+===
+--- utf8.c (revision 2516)
 utf8.c (working copy)
+@@ -199,47 +199,50 @@
+ 
+ int xwaddnstr (WINDOW *win, const char *str, const int n)
+ {
+-  int res;
++  int res, width, inv_char;
++  wchar_t *ucs;
++  char *mstr, *lstr;
++  size_t size, num_chars;
+ 
+   assert (n  0);
+   assert (str != NULL);
+ 
+-  if (using_utf8) {
++  mstr = iconv_str (iconv_desc, str);
+ 
+-  /* This nasty hack is because we need to count n in chars, but
+-   * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
+-   * longer than 1 byte).  There are also problems with 
[w]addnwstr()
+-   * (screen garbled).  I have no better idea. */
++  size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
++  ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
++  xmbstowcs (ucs, mstr, size, inv_char);
++  width = wcswidth (ucs, WIDTH_MAX);
+ 
+-  wchar_t *ucs;
+-  size_t size;
+-  size_t utf_num_chars;
+-  int inv_char;
+-
+-  size = xmbstowcs (NULL, str, -1, NULL) + 1;
+-  ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
+-  xmbstowcs (ucs, str, size, inv_char);
+-  if ((size_t)n  size - 1)
+-  ucs[n] = L'\0';
+-  utf_num_chars = wcstombs (NULL, ucs, 0);
+-  if (inv_char) {
+-  char *utf8 = (char *)xmalloc (utf_num_chars + 1);
+-
+-  wcstombs (utf8, ucs, utf_num_chars + 1);
+-  res = waddstr (win, utf8);
+-  free (utf8);
++  if (width == -1) {
++  size_t clidx;
++  for (clidx = 0; clidx  size - 1; clidx++) {
++  if (wcwidth (ucs[clidx]) == -1)
++  ucs[clidx] = L'?';
+   }
+-  else
+-  res = waddnstr (win, str, utf_num_chars);
+-  free (ucs);
++  width = wcswidth (ucs, WIDTH_MAX);
++  inv_char = 1;
+   }
+-  else {
+-  char *lstr = iconv_str (iconv_desc, str);
+ 
+-  res = waddnstr (win, lstr, n);
+-  free (lstr);
++  if (width  n) {
++  while 

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Thursday, February 7, 2013 @ 18:25:36
  Author: eric
Revision: 177579

upgpkg: moc 1:2.5beta1-2

Rebuild against ffmpeg and x264

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-07 17:19:17 UTC (rev 177578)
+++ PKGBUILD2013-02-07 17:25:36 UTC (rev 177579)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Friday, October 19, 2012 @ 17:57:21
  Author: eric
Revision: 169338

upgpkg: moc 1:2.5beta1-1

Upstream update, Add popt depends

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-19 21:33:57 UTC (rev 169337)
+++ PKGBUILD2012-10-19 21:57:21 UTC (rev 169338)
@@ -2,13 +2,14 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=moc
-pkgver=20120717
-pkgrel=2
+pkgver=2.5beta1
+pkgrel=1
+epoch=1
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file' 'popt')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 
'faad2')
 optdepends=('speex: for using the speex plugin' 
'ffmpeg: for using the ffmpeg plugin'
@@ -18,9 +19,9 @@
 'faad2: for using the aac plugin' 
'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('5a955508a807c4c780c6a2a9105b05142fb83e02'
-  'ae6f01d9c4933efd4f86ce79ff35d1a313e215a7')
+source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig})
+sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
+  '29c232c37e1f3737c3b670372732446e9c0786a8')
 
 # source PKGBUILD  mksource
 mksource() {
@@ -39,8 +40,7 @@
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  autoreconf -i
+  cd ${srcdir}/${pkgname}-2.5.0-beta1
   ./configure --prefix=/usr --without-rcc \
 --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -50,6 +50,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-2.5.0-beta1
   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Monday, October 1, 2012 @ 15:35:13
  Author: eric
Revision: 167383

upgpkg: moc 20120717-2

Rebuild against ffmpeg 1.0 (close FS#31747)

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-01 19:26:37 UTC (rev 167382)
+++ PKGBUILD2012-10-01 19:35:13 UTC (rev 167383)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=20120717
-pkgrel=1
+pkgrel=2
 pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Monday, August 6, 2012 @ 16:34:07
  Author: eric
Revision: 164821

upgpkg: moc 20120717-1

Upstream update (close  FS#30608), Add faad2 optdepends, Improve description

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-06 19:57:10 UTC (rev 164820)
+++ PKGBUILD2012-08-06 20:34:07 UTC (rev 164821)
@@ -2,29 +2,30 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=moc
-pkgver=20120224
-pkgrel=2
-pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
+pkgver=20120717
+pkgrel=1
+pkgdesc=An ncurses console audio player designed to be powerful and easy to 
use
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
 license=('GPL')
 depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
-makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
+makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 
'faad2')
 optdepends=('speex: for using the speex plugin' 
'ffmpeg: for using the ffmpeg plugin'
'taglib: for using the musepack plugin' 
'libmpcdec: for using the musepack plugin' 
 'wavpack: for using the wavpack plugin' 
+'faad2: for using the aac plugin' 
'libmodplug: for using the modplug plugin')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46'
-  'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3')
+sha1sums=('5a955508a807c4c780c6a2a9105b05142fb83e02'
+  'ae6f01d9c4933efd4f86ce79ff35d1a313e215a7')
 
 # source PKGBUILD  mksource
 mksource() {
   [[ -x /usr/bin/svn ]] || (echo svn not found. Install subversion.  
return 1)
-  _svnver=2412
+  _svnver=2454
   _svntrunk=svn://daper.net/moc/trunk
   _svnmod=${pkgname}-${pkgver}
   mkdir ${pkgname}-${pkgver}
@@ -39,11 +40,9 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
   autoreconf -i
-  ./configure --prefix=/usr --without-rcc --without-aac \
---with-oss  --with-alsa  --with-jack --with-mp3 \
+  ./configure --prefix=/usr --without-rcc \
+--with-oss --with-alsa --with-jack --with-aac --with-mp3 \
 --with-musepack --with-vorbis --with-flac --with-wavpack \
 --with-sndfile --with-modplug --with-ffmpeg --with-speex \
 --with-samplerate --with-curl --disable-debug

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Sunday, June 3, 2012 @ 18:26:34
  Author: eric
Revision: 160695

upgpkg: moc 20120224-2

Rebuild against ffmpeg 0.11

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-03 22:00:36 UTC (rev 160694)
+++ PKGBUILD2012-06-03 22:26:34 UTC (rev 160695)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=20120224
-pkgrel=1
+pkgrel=2
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Monday, January 2, 2012 @ 16:43:21
  Author: eric
Revision: 145846

upgpkg: moc 20110528-5

Rebuild against db 5.3.15

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-02 20:41:44 UTC (rev 145845)
+++ PKGBUILD2012-01-02 21:43:21 UTC (rev 145846)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=20110528
-pkgrel=4
+pkgrel=5
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;

[arch-commits] Commit in moc/trunk (PKGBUILD moc-ffmpeg.patch)

[Eric Bélanger]

Date: Monday, October 31, 2011 @ 20:21:52
  Author: eric
Revision: 141628

upgpkg: moc 20110528-4

Rebuild against ffmpeg 20111030, Clean up depends

Added:
  moc/trunk/moc-ffmpeg.patch
Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 moc-ffmpeg.patch |   26 ++
 2 files changed, 32 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-31 22:51:23 UTC (rev 141627)
+++ PKGBUILD2011-11-01 00:21:52 UTC (rev 141628)
@@ -3,12 +3,12 @@
 
 pkgname=moc
 pkgver=20110528
-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/;
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
 optdepends=('speex: for using the speex plugin' 
'ffmpeg: for using the ffmpeg plugin'
@@ -18,15 +18,15 @@
'libmodplug: for using the modplug plugin')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
-gcc-undefined-symbols.diff)
-md5sums=('003fd01af2165264eb666040e4f586cd'
- 'efacb8559e9145e15b0c25f8fa2a9d79')
+gcc-undefined-symbols.diff moc-ffmpeg.patch)
 sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-  'a811a4ac7e049914aab528d3f06a6be6634c2720')
+  'a811a4ac7e049914aab528d3f06a6be6634c2720'
+  'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d')
 
 build() {
   cd ${srcdir}/${pkgname}
   patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p0 -i ../moc-ffmpeg.patch
 
 # Disabling aac to use the external ffmpeg to play them (FS#13164)
   ./autogen.sh

Added: moc-ffmpeg.patch
===
--- moc-ffmpeg.patch(rev 0)
+++ moc-ffmpeg.patch2011-11-01 00:21:52 UTC (rev 141628)
@@ -0,0 +1,26 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===
+--- decoder_plugins/ffmpeg/ffmpeg.c(revision 2307)
 decoder_plugins/ffmpeg/ffmpeg.c(working copy)
+@@ -28,12 +28,6 @@
+ #include ffmpeg/avformat.h
+ #endif
+ 
+-/* libavformat's API will be changing at version 53, but at present there
+- * appears to be no guidance on what will replace the deprecated fields. */
+-#ifndef FF_API_OLD_METADATA
+-#define FF_API_OLD_METADATA(LIBAVFORMAT_VERSION_MAJOR  53)
+-#endif
+-
+ /* FFmpeg also likes common names, without that, our common.h and log.h
+  * would not be included. */
+ #undef COMMON_H
+@@ -137,7 +131,7 @@
+   av_read_play (data-ic);
+   for (i = 0; i  data-ic-nb_streams; i++) {
+   data-enc = data-ic-streams[i]-codec;
+-  if (data-enc-codec_type == CODEC_TYPE_AUDIO) {
++  if (data-enc-codec_type == AVMEDIA_TYPE_AUDIO) {
+   audio_index = i;
+   break;
+   }

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Tuesday, June 14, 2011 @ 23:16:57
  Author: eric
Revision: 127443

upgpkg: moc 20110528-3
Rebuilt against db 5.2.28

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-15 00:33:30 UTC (rev 127442)
+++ PKGBUILD2011-06-15 03:16:57 UTC (rev 127443)
@@ -3,7 +3,7 @@
 
 pkgname=moc
 pkgver=20110528
-pkgrel=2
+pkgrel=3
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Eric Bélanger]

Date: Wednesday, June 8, 2011 @ 13:30:45
  Author: eric
Revision: 126916

upgpkg: moc 20110528-2
Added file depends, Removed old sed lines, Disabled debug to fix crashes (close 
FS#22971)

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-08 15:40:25 UTC (rev 126915)
+++ PKGBUILD2011-06-08 17:30:45 UTC (rev 126916)
@@ -3,12 +3,12 @@
 
 pkgname=moc
 pkgver=20110528
-pkgrel=1
+pkgrel=2
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
 optdepends=('speex: for using the speex plugin' 
'ffmpeg: for using the ffmpeg plugin'
@@ -19,23 +19,22 @@
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
 gcc-undefined-symbols.diff)
-md5sums=('e9394640fecb725ad8146575a3091134'
+md5sums=('003fd01af2165264eb666040e4f586cd'
  'efacb8559e9145e15b0c25f8fa2a9d79')
-sha1sums=('d09c27602a60e3e9fde476e13d7c1a8b21489505'
+sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
   'a811a4ac7e049914aab528d3f06a6be6634c2720')
 
 build() {
   cd ${srcdir}/${pkgname}
   patch -p0 -i ../gcc-undefined-symbols.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 \
 --with-sndfile --with-modplug --with-ffmpeg --with-speex \
---with-samplerate --with-curl
+--with-samplerate --with-curl --disable-debug
   make
 }
 

[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
===
--- PKGBUILD2011-05-30 17:16:24 UTC (rev 125869)
+++ PKGBUILD2011-05-30 20:58:06 UTC (rev 125870)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@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.c2007-07-08 08:54:45.0 +0200
-+++ b/io_curl.c2011-05-18 09:09:40.0 +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);

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Rémy Oudompheng]

Date: Tuesday, January 25, 2011 @ 15:51:09
  Author: remy
Revision: 107458

upgpkg: moc 2.4.4-3
Rebuild with a fix for latest ffmpeg

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-25 20:25:31 UTC (rev 107457)
+++ PKGBUILD2011-01-25 20:51:09 UTC (rev 107458)
@@ -5,7 +5,7 @@
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;
@@ -26,18 +26,19 @@
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' 
decoder_plugins/ffmpeg/ffmpeg.c || return 1
+   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 || return 1
-   make || return 1
+   --with-samplerate --with-curl
+   make
 }
 
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
 
-   make DESTDIR=${pkgdir} install || return 1
+   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Daniel Griffiths]

Date: Thursday, May 20, 2010 @ 17:14:21
  Author: dgriffiths
Revision: 80718

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-20 20:59:01 UTC (rev 80717)
+++ PKGBUILD2010-05-20 21:14:21 UTC (rev 80718)
@@ -5,7 +5,7 @@
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc=An ncurses console audio player with support for the mp3, ogg, and 
wave formats
 arch=('i686' 'x86_64')
 url=http://moc.daper.net/;

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Daniel Griffiths]

Date: Monday, May 10, 2010 @ 15:53:54
  Author: dgriffiths
Revision: 80059

FS#19142

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-10 19:28:30 UTC (rev 80058)
+++ PKGBUILD2010-05-10 19:53:54 UTC (rev 80059)
@@ -4,13 +4,13 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=moc
-pkgver=2.5.0_alpha4
-pkgrel=2
+pkgver=2.4.4
+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/;
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack-audio-connection-kit' 'curl' 
'libsamplerate' 'libtool')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
 optdepends=('speex: for using the speex plugin' 
'ffmpeg: for using the ffmpeg plugin'
@@ -18,13 +18,13 @@
'libmpcdec: for using the musepack plugin' 
 'wavpack: for using the wavpack plugin' 
'libmodplug: for using the modplug plugin')
-options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/${pkgname}-${pkgver/_/-}.tar.bz2)
-md5sums=('2dd0cb6481d77fda09c58ec3154a21c0')
-sha1sums=('ca55b3bed0f3f3f352ca43078208ab63e20f40fc')
+options=('!libtool' 'force')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('647c770a5542a4ae5437386807a89796')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver/_/-}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' 
decoder_plugins/ffmpeg/ffmpeg.c || return 1
# Disabling aac to use the external ffmpeg to play them (FS#13164)
@@ -37,7 +37,7 @@
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver/_/-}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
make DESTDIR=${pkgdir} install || return 1
 }

[arch-commits] Commit in moc/trunk (PKGBUILD)

[Daniel Griffiths]

Date: Sunday, April 11, 2010 @ 22:21:13
  Author: dgriffiths
Revision: 77340

Adopted, move to splitpkg format

Modified:
  moc/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 24 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-12 02:18:45 UTC (rev 77339)
+++ PKGBUILD2010-04-12 02:21:13 UTC (rev 77340)
@@ -1,6 +1,7 @@
 # $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
 # Contributor: dorphell dorph...@gmx.net
+# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=moc
 pkgver=2.5.0_alpha4
@@ -11,22 +12,32 @@
 license=('GPL')
 depends=('libmad' 'libid3tag' 'jack-audio-connection-kit' 'curl' 
'libsamplerate' 'libtool')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
-optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg 
plugin' \
-'taglib: for using the musepack plugin' 'libmpcdec: for using the 
musepack plugin' \
-'wavpack: for using the wavpack plugin' 'libmodplug: for using the 
modplug plugin')
+optdepends=('speex: for using the speex plugin' 
+   'ffmpeg: for using the ffmpeg plugin'
+   'taglib: for using the musepack plugin' 
+   'libmpcdec: for using the musepack plugin' 
+'wavpack: for using the wavpack plugin' 
+   'libmodplug: for using the modplug plugin')
 options=('!libtool')
 
source=(ftp://ftp.daper.net/pub/soft/moc/unstable/${pkgname}-${pkgver/_/-}.tar.bz2)
 md5sums=('2dd0cb6481d77fda09c58ec3154a21c0')
 sha1sums=('ca55b3bed0f3f3f352ca43078208ab63e20f40fc')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' 
decoder_plugins/ffmpeg/ffmpeg.c || return 1
-# 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 || 
return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+   cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+   sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' 
decoder_plugins/ffmpeg/ffmpeg.c || return 1
+   # 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 || return 1
+   make || return 1
 }
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver/_/-}
+
+   make DESTDIR=${pkgdir} install || return 1
+}