Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34f8458281efa438020b65919b4ad5eda09b4faa
commit 34f8458281efa438020b65919b4ad5eda09b4faa Author: voroskoi <[EMAIL PROTECTED]> Date: Tue Apr 29 11:42:09 2008 +0200 libquicktime-1.0.2-2-x86_64 rebuilt witt ffmpeg>=20080427 added ffmpeg.diff diff --git a/source/xlib/libquicktime/FrugalBuild b/source/xlib/libquicktime/FrugalBuild index c807c39..e9a8663 100644 --- a/source/xlib/libquicktime/FrugalBuild +++ b/source/xlib/libquicktime/FrugalBuild @@ -3,19 +3,22 @@ pkgname=libquicktime pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library based on quicktime4linux with extensions" url="http://libquicktime.sourceforge.net/"; -depends=('lame' 'gtk+2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.5' 'ffmpeg>=20070422-3') +depends=('lame' 'gtk+2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.5' 'ffmpeg>=20080427') groups=('xlib') archs=('x86_64' 'i686') options=('scriptlet') Finclude sourceforge +source=([EMAIL PROTECTED] ffmpeg.diff) sha1sums=('516bb91af7a8366d3ba25090892940575ae2d7fa') build() { Fcd + Fpatchall + Fautoreconf Fmake --enable-gpl --with-cpuflags=no Fmakeinstall } diff --git a/source/xlib/libquicktime/ffmpeg.diff b/source/xlib/libquicktime/ffmpeg.diff new file mode 100644 index 0000000..84b9269 --- /dev/null +++ b/source/xlib/libquicktime/ffmpeg.diff @@ -0,0 +1,48 @@ +diff -aur libquicktime-1.0.2/m4/avcodec.m4 fw_libquicktime-1.0.2/m4/avcodec.m4 +--- libquicktime-1.0.2/m4/avcodec.m4 2005-10-28 14:16:40.000000000 +0200 ++++ fw_libquicktime-1.0.2/m4/avcodec.m4 2008-04-29 11:28:10.000000000 +0200 +@@ -12,7 +12,7 @@ + avcodec_ok="false" + AC_TRY_RUN([ + #include <stdio.h> +- #include <ffmpeg/avcodec.h> ++ #include <libavcodec/avcodec.h> + int main() + { + FILE * output; +diff -aur libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h fw_libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h +--- libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h 2007-09-26 20:36:05.000000000 +0200 ++++ fw_libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h 2008-04-29 11:35:03.000000000 +0200 +@@ -26,7 +26,7 @@ + #define QUICKTIME_FFMPEG_H + + #include <quicktime/qtprivate.h> +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + void quicktime_init_video_codec_ffmpeg(quicktime_video_map_t *vtrack, + AVCodec *encoder, AVCodec *decoder); +diff -aur libquicktime-1.0.2/plugins/ffmpeg/params.c fw_libquicktime-1.0.2/plugins/ffmpeg/params.c +--- libquicktime-1.0.2/plugins/ffmpeg/params.c 2007-09-26 20:36:05.000000000 +0200 ++++ fw_libquicktime-1.0.2/plugins/ffmpeg/params.c 2008-04-29 11:36:29.000000000 +0200 +@@ -24,7 +24,7 @@ + + #include "lqt_private.h" + #include "params.h" +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + #include <string.h> + + typedef struct +diff -aur libquicktime-1.0.2/plugins/ffmpeg/video.c fw_libquicktime-1.0.2/plugins/ffmpeg/video.c +--- libquicktime-1.0.2/plugins/ffmpeg/video.c 2007-12-19 10:36:03.000000000 +0100 ++++ fw_libquicktime-1.0.2/plugins/ffmpeg/video.c 2008-04-29 11:38:48.000000000 +0200 +@@ -32,7 +32,7 @@ + #define LOG_DOMAIN "ffmpeg_video" + + #ifdef HAVE_LIBSWSCALE +-#include <swscale.h> ++#include <libswscale/swscale.h> + #endif + + // Enable interlaced encoding (experimental) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
