Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=efdcb5df2144825079cf59f3265a4d6b91c755de
commit efdcb5df2144825079cf59f3265a4d6b91c755de Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Jun 24 10:27:15 2011 +0200 libquicktime-1.2.2-3-x86_64 *rebuild with ffmpeg>=0.8 diff --git a/source/xlib/libquicktime/FrugalBuild b/source/xlib/libquicktime/FrugalBuild index 93437f3..79c275e 100644 --- a/source/xlib/libquicktime/FrugalBuild +++ b/source/xlib/libquicktime/FrugalBuild @@ -3,16 +3,18 @@ pkgname=libquicktime pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A library based on quicktime4linux with extensions" -depends=('libxml2>=2.7.8' 'lame' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.7' 'ffmpeg>=0.6-4' 'libraw1394>=2.0.0') +depends=('libxml2>=2.7.8' 'lame' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.7' 'ffmpeg>=0.8' 'libraw1394>=2.0.0') makedepends=('cvs' 'doxygen') groups=('xlib') archs=('x86_64' 'i686' 'ppc') options=('scriptlet') Finclude sourceforge +source=($source ffmpeg07.diff) url="http://libquicktime.sourceforge.net/" -sha1sums=('fc2e9754f6cb8a817ce9a7ac91912af56667ee09') +sha1sums=('fc2e9754f6cb8a817ce9a7ac91912af56667ee09' \ + '1ee8dc9b1f50b4d7c4e94e92dfb12b0a75a1259c') build() { diff --git a/source/xlib/libquicktime/ffmpeg07.diff b/source/xlib/libquicktime/ffmpeg07.diff new file mode 100644 index 0000000..172e409 --- /dev/null +++ b/source/xlib/libquicktime/ffmpeg07.diff @@ -0,0 +1,31 @@ +Index: libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c +=================================================================== +--- libquicktime-1.2.2.orig/plugins/ffmpeg/lqt_ffmpeg.c ++++ libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c +@@ -1031,8 +1031,8 @@ static void set_codec_info(struct CODECI + snprintf(ffmpeg_long_name, 256, "%s", map->name); + snprintf(ffmpeg_description, 256, "%s", map->name); + +- if((map->encoder && (map->encoder->type == CODEC_TYPE_VIDEO)) || +- (map->decoder && (map->decoder->type == CODEC_TYPE_VIDEO))){ ++ if((map->encoder && (map->encoder->type == AVMEDIA_TYPE_VIDEO)) || ++ (map->decoder && (map->decoder->type == AVMEDIA_TYPE_VIDEO))){ + codec_info_ffmpeg.type = LQT_CODEC_VIDEO; + } else { + codec_info_ffmpeg.type = LQT_CODEC_AUDIO; +Index: libquicktime-1.2.2/plugins/ffmpeg/params.c +=================================================================== +--- libquicktime-1.2.2.orig/plugins/ffmpeg/params.c ++++ libquicktime-1.2.2/plugins/ffmpeg/params.c +@@ -205,8 +205,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_FLOAT("ff_p_masking",p_masking); + PARAM_FLOAT("ff_dark_masking",dark_masking); + PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method); ++#if LIBAVCODEC_VERSION_MAJOR < 53 + PARAM_INT("ff_mb_qmin",mb_qmin); + PARAM_INT("ff_mb_qmax",mb_qmax); ++#endif + PARAM_ENUM("ff_me_cmp",me_cmp,compare_func); + PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp); + PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func); + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git