rpms/cmus/F-14 cmus-2.4.0-configure-fix-ffmpeg-detect.diff, NONE, 1.1 cmus.spec, 1.6, 1.7

[Conrad Meyer]

Author: konradm

Update of /cvs/free/rpms/cmus/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6851

Modified Files:
	cmus.spec 
Added Files:
	cmus-2.4.0-configure-fix-ffmpeg-detect.diff 
Log Message:
* Wed May 11 2011 Conrad Meyer <konrad at tylerc.org> - 2.4.0-2
- Include configure patch to find ffmpeg.


cmus-2.4.0-configure-fix-ffmpeg-detect.diff:
 configure |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE cmus-2.4.0-configure-fix-ffmpeg-detect.diff ---
>From 633336917be76df74c628c4f1d230fad0b161f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Wei=C3=9Fl?= <jargon at molb.org>
Date: Thu, 12 May 2011 00:42:41 +0200
Subject: [PATCH] configure: fix ffmpeg header detection

In Fedora, ffmpeg headers are here:
/usr/include/ffmpeg/libavformat/avformat.h
---
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 29bb911..15870d4 100755
--- a/configure
+++ b/configure
@@ -322,11 +322,11 @@ check_ffmpeg()
 {
 	HAVE_FFMPEG_AVCODEC_H=y
 	pkg_config FFMPEG "libavformat" || return $?
-	if check_header "libavcodec/avcodec.h"
+	if check_header "libavcodec/avcodec.h" $FFMPEG_CFLAGS
 	then
 		HAVE_FFMPEG_AVCODEC_H=n
 	else
-		check_header "ffmpeg/avcodec.h" || return $?
+		check_header "ffmpeg/avcodec.h" $FFMPEG_CFLAGS || return $?
 	fi
 	return 0
 }
-- 
1.7.5.1



Index: cmus.spec
===================================================================
RCS file: /cvs/free/rpms/cmus/F-14/cmus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cmus.spec	11 May 2011 21:26:47 -0000	1.6
+++ cmus.spec	11 May 2011 23:35:39 -0000	1.7
@@ -1,11 +1,13 @@
 Name:           cmus
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ncurses-Based Music Player
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://cmus.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/cmus/cmus-v%{version}.tar.bz2
+# Temporary patch to fix ffmpeg header detection; will be fixed in 2.4.1:
+Patch0:		cmus-2.4.0-configure-fix-ffmpeg-detect.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -32,6 +34,7 @@
 
 %prep
 %setup -q -n %{name}-v%{version}
+%patch0 -p1
 
 
 %build
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Wed May 11 2011 Conrad Meyer <konrad at tylerc.org> - 2.4.0-2
+- Include configure patch to find ffmpeg.
+
 * Mon Apr 25 2011 Johannes Weißl <jargon at molb.org> - 2.4.0-1
 - New upstream release.