Author: rdieter Update of /cvs/free/rpms/k3b-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30199 Modified Files: k3b-extras-freeworld.spec Added Files: k3b-1.0.5-ffmpeg.patch Log Message: * Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.0.5-3 - re-enable ffmpeg support k3b-1.0.5-ffmpeg.patch: --- NEW FILE k3b-1.0.5-ffmpeg.patch --- diff -up k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in --- k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in.ffmpeg 2008-05-27 03:23:36.000000000 -0500 +++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-09-16 15:24:53.000000000 -0500 @@ -21,8 +21,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the AC_LANG_CPLUSPLUS AC_COMPILE_IFELSE( extern "C" { - #include <ffmpeg/avformat.h> - #include <ffmpeg/avcodec.h> + #include <libavformat/avformat.h> + #include <libavcodec/avcodec.h> } int main() { @@ -36,8 +36,8 @@ if test "$ac_cv_use_ffmpeg" = "yes"; the LIBS="-lavformat -lavcodec $LIBS" AC_LINK_IFELSE( extern "C" { - #include <ffmpeg/avformat.h> - #include <ffmpeg/avcodec.h> + #include <libavformat/avformat.h> + #include <libavcodec/avcodec.h> } int main() { diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-09-16 15:21:12.000000000 -0500 @@ -22,7 +22,7 @@ #include <k3bpluginfactory.h> extern "C" { -#include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h> } #include <math.h> diff -up k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp --- k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ffmpeg 2008-05-27 03:23:36.000000000 -0500 +++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-09-16 15:23:01.000000000 -0500 @@ -18,8 +18,8 @@ #include "k3bffmpegwrapper.h" extern "C" { -#include <ffmpeg/avcodec.h> -#include <ffmpeg/avformat.h> +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> } #include <string.h> Index: k3b-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- k3b-extras-freeworld.spec 15 Sep 2008 16:17:11 -0000 1.2 +++ k3b-extras-freeworld.spec 16 Sep 2008 20:45:34 -0000 1.3 @@ -1,5 +1,10 @@ -#define ffmpeg 1 +%define kdelibs3 kdelibs +%if 0%{?fedora} > 6 +%define kdelibs3 kdelibs3 +%define ffmpeg ffmpeg +%define _with_ffmpeg --with-ffmpeg +%endif Name: k3b-extras-freeworld Version: 1.0.5 @@ -12,12 +17,14 @@ Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) +Patch1: k3b-1.0.5-ffmpeg.patch + ExcludeArch: s390 s390x -BuildRequires: kdelibs3-devel +BuildRequires: %{kdelibs3}-devel BuildRequires: lame-devel BuildRequires: libmad-devel -%{?ffmpeg:BuildRequires: ffmpeg-devel} +%{?ffmpeg:BuildRequires: %{ffmpeg}-devel automake} BuildRequires: libmusicbrainz-devel BuildRequires: gettext BuildRequires: taglib-devel @@ -40,18 +47,30 @@ %prep %setup -q -n k3b-%{version} +%if 0%{?ffmpeg:1} +%patch1 -p1 -b .ffmpeg +make -f admin/Makefile.common +%endif + %build unset QTDIR [ -z "$QTDIR" ] && . /etc/profile.d/qt.sh -%configure --disable-rpath \ - --with-external-libsamplerate=no \ - --without-oggvorbis \ - --without-flac \ - --without-sndfile \ - --without-hal \ - --without-musepack \ - --with-k3bsetup=no + +%{?ffmpeg:export CPPFLAGS=-I%{_includedir}/ffmpeg} + +%configure \ + --disable-rpath \ + --with-external-libsamplerate=no \ + --without-oggvorbis \ + --without-flac \ + --without-sndfile \ + --without-hal \ + --without-musepack \ + --with-k3bsetup=no \ + %{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \ + --with-lame \ + --with-libmad %define makeflags %{?_smp_mflags}%{nil} @@ -97,6 +116,9 @@ %changelog +* Tue Sep 16 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.0.5-3 +- re-enable ffmpeg support + * Mon Sep 15 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.0.5-2 - omit ffmpeg support (for now)