diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-05-11 20:30:49 +0200 |
|---|---|---|
| committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-05-11 20:30:49 +0200 |
| commit | 96d9d5a9a46136d88f191f6b498716afc3d956fd (patch) | |
| tree | 9c3791331e89f1deec2338af939550ed33f43c81 | |
| parent | 999c1ed65abee216d96a9ad9b753f55afe5e9dd0 (diff) | |
| download | slackbuilds-96d9d5a9a46136d88f191f6b498716afc3d956fd.tar.gz | |
audio/moc: Moved from multimedia
| -rw-r--r-- | audio/moc/README (renamed from multimedia/moc/README) | 0 | ||||
| -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 (renamed from multimedia/moc/moc.SlackBuild) | 33 | ||||
| -rw-r--r-- | audio/moc/moc.info (renamed from multimedia/moc/moc.info) | 2 | ||||
| -rw-r--r-- | audio/moc/slack-desc (renamed from multimedia/moc/slack-desc) | 0 |
6 files changed, 49 insertions, 10 deletions
diff --git a/multimedia/moc/README b/audio/moc/README index 2763be1415..2763be1415 100644 --- a/multimedia/moc/README +++ b/audio/moc/README 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 <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/multimedia/moc/moc.SlackBuild b/audio/moc/moc.SlackBuild index bcf71767d6..2268b92370 100644 --- a/multimedia/moc/moc.SlackBuild +++ b/audio/moc/moc.SlackBuild @@ -25,8 +25,9 @@ PRGNAM=moc VERSION=2.4.3 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -39,27 +40,41 @@ 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 || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . +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 \ - || exit 1 + --disable-debug -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 +make +make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man1/*.? diff --git a/multimedia/moc/moc.info b/audio/moc/moc.info index 5e6e6d4477..7013c44ad9 100644 --- a/multimedia/moc/moc.info +++ b/audio/moc/moc.info @@ -5,4 +5,4 @@ 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" +APPROVED="David Somero" diff --git a/multimedia/moc/slack-desc b/audio/moc/slack-desc index c9932116bc..c9932116bc 100644 --- a/multimedia/moc/slack-desc +++ b/audio/moc/slack-desc |