[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
===================================================================
--- PKGBUILD	2011-10-31 22:51:23 UTC (rev 141627)
+++ PKGBUILD	2011-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.patch	2011-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;
+ 		}