From 96d9d5a9a46136d88f191f6b498716afc3d956fd Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Tue, 11 May 2010 20:30:49 +0200 Subject: audio/moc: Moved from multimedia --- audio/moc/README | 4 ++ audio/moc/configure.in.diff | 10 +++++ audio/moc/ffmpeg.c.diff | 14 +++++++ audio/moc/moc.SlackBuild | 93 +++++++++++++++++++++++++++++++++++++++++++ audio/moc/moc.info | 8 ++++ audio/moc/slack-desc | 19 +++++++++ multimedia/moc/README | 4 -- multimedia/moc/moc.SlackBuild | 78 ------------------------------------ multimedia/moc/moc.info | 8 ---- multimedia/moc/slack-desc | 19 --------- 10 files changed, 148 insertions(+), 109 deletions(-) create mode 100644 audio/moc/README create mode 100644 audio/moc/configure.in.diff create mode 100644 audio/moc/ffmpeg.c.diff create mode 100644 audio/moc/moc.SlackBuild create mode 100644 audio/moc/moc.info create mode 100644 audio/moc/slack-desc delete mode 100644 multimedia/moc/README delete mode 100644 multimedia/moc/moc.SlackBuild delete mode 100644 multimedia/moc/moc.info delete mode 100644 multimedia/moc/slack-desc diff --git a/audio/moc/README b/audio/moc/README new file mode 100644 index 0000000000..2763be1415 --- /dev/null +++ b/audio/moc/README @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000000..3d2a7d103e --- /dev/null +++ b/audio/moc/configure.in.diff @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000000..6a5d4d1651 --- /dev/null +++ b/audio/moc/ffmpeg.c.diff @@ -0,0 +1,14 @@ +--- 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 + #endif ++#if HAVE_LIBAVFORMAT_AVFORMAT_H ++#include ++#else + #include ++#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 new file mode 100644 index 0000000000..2268b92370 --- /dev/null +++ b/audio/moc/moc.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for moc + +# (C) 2007 Michael Wagner +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=moc +VERSION=2.4.3 +ARCH=${ARCH:-i486} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} + +CWD=$(pwd) +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" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -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 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --disable-debug + +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/* + +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 diff --git a/audio/moc/moc.info b/audio/moc/moc.info new file mode 100644 index 0000000000..7013c44ad9 --- /dev/null +++ b/audio/moc/moc.info @@ -0,0 +1,8 @@ +PRGNAM="moc" +VERSION="2.4.3" +HOMEPAGE="http://moc.daper.net" +DOWNLOAD="ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.3.tar.bz2" +MD5SUM="8808082848e90eeec5415baaec7e98ad" +MAINTAINER="Michael Wagner" +EMAIL="lapinours@web.de" +APPROVED="David Somero" diff --git a/audio/moc/slack-desc b/audio/moc/slack-desc new file mode 100644 index 0000000000..c9932116bc --- /dev/null +++ b/audio/moc/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +moc: MOC (music on console) +moc: +moc: MOC is a console audio player for LINUX/UNIX +moc: designed to be powerful and easy to use. +moc: +moc: Homepage: http://moc.daper.net +moc: +moc: +moc: +moc: +moc: diff --git a/multimedia/moc/README b/multimedia/moc/README deleted file mode 100644 index 2763be1415..0000000000 --- a/multimedia/moc/README +++ /dev/null @@ -1,4 +0,0 @@ -MOC (music on console) - -MOC is a console audio player for LINUX/UNIX designed to be powerful -and easy to use. diff --git a/multimedia/moc/moc.SlackBuild b/multimedia/moc/moc.SlackBuild deleted file mode 100644 index bcf71767d6..0000000000 --- a/multimedia/moc/moc.SlackBuild +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -# Slackware build script for moc - -# (C) 2007 Michael Wagner -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=moc -VERSION=2.4.3 -ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -CWD=$(pwd) -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" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 -chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --disable-debug \ - || exit 1 - -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 - -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/* - -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 diff --git a/multimedia/moc/moc.info b/multimedia/moc/moc.info deleted file mode 100644 index 5e6e6d4477..0000000000 --- a/multimedia/moc/moc.info +++ /dev/null @@ -1,8 +0,0 @@ -PRGNAM="moc" -VERSION="2.4.3" -HOMEPAGE="http://moc.daper.net" -DOWNLOAD="ftp://ftp.daper.net/pub/soft/moc/stable/moc-2.4.3.tar.bz2" -MD5SUM="8808082848e90eeec5415baaec7e98ad" -MAINTAINER="Michael Wagner" -EMAIL="lapinours@web.de" -APPROVED="rworkman" diff --git a/multimedia/moc/slack-desc b/multimedia/moc/slack-desc deleted file mode 100644 index c9932116bc..0000000000 --- a/multimedia/moc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -moc: MOC (music on console) -moc: -moc: MOC is a console audio player for LINUX/UNIX -moc: designed to be powerful and easy to use. -moc: -moc: Homepage: http://moc.daper.net -moc: -moc: -moc: -moc: -moc: -- cgit v1.2.3