rpms/cmus/devel cmus-2.2.0-new-ffmpeg.patch, NONE, 1.1 cmus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Conrad Meyer]

Author: konradm

Update of /cvs/free/rpms/cmus/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmus-2.2.0-new-ffmpeg.patch cmus.spec 
Log Message:
Import.


cmus-2.2.0-new-ffmpeg.patch:

--- NEW FILE cmus-2.2.0-new-ffmpeg.patch ---
--- 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"


--- NEW FILE cmus.spec ---
Name:           cmus
Version:        2.2.0
Release:        3%{?dist}
Summary:        Ncurses-Based Music Player
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://cmus.sourceforge.net/
Source0:        http://mirror.greaterscope.net/cmus/cmus-%{version}.tar.bz2
# This comes from Gentoo Bugzilla #218105:
Patch0:         cmus-2.2.0-new-ffmpeg.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel
BuildRequires:  faad2-devel
BuildRequires:  ffmpeg-devel
BuildRequires:  flac-devel
BuildRequires:  libao-devel
BuildRequires:  libmad-devel
BuildRequires:  libmodplug-devel
BuildRequires:  libmp4v2-devel
BuildRequires:  libmpcdec-devel
BuildRequires:  libvorbis-devel
BuildRequires:  wavpack-devel


%description
cmus is a small and fast text mode music player for Linux and many
other UNIX-like operating systems.



%prep
%setup -q
%patch0 -p1


%build
./configure prefix=%{_prefix} bindir=%{_bindir} datadir=%{_datadir} \
  libdir=%{_libdir} mandir=%{_mandir} \
  exampledir=%{_datadir}/%{name}/examples \
  CONFIG_FLAC=y CONFIG_MAD=y CONFIG_MODPLUG=y CONFIG_MIKMOD=n \
  CONFIG_MPC=y CONFIG_VORBIS=y CONFIG_WAV=y CONFIG_WAVPACK=y \
  CONFIG_MP4=y CONFIG_AAC=y CONFIG_FFMPEG=y CONFIG_ALSA=y \
  CONFIG_AO=y CONFIG_ARTS=n CONFIG_OSS=n CONFIG_SUN=n \
  CFLAGS="%{optflags}"
make %{?_smp_mflags} V=2


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mv $RPM_BUILD_ROOT%{_datadir}/%{name}/examples .
chmod -x examples/*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS examples
%{_bindir}/%{name}
%{_bindir}/cmus-remote
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man1/cmus-remote.1*
%{_mandir}/man1/cmus.1*


%changelog
* Wed Dec 17 2008 Conrad Meyer <konrad at tylerc.org> - 2.2.0-3
- Make more verbosely (V=2).

* Tue Dec 16 2008 Conrad Meyer <konrad at tylerc.org> - 2.2.0-2
- Build ffmpeg support with gentoo patch.
- Remove libmikmod.

* Sun Nov 16 2008 Conrad Meyer <konrad at tylerc.org> - 2.2.0-1
- Initial package.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cmus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2008 13:02:10 -0000	1.1
+++ .cvsignore	16 Feb 2009 06:27:42 -0000	1.2
@@ -0,0 +1 @@
+cmus-2.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/cmus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2008 13:02:10 -0000	1.1
+++ sources	16 Feb 2009 06:27:42 -0000	1.2
@@ -0,0 +1 @@
+7a9895ecfc10cd16577c73051436962f  cmus-2.2.0.tar.bz2