Re: rpms/k3b-extras-freeworld/devel k3b-1.0.5-ffmpeg.patch, NONE, 1.1 k3b-extras-freeworld.spec, 1.2, 1.3
On Wednesday September 17, 2008 9:44:18 am Dominik 'Rathann' Mierzejewski
wrote:
On Tuesday, 16 September 2008 at 22:45, Rex Dieter wrote:
> 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> - 1.0.5-3
> - re-enable ffmpeg support
>
> 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
[...]
> @@ -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}
pkg-config
Of course, that's a better long-term fix. Patches welcome. :)
-- Rex