diff options
| -rw-r--r-- | cmus/.md5sum | 2 | ||||
| -rw-r--r-- | cmus/Pkgfile | 6 | ||||
| -rw-r--r-- | cmus/ffmpeg.diff | 15 | ||||
| -rw-r--r-- | cmus/mp4.diff | 58 |
4 files changed, 79 insertions, 2 deletions
diff --git a/cmus/.md5sum b/cmus/.md5sum index c43cfef2b..f1a794f2a 100644 --- a/cmus/.md5sum +++ b/cmus/.md5sum @@ -1 +1,3 @@ 7a9895ecfc10cd16577c73051436962f cmus-2.2.0.tar.bz2 +6afdae6aa3b05f7638a836dc9967ccdb ffmpeg.diff +88d405f6750253bb84707c86a5e4098e mp4.diff diff --git a/cmus/Pkgfile b/cmus/Pkgfile index 007219681..68fbe59b1 100644 --- a/cmus/Pkgfile +++ b/cmus/Pkgfile @@ -1,6 +1,6 @@ # Description: Small and fast music player using the ncurses library # URL: http://cmus.sf.net/ -# Maintainer: Antti Nykanen, aon at iki dot fi +# Maintainer: Thomas Penteker, tek at serverop dot de # Packager: Jukka Heino, jukka dot heino at gmail dot com # Depends on: # Nice to have: alsa-lib, flac, libao, libid3tag, libmad, libmodplug, libmpcdec, libvorbis @@ -8,10 +8,12 @@ name=cmus version=2.2.0 release=2 -source=(http://mirror.greaterscope.net/$name/$name-$version.tar.bz2) +source=(http://mirror.greaterscope.net/$name/$name-$version.tar.bz2 mp4.diff ffmpeg.diff) build() { cd $name-$version + patch -p1 -i ../mp4.diff + patch -p1 -i ../ffmpeg.diff ./configure prefix=/usr mandir=/usr/man CONFIG_ARTS=n make make DESTDIR=$PKG install install-man diff --git a/cmus/ffmpeg.diff b/cmus/ffmpeg.diff new file mode 100644 index 000000000..89812b21b --- /dev/null +++ b/cmus/ffmpeg.diff @@ -0,0 +1,15 @@ +--- cmus-2.2.0-orig/ffmpeg.c 2007-07-27 16:52:13.000000000 +0200 ++++ cmus-2.2.0/ffmpeg.c 2008-04-25 16:32:40.000000000 +0200 +@@ -18,9 +18,9 @@ + */ + + #include <stdio.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avio.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavformat/avio.h> + + #include "ip.h" + #include "xmalloc.h" diff --git a/cmus/mp4.diff b/cmus/mp4.diff new file mode 100644 index 000000000..a0c649b61 --- /dev/null +++ b/cmus/mp4.diff @@ -0,0 +1,58 @@ +From fff730440d21dab90e41371cce1146aa820e64fb Mon Sep 17 00:00:00 2001 +From: Gregory Petrosyan <gregory.petrosyan@gmail.com> +Date: Thu, 18 Feb 2010 01:39:27 +0300 +Subject: [PATCH] Fix MP4 compilation when using new libmp4v2 + +Up-to-date libmp4v2 from http://code.google.com/p/mp4v2/ provides +<mp4v2/mp4v2.h> instead of <mp4.h>, so use it if available. + +Reported-by: David Flatz <solanum0@gmail.com> +Signed-off-by: Gregory Petrosyan <gregory.petrosyan@gmail.com> +--- + configure | 3 +++ + mp4.c | 6 ++++++ + 2 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index aba3779..16d9fba 100755 +--- a/configure ++++ b/configure +@@ -222,6 +222,8 @@ check_waveout() + + check_mp4() + { ++ check_header mp4v2/mp4v2.h ++ MP4_USE_OLD_HEADER=$? + check_header faad.h && + check_library MP4 "" "-lmp4v2 -lfaad -lm" + return $? +@@ -344,6 +346,7 @@ config_header config/datadir.h DATADIR + config_header config/libdir.h LIBDIR + config_header config/debug.h DEBUG + config_header config/tremor.h CONFIG_TREMOR ++config_header config/mp4.h MP4_USE_OLD_HEADER + + makefile_vars bindir datadir libdir mandir exampledir + makefile_vars CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG +diff --git a/mp4.c b/mp4.c +index c1969b4..07e8339 100644 +--- a/mp4.c ++++ b/mp4.c +@@ -21,8 +21,14 @@ + #include "xmalloc.h" + #include "debug.h" + #include "file.h" ++#include "config/mp4.h" + ++#if MP4_USE_OLD_HEADER + #include <mp4.h> ++#else ++#include <mp4v2/mp4v2.h> ++#endif ++ + #include <faad.h> + + #include <errno.h> +-- +1.6.1 + |