summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-18 12:40:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-18 12:40:32 +0000
commit4df5a631b57b4f1822605b9d9a00ac5d909a1207 (patch)
tree803a8f5d0a69ca645f8fc1f277332cf14b142427 /media-sound/moc
parentppc stable #318457 (diff)
downloadhistorical-4df5a631b57b4f1822605b9d9a00ac5d909a1207.tar.gz
historical-4df5a631b57b4f1822605b9d9a00ac5d909a1207.tar.bz2
historical-4df5a631b57b4f1822605b9d9a00ac5d909a1207.zip
old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound/moc')
-rw-r--r--media-sound/moc/Manifest7
-rw-r--r--media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch25
-rw-r--r--media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch55
-rw-r--r--media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch13
-rw-r--r--media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch32
-rw-r--r--media-sound/moc/moc-2.5.0_alpha3-r3.ebuild75
6 files changed, 0 insertions, 207 deletions
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index f0696c801cfa..b208832d8017 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,11 +1,4 @@
-AUX moc-2.5.0_alpha3-faad2.patch 933 RMD160 54fdaee534bde0f2004334ce1637d6f57a95028a SHA1 d387c13600458eb4bebe2d2715e5eaba36c748af SHA256 2a221a9328b3a1dd753af07d0ba64ebffba145b2309d7c9ac596b04fc8c4a283
-AUX moc-2.5.0_alpha3-ffmpegheaders.patch 1702 RMD160 3f8f8c1b92d7c86ee27efb5793bb8257e47701fb SHA1 84bc2e2ab2de630a6bae6d33f5016ee66a48f509 SHA256 a887f0eb68cb8741069561117c36ad8e228b9fabc1c41947a7f59e16c7d1e546
-AUX moc-2.5.0_alpha3-fix_default_configuration_layout.patch 354 RMD160 bc11e5d17a06669f949abb05e5ae157d30883652 SHA1 496017390e0078bde6a01afbd466cead5e904233 SHA256 e11b7fe9e29bbb500c4360bfc4e8e991e494a5d9db432783b1785be6c27a606d
-AUX moc-2.5.0_alpha3-libtool22.patch 964 RMD160 964b69215300a010b536a73bf1644f15524b098f SHA1 34d03402e276e941bd86eacf61ca5ef4a80a1f06 SHA256 61e0513ffd5132b658ad330444ccb32163efb8f892049d068ee6dbfbc3cab259
-DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
DIST moc-2.5.0-alpha4.tar.bz2 520919 RMD160 d2dec23ad586b35a7350bacfb3eb9b3033abbfc4 SHA1 ca55b3bed0f3f3f352ca43078208ab63e20f40fc SHA256 a1ece00c17ce0ebbd387c0412b08f038dd07cf226726c26367cbc982ce3363b4
-DIST moc-m4-1.tar.bz2 1635 RMD160 25f0561e4fdd7f5a622d419dae434bbcba70a02f SHA1 0e0c47b379764f986976414c283a05e6da825822 SHA256 337f47d91fbf532443f278b81db3d69d13260bebeaa1358bedff34e10637dee7
-EBUILD moc-2.5.0_alpha3-r3.ebuild 2214 RMD160 28c109125760b1e06d572507eb8f14cc8678ee71 SHA1 5167c6edb712047065408e95d81e4cc27e30f72f SHA256 0d8a8f198b9e8b93338337791479766cde6980444f8e204451693b80217ac223
EBUILD moc-2.5.0_alpha4.ebuild 2017 RMD160 6b5085f2dd6684bed9c4de63746ff22563b5716e SHA1 eab8bd0b5deb0a5d05bed07e4d5601efd44a43db SHA256 d853ee43b239ddb11bcb149c65e99a4e81256062a548631b0f4c6f83989058e3
MISC ChangeLog 11517 RMD160 1cea6440d17a5b3237c9c7cfb952c7e3d297bf06 SHA1 da0dafac6bebe25c03dd67814ec6a90ec4a27ac1 SHA256 396a7f84c0380097ca383b5de90f4e64df8128f873febf9b7b563717c0cf3429
MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch b/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
deleted file mode 100644
index e114f0dc1376..000000000000
--- a/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.in.orig 2008-03-04 16:45:23.000000000 +0100
-+++ configure.in 2008-03-04 16:34:10.000000000 +0100
-@@ -276,12 +276,17 @@
- AC_ARG_WITH(aac, AS_HELP_STRING(--without-aac,Compile without AAC support (libfaad2)))
- if test "x$with_aac" != "xno"
- then
-- AC_CHECK_LIB(faad, faacDecInit, [
-- AC_CHECK_HEADER([faad.h], ,
-- AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
-- ])
-+ faad2_OK="no"
-+ AC_CHECK_LIB(faad, faacDecInit, [faad2_OK="yes"], [
-+ AC_CHECK_LIB(faad, NeAACDecInit, [faad2_OK="yes"], [])
-+ ])
-+
-+ if test "x$faad2_OK" = "xyes"; then
-+ AC_CHECK_HEADER([faad.h], ,
-+ AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
-+ fi
-
-- if test "$ac_cv_lib_faad_faacDecInit" = "yes" -a "$HAVE_ID3TAG" = "yes"
-+ if test "x$faad2_OK" = "xyes" -a "$HAVE_ID3TAG" = "yes"
- then
- FAAD2_LIBS="-lfaad"
- AC_SUBST([FAAD2_CFLAGS])
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
deleted file mode 100644
index be1180b24966..000000000000
--- a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: moc-2.5.0-alpha3/configure.in
-===================================================================
---- moc-2.5.0-alpha3.orig/configure.in
-+++ moc-2.5.0-alpha3/configure.in
-@@ -485,6 +485,7 @@ then
- DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"],
- [true])
- fi
-+ AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
- fi
-
- dnl speex
-Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
-+++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
-@@ -22,7 +22,11 @@
- #ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
-+#if HAVE_LIBAVFORMAT_AVFORMAT_H
-+#include <libavformat/avformat.h>
-+#else
- #include <ffmpeg/avformat.h>
-+#endif
-
- /* FFmpeg also likes common names, without that, our common.h and log.h would
- * not be included. */
-Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
-+++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
-@@ -228,12 +228,12 @@
- {
- struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- int ret;
-- int data_size;
- char avbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(int16_t)];
- AVPacket pkt;
- uint8_t *pkt_data;
- int pkt_size = 0;
- int filled = 0;
-+ int data_size = sizeof(avbuf);
-
- decoder_error_clear (&data->error);
-
-@@ -276,7 +276,7 @@
- while (pkt_size) {
- int len;
-
-- len = avcodec_decode_audio (data->enc, (int16_t *)avbuf,
-+ len = avcodec_decode_audio2 (data->enc, (int16_t *)avbuf,
- &data_size, pkt_data, pkt_size);
- debug ("Decoded %dB", data_size);
-
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch b/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch
deleted file mode 100644
index 3818e127747c..000000000000
--- a/media-sound/moc/files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: interface_elements.c
-===================================================================
---- interface_elements.c (revision 2091)
-+++ interface_elements.c (revision 2092)
-@@ -736,7 +736,7 @@
- const int max)
- {
- long v;
-- const char *e;
-+ const char *e = fmt;
-
- if (!strncasecmp(fmt, "FILL", sizeof("FILL") - 1)) {
- *val = LAYOUT_SIZE_FILL;
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch b/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch
deleted file mode 100644
index 699a95df1952..000000000000
--- a/media-sound/moc/files/moc-2.5.0_alpha3-libtool22.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur moc-2.5.0-alpha3.orig/configure.in moc-2.5.0-alpha3/configure.in
---- moc-2.5.0-alpha3.orig/configure.in 2008-02-26 00:37:30.000000000 +0200
-+++ moc-2.5.0-alpha3/configure.in 2008-05-08 21:17:21.000000000 +0300
-@@ -8,6 +8,7 @@
-
- AC_CANONICAL_HOST
- AC_PROG_CC
-+AC_PROG_CXX
- AC_PROG_INSTALL
-
- AC_PROG_AWK
-diff -ur moc-2.5.0-alpha3.orig/Makefile.am moc-2.5.0-alpha3/Makefile.am
---- moc-2.5.0-alpha3.orig/Makefile.am 2007-12-15 09:38:57.000000000 +0200
-+++ moc-2.5.0-alpha3/Makefile.am 2008-05-08 21:20:59.000000000 +0300
-@@ -40,8 +40,6 @@
- themes.h \
- keys.c \
- keys.h \
-- ltdl.c \
-- ltdl.h \
- io.c \
- io.h \
- compat.c \
-@@ -70,7 +68,7 @@
- jack.c \
- jack.h
- man_MANS = mocp.1
--mocp_LDADD = @EXTRA_OBJS@
-+mocp_LDADD = @EXTRA_OBJS@ -lltdl
- mocp_DEPENDENCIES = @EXTRA_OBJS@
- mocp_LDFLAGS = @EXTRA_LIBS@ $(RCC_LIBS)
- EXTRA_DIST = config.example mocp.1 THANKS keymap.example Doxyfile \
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
deleted file mode 100644
index a4a8f50a984a..000000000000
--- a/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild,v 1.9 2010/03/06 20:01:32 armin76 Exp $
-
-EAPI=2
-inherit autotools eutils
-
-MY_P=${P/_/-}
-MOC_M4_VER=1
-
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="http://moc.daper.net"
-SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2
- mirror://gentoo/${PN}-m4-${MOC_M4_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="alsa aac jack mad vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
- aac? ( media-libs/faad2 )
- jack? ( media-sound/jack-audio-connection-kit )
- mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
- vorbis? ( >=media-libs/libvorbis-1 )
- flac? ( media-libs/flac )
- wavpack? ( >=media-sound/wavpack-4.31 )
- sndfile? ( >=media-libs/libsndfile-1 )
- modplug? ( >=media-libs/libmodplug-0.7 )
- timidity? ( media-libs/libtimidity media-sound/timidity++ )
- sid? ( >=media-libs/libsidplay-2 )
- ffmpeg? ( media-video/ffmpeg )
- speex? ( >=media-libs/speex-1 )
- libsamplerate? ( >=media-libs/libsamplerate-0.1 )
- curl? ( >=net-misc/curl-7.12.2 )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-faad2.patch \
- "${FILESDIR}"/${P}-ffmpegheaders.patch \
- "${FILESDIR}"/${P}-libtool22.patch \
- "${FILESDIR}"/${P}-fix_default_configuration_layout.patch
- cp -f "${WORKDIR}"/m4/* m4/
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- econf \
- --without-rcc \
- $(use_with aac) \
- $(use_with jack) \
- $(use_with mad mp3) \
- --without-musepack \
- $(use_with vorbis) \
- $(use_with flac) \
- $(use_with wavpack) \
- $(use_with sndfile) \
- $(use_with modplug) \
- $(use_with timidity) \
- $(use_with sid sidplay2) \
- $(use_with ffmpeg) \
- $(use_with speex) \
- $(use_with libsamplerate samplerate) \
- $(use_with curl) \
- $(use_enable debug)
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
- rm -rf "${D}"/usr/share/doc/${PN}
-}