Remove the seperate action for mpeg4ip on cygwin from the contrib

Jamfile. It was only applying a patch. This makes things a little easier
to maintain and makes mpeg4ip similar to other contribs wrt. patching.

git-svn-id: svn://localhost/HandBrake/trunk@1247 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index f6648c2..54e2865 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -211,38 +211,25 @@ LibMp3Lame $(SUBDIR)/lib/libmp3lame.a : $(SUBDIR)/lame.tar.gz ;
 # libmp4v2
 rule LibMp4v2
 {
-    Depends $(<) : $(>) ;
-    Depends lib  : $(<) ;
-}
-if $(OS) != CYGWIN
-{
-    actions LibMp4v2
+    LIBMP4V2_PATCH = "" ;
+    if $(OS) = CYGWIN
     {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && 
-        cd mpeg4ip &&
-        $(PATCH) -p1 < ../patch-mpeg4ip.patch &&
-        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
-        cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
-            include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
-        $(STRIP) $CONTRIB/lib/libmp4v2.a
+        LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch && " ;
     }
+    LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip.patch && " ;
+    Depends $(<) : $(>) ;
+    Depends lib  : $(<) ;
 }
-else
+actions LibMp4v2
 {
-    actions LibMp4v2
-    {
-        cd `dirname $(>)` && CONTRIB=`pwd` &&
-        rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && 
-        cd mpeg4ip &&
-        $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch &&
-        ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
-        $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
-        cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
-            include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
-        $(STRIP) $CONTRIB/lib/libmp4v2.a
-    }
+    cd `dirname $(>)` && CONTRIB=`pwd` &&
+    rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) &&
+    cd mpeg4ip && $(LIBMP4V2_PATCH)
+    ./bootstrap --cache-file=$CONTRIB/config.cache --disable-mp3lame --disable-faac --disable-x264 --disable-server --disable-player &&
+    $(MAKE) -C lib/mp4v2 libmp4v2.la && cp lib/mp4v2/.libs/libmp4v2.a $CONTRIB/lib &&
+    cp mpeg4ip_config.h include/mpeg4ip.h include/mpeg4ip_version.h \
+        include/mpeg4ip_win32.h lib/mp4v2/*.h $CONTRIB/include &&
+    $(STRIP) $CONTRIB/lib/libmp4v2.a
 }
 Wget     $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ;
 LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ;