diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/moc/README | 2 | ||||
| -rw-r--r-- | audio/moc/configure.in.diff | 10 | ||||
| -rw-r--r-- | audio/moc/ffmpeg.c.diff | 14 | ||||
| -rw-r--r-- | audio/moc/moc.SlackBuild | 33 | ||||
| -rw-r--r-- | audio/moc/moc.info | 12 | ||||
| -rw-r--r-- | audio/moc/slack-desc | 2 |
6 files changed, 22 insertions, 51 deletions
diff --git a/audio/moc/README b/audio/moc/README index 2763be14159f8..4fb619b26cfc4 100644 --- a/audio/moc/README +++ b/audio/moc/README @@ -1,4 +1,2 @@ -MOC (music on console) - MOC is a console audio player for LINUX/UNIX designed to be powerful and easy to use. diff --git a/audio/moc/configure.in.diff b/audio/moc/configure.in.diff deleted file mode 100644 index 3d2a7d103ea8a..0000000000000 --- a/audio/moc/configure.in.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in~ 2008-06-25 18:41:07.000000000 +0200 -+++ configure.in 2008-06-25 18:41:15.000000000 +0200 -@@ -383,6 +383,7 @@ - DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"], - [true]) - fi -+ AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) - fi - - dnl speex diff --git a/audio/moc/ffmpeg.c.diff b/audio/moc/ffmpeg.c.diff deleted file mode 100644 index 6a5d4d1651717..0000000000000 --- a/audio/moc/ffmpeg.c.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- decoder_plugins/ffmpeg/ffmpeg.c~ 2008-06-25 18:43:02.000000000 +0200 -+++ decoder_plugins/ffmpeg/ffmpeg.c 2008-06-25 18:43:15.000000000 +0200 -@@ -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. */ diff --git a/audio/moc/moc.SlackBuild b/audio/moc/moc.SlackBuild index 2268b923706be..1ec6aee561cd1 100644 --- a/audio/moc/moc.SlackBuild +++ b/audio/moc/moc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for moc -# (C) 2007 Michael Wagner <lapinours@web.de> +# (C) 2009 Michael Wagner <slackware.wagnerm@arcor.de> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=moc -VERSION=2.4.3 +VERSION=2.4.4 ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -33,15 +33,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - config.example keymap.example" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -59,30 +59,25 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch configure.in and ffmpeg.c for use with newer -# ffmpeg versions -patch -p0 < $CWD/configure.in.diff -patch -p0 < $CWD/ffmpeg.c.diff - -aclocal -I m4 && automake && autoconf +# Get --docdir working +sed -i 's,$(datadir)/doc/$(PACKAGE),@docdir@,' Makefile.in CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --disable-debug + --disable-debug \ + --disable-static \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man1/*.? -# Remove $PKG/usr/share/doc (the Makefile doesn't seem to understand docdir) -rm -rf $PKG/usr/share/doc - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* @@ -90,4 +85,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/moc/moc.info b/audio/moc/moc.info index 7013c44ad962a..7b8e68ad7fdb7 100644 --- a/audio/moc/moc.info +++ b/audio/moc/moc.info @@ -1,8 +1,10 @@ PRGNAM="moc" -VERSION="2.4.3" +VERSION="2.4.4" HOMEPAGE="http://moc.daper.net" -DOWNLOAD="ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.3.tar.bz2" -MD5SUM="8808082848e90eeec5415baaec7e98ad" +DOWNLOAD="ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.4.tar.bz2" +MD5SUM="647c770a5542a4ae5437386807a89796" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Michael Wagner" -EMAIL="lapinours@web.de" -APPROVED="David Somero" +EMAIL="slackware.wagnerm@arcor.de" +APPROVED="rworkman" diff --git a/audio/moc/slack-desc b/audio/moc/slack-desc index c9932116bc466..1ff6be11049b0 100644 --- a/audio/moc/slack-desc +++ b/audio/moc/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler------------------------------------------------------| moc: MOC (music on console) -moc: +moc: moc: MOC is a console audio player for LINUX/UNIX moc: designed to be powerful and easy to use. moc: |