[arch-commits] Commit in moc/repos (5 files)
Eric BĂ©langer
eric at archlinux.org
Sun Jan 11 06:03:47 UTC 2009
Date: Sunday, January 11, 2009 @ 01:03:46
Author: eric
Revision: 23435
Merged revisions 23434 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/moc/trunk
........
r23434 | eric | 2009-01-11 01:03:24 -0500 (Sun, 11 Jan 2009) | 2 lines
upgpkg: moc 2.4.4-1
Upstream update, Added libtool depends, Replaced install scriptlet by optdepends, Added ChangeLog, removed old patch
........
Added:
moc/repos/extra-x86_64/ChangeLog
(from rev 23434, moc/trunk/ChangeLog)
Modified:
moc/repos/extra-x86_64/ (properties)
moc/repos/extra-x86_64/PKGBUILD
Deleted:
moc/repos/extra-x86_64/layout-1-is-malformed-fix.patch
moc/repos/extra-x86_64/moc.install
---------------------------------+
ChangeLog | 7 +++++++
PKGBUILD | 31 ++++++++++++++-----------------
layout-1-is-malformed-fix.patch | 13 -------------
moc.install | 8 --------
4 files changed, 21 insertions(+), 38 deletions(-)
Property changes on: moc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /moc/trunk:1-9967
+ /moc/trunk:1-23434
Copied: moc/repos/extra-x86_64/ChangeLog (from rev 23434, moc/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2009-01-11 06:03:46 UTC (rev 23435)
@@ -0,0 +1,7 @@
+2009-01-11 Eric Belanger <eric at archlinux.org>
+
+ * moc 2.4.4-1
+ * Upstream update
+ * Added libtool depends
+ * Replaced install scriptlet by optdepends
+ * Added ChangeLog
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-01-11 06:03:24 UTC (rev 23434)
+++ extra-x86_64/PKGBUILD 2009-01-11 06:03:46 UTC (rev 23435)
@@ -1,29 +1,26 @@
# $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor: dorphell <dorphell at gmx.net>
pkgname=moc
-pkgver=2.4.3
-pkgrel=4
+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/"
-arch=(i686 x86_64)
license=('GPL')
-depends=(libmad jack-audio-connection-kit 'curl>=7.16.2' libsamplerate)
-# TODO throw these in an install file.... simple output
-makedepends=(speex ffmpeg taglib libmpcdec)
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 layout-1-is-malformed-fix.patch)
-md5sums=('8808082848e90eeec5415baaec7e98ad' '6695b6052df7dbcc70fec2e61254fade')
-install=moc.install
-options=(!libtool)
+depends=('libmad' 'jack-audio-connection-kit' 'curl>=7.16.2' 'libsamplerate' 'libtool')
+makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec')
+optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' 'taglib and libmpcdec: for using the musepack plugin')
+options=('!libtool')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('647c770a5542a4ae5437386807a89796')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -p0 < ../layout-1-is-malformed-fix.patch || return 1
+ cd ${srcdir}/${pkgname}-${pkgver}
sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c || return 1
- ./configure --prefix=/usr --without-rcc
- mkdir -p ${startdir}/pkg/usr/share/moc/
- install -m644 config.example ${startdir}/pkg/usr/share/moc/
+ ./configure --prefix=/usr --without-rcc || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${pkgdir} install || return 1
}
Deleted: extra-x86_64/layout-1-is-malformed-fix.patch
===================================================================
--- extra-x86_64/layout-1-is-malformed-fix.patch 2009-01-11 06:03:24 UTC (rev 23434)
+++ extra-x86_64/layout-1-is-malformed-fix.patch 2009-01-11 06:03:46 UTC (rev 23435)
@@ -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;
Deleted: extra-x86_64/moc.install
===================================================================
--- extra-x86_64/moc.install 2009-01-11 06:03:24 UTC (rev 23434)
+++ extra-x86_64/moc.install 2009-01-11 06:03:46 UTC (rev 23435)
@@ -1,8 +0,0 @@
-post_install() {
- echo ":: moc plugins may require the following additional packages:"
- echo ":: ffmpeg, speex, taglib, libmpcdec"
-}
-
-post_upgrade() {
- post_install
-}
More information about the arch-commits
mailing list