packages: libquicktime/libquicktime.spec, libquicktime/libquicktime-ffmpeg0...

lisu lisu at pld-linux.org
Fri Jul 1 15:11:12 CEST 2011


Author: lisu                         Date: Fri Jul  1 13:11:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with ffmpeg >= 0.7.1

---- Files affected:
packages/libquicktime:
   libquicktime.spec (1.56 -> 1.57) , libquicktime-ffmpeg07.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libquicktime/libquicktime.spec
diff -u packages/libquicktime/libquicktime.spec:1.56 packages/libquicktime/libquicktime.spec:1.57
--- packages/libquicktime/libquicktime.spec:1.56	Tue Jun 28 19:54:36 2011
+++ packages/libquicktime/libquicktime.spec	Fri Jul  1 15:11:06 2011
@@ -22,6 +22,7 @@
 Source0:	http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
 # Source0-md5:	cbc0b09a95cab685b4b21201db85c6f2
 Patch0:		%{name}-gtk.patch
+Patch1:		%{name}-ffmpeg07.patch
 URL:		http://libquicktime.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -247,6 +248,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -370,6 +372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2011/07/01 13:11:06  lisu
+- fix build with ffmpeg >= 0.7.1
+
 Revision 1.56  2011/06/28 17:54:36  arekm
 - release 3
 

================================================================
Index: packages/libquicktime/libquicktime-ffmpeg07.patch
diff -u /dev/null packages/libquicktime/libquicktime-ffmpeg07.patch:1.1
--- /dev/null	Fri Jul  1 15:11:12 2011
+++ packages/libquicktime/libquicktime-ffmpeg07.patch	Fri Jul  1 15:11:06 2011
@@ -0,0 +1,30 @@
+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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libquicktime/libquicktime.spec?r1=1.56&r2=1.57&f=u



More information about the pld-cvs-commit mailing list