summaryrefslogtreecommitdiff
path: root/extra/moc
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-15 11:36:24 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-15 11:36:24 -0300
commit7caeeae33fd491dbea5044168bbc50197963118c (patch)
tree2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/moc
parent2f39e56def6dadf0746b6e96e756518f1af9396b (diff)
parent3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/ginac/PKGBUILD community/gnash/PKGBUILD community/haskell-tar/PKGBUILD community/libdlna/PKGBUILD community/mplayer2/PKGBUILD community/musescore/PKGBUILD community/open-vm-tools-modules/PKGBUILD community/paraview/PKGBUILD community/picard/PKGBUILD core/idnkit/PKGBUILD core/ifenslave/PKGBUILD extra/audacious/PKGBUILD extra/avidemux/PKGBUILD extra/ffmpeg/PKGBUILD extra/graphite/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/k3b/PKGBUILD extra/kdemultimedia/PKGBUILD extra/koffice/PKGBUILD extra/kradio/PKGBUILD extra/libreoffice/PKGBUILD extra/mediastreamer/PKGBUILD extra/poppler/PKGBUILD extra/vlc/PKGBUILD libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/moc')
-rw-r--r--extra/moc/PKGBUILD14
-rw-r--r--extra/moc/moc-ffmpeg.patch26
2 files changed, 33 insertions, 7 deletions
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index dbb54a577..9e460b754 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $
+# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
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' 'mips64el')
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 @@ optdepends=('speex: for using the speex plugin'
'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
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..7554ea14e
--- /dev/null
+++ b/extra/moc/moc-ffmpeg.patch
@@ -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;
+ }