Tue Nov 15 14:33:58 UTC 2011

3 files changed, 0 insertions, 82 deletions

diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
deleted file mode 100644
index b5cd37fe6..000000000
--- a/staging/moc/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 141629 2011-11-01 00:22:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20110528
-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' 'libltdl' 'file')
-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')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
-        gcc-undefined-symbols.diff moc-ffmpeg.patch)
-sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
-          '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
-  ./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 --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff
deleted file mode 100644
index 09e9b8bda..000000000
--- a/staging/moc/gcc-undefined-symbols.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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());
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e..000000000
--- a/staging/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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;
- 		}