diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-04-11 11:44:22 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-04-11 11:44:22 +0000 |
| commit | 02bc32713a56ce2e1f42d4b798e06bf952e1e287 (patch) | |
| tree | 3bbeb2b4c3d505c546e836f315c0703e9c485a49 /media-video | |
| parent | Adding kccmp-0.2-r1 to package.mask for qt-4.4 masked dependancy (diff) | |
| download | gentoo-2-02bc32713a56ce2e1f42d4b798e06bf952e1e287.tar.gz gentoo-2-02bc32713a56ce2e1f42d4b798e06bf952e1e287.tar.bz2 gentoo-2-02bc32713a56ce2e1f42d4b798e06bf952e1e287.zip | |
Add a patch to let it build with latest ffmpeg headers layout
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/kdenlive/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/kdenlive/files/kdenlive-0.5-ffmpegheaders.patch | 32 | ||||
| -rw-r--r-- | media-video/kdenlive/kdenlive-0.5.ebuild | 9 |
3 files changed, 44 insertions, 3 deletions
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog index e6d19fbc5c0d..2d22ec65897f 100644 --- a/media-video/kdenlive/ChangeLog +++ b/media-video/kdenlive/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/kdenlive # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.21 2008/04/10 18:23:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.22 2008/04/11 11:44:22 aballier Exp $ + + 11 Apr 2008; Alexis Ballier <aballier@gentoo.org> + +files/kdenlive-0.5-ffmpegheaders.patch, kdenlive-0.5.ebuild: + Add a patch to let it build with latest ffmpeg headers layout 10 Apr 2008; Alexis Ballier <aballier@gentoo.org> kdenlive-0.4.ebuild, kdenlive-0.5.ebuild: diff --git a/media-video/kdenlive/files/kdenlive-0.5-ffmpegheaders.patch b/media-video/kdenlive/files/kdenlive-0.5-ffmpegheaders.patch new file mode 100644 index 000000000000..91177615ca53 --- /dev/null +++ b/media-video/kdenlive/files/kdenlive-0.5-ffmpegheaders.patch @@ -0,0 +1,32 @@ +Index: kdenlive-0.5/configure.in.in +=================================================================== +--- kdenlive-0.5.orig/configure.in.in ++++ kdenlive-0.5/configure.in.in +@@ -49,6 +49,8 @@ AC_SUBST(LIBMLT_CFLAGS) + + dnl check libraries + ++AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h]) ++ + # LIBRAW1394 + + #PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.1.0) +Index: kdenlive-0.5/kdenlive/krender.cpp +=================================================================== +--- kdenlive-0.5.orig/kdenlive/krender.cpp ++++ kdenlive-0.5/kdenlive/krender.cpp +@@ -22,8 +22,14 @@ + * * + ***************************************************************************/ + ++#include "config.h" ++ + extern "C" { ++#if HAVE_LIBAVFORMAT_AVFORMAT_H ++#include <libavformat/avformat.h> ++#else + #include <ffmpeg/avformat.h> ++#endif + } + + #include <iostream> diff --git a/media-video/kdenlive/kdenlive-0.5.ebuild b/media-video/kdenlive/kdenlive-0.5.ebuild index d8fd69368e5c..4b4c661dbdc5 100644 --- a/media-video/kdenlive/kdenlive-0.5.ebuild +++ b/media-video/kdenlive/kdenlive-0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.2 2008/04/10 18:23:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.3 2008/04/11 11:44:22 aballier Exp $ inherit eutils kde @@ -36,8 +36,13 @@ pkg_setup() { fi } +src_unpack() { + kde_src_unpack + epatch "${FILESDIR}/${P}-ffmpegheaders.patch" + rm -f configure +} + src_compile() { - rm configure myconf="--enable-pch" kde_src_compile |