Patching libquicktime to be able to build the plugins

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@382 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index fbce1330e28c750907acae63d596ea8d445b9b71..db844e0a239a2fb36a8e95384ee0cc2d7f20b5ef 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -66,8 +66,8 @@ actions LibAvCodec
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf ffmpeg && tar xzf ffmpeg.tar.gz &&
     cd ffmpeg && $(FFMPEG_PATCH) &&
-    ./configure --prefix=$CONTRIB $(FFMPEG_OPTIONS) --enable-gpl --disable-audio-beos &&
-    make lib && make install-libs install-headers &&
+    ./configure --prefix=$CONTRIB $(FFMPEG_OPTIONS) --enable-gpl --disable-audio-beos --enable-shared --enable-static&&
+    make && make install &&
     strip -S $CONTRIB/lib/libavcodec.a
 }
 Wget       $(SUBDIR)/ffmpeg.tar.gz    : $(SUBDIR)/version_ffmpeg.txt ;
@@ -152,7 +152,7 @@ actions LibFaac
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf faac && tar xzf faac.tar.gz && cd faac &&
-    ./configure --prefix=$CONTRIB --disable-shared &&
+    ./configure --prefix=$CONTRIB --enable-shared --enable-static &&
     make && make install &&
     strip -S $CONTRIB/lib/libfaac.a
 }
@@ -381,8 +381,9 @@ actions LibQT
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf libquicktime && tar xzf libquicktime.tar.gz &&
-    cd libquicktime && 
-     ./configure --prefix=$CONTRIB --enable-static --disable-shared && make && make install &&
+    export LDFLAGS="$LDFLAGS -L$CONTRIB/lib -I$CONTRIB/include" && export CPPFLAGS="$CPPFLAGS -I$CONTRIB/include"
+    cd libquicktime &&  patch -p1 < ../patch-libquicktime.patch &&
+     ./configure --prefix=$CONTRIB --enable-static --disable-shared --enable-gpl --with-faac=$CONTRIB --with-x264=$CONTRIB --with-avcodec=$CONTRIB && make && make install &&
     strip -S $CONTRIB/lib/libquicktime.a && touch $CONTRIB/.contrib
 }
 Wget        $(SUBDIR)/libquicktime.tar.gz   : $(SUBDIR)/version_qt.txt ;

diff --git a/contrib/patch-libquicktime.patch b/contrib/patch-libquicktime.patch
new file mode 100644 (file)
index 0000000..acc18d4
--- /dev/null
+++ b/contrib/patch-libquicktime.patch
@@ -0,0 +1,41 @@
+diff -Naur libquicktime/configure libquicktime_patched/configure
+--- libquicktime/configure     2006-08-03 01:02:25.000000000 +0200
++++ libquicktime_patched/configure     2007-02-20 23:35:12.000000000 +0100
+@@ -26261,7 +26261,7 @@
+ 
+ 
+ 
+-have_x264="false"
++have_x264="true"
+ 
+ if test $have_gpl = "true"; then
+ X264_REQUIRED="0.48"
+@@ -26321,6 +26321,7 @@
+ 
+ fi
+ 
++have_x264="true"
+ 
+ if test x$have_x264 = xtrue; then
+   HAVE_X264_TRUE=
+diff -Naur libquicktime/plugins/x264/x264.c libquicktime_patched/plugins/x264/x264.c
+--- libquicktime/plugins/x264/x264.c   2006-07-25 13:35:15.000000000 +0200
++++ libquicktime_patched/plugins/x264/x264.c   2007-02-20 23:35:33.000000000 +0100
+@@ -493,7 +493,7 @@
+       {
+       /* Force ABR */
+       codec->params.rc.i_rc_method = X264_RC_ABR;
+-      codec->params.rc.i_rf_constant = 0;
++      // codec->params.rc.i_rf_constant = 0;
+       if(codec->pass == 1)
+         {
+         /* Strings will be made private by x264 */
+@@ -655,7 +655,7 @@
+   INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
+   
+   INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
+-  INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
++  // INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
+   INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
+   INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
+   INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);