summaryrefslogtreecommitdiffstats
path: root/contrib/Jamfile
diff options
context:
space:
mode:
authorsr55 <[email protected]>2008-08-17 21:59:26 +0000
committersr55 <[email protected]>2008-08-17 21:59:26 +0000
commit93a68f8bac0eda52ae5febd5754dbfa5d5238578 (patch)
treeb3f206c1cfe3bac137ed5c27c1fb42164b7b7233 /contrib/Jamfile
parent59f4fbb6827811bf0f428c529dbfcccc09eee95e (diff)
* Contrib Updates:
- libogg-1.1.3.tar.gz - xvidcore-1.1.3.tar.gz - libtheora-1.0beta3.tar.gz - libmpeg2-0.5.1.tar.gz - faac-1.26.tar.gz - ffmpeg-r14737.tar.gz * Cygwin Patch for new libfaac git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1637 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/Jamfile')
-rw-r--r--contrib/Jamfile10
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile
index a723f1b7b..b224b2001 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -218,12 +218,16 @@ rule LibFaac
{
Depends $(<) : $(>) ;
Depends lib : $(<) ;
+ if $(OS) = CYGWIN
+ {
+ CYGWIN_PATCH = "$(PATCH) -p1 < ../patch-faac-cygwin.patch" ;
+ }
}
actions LibFaac
{
cd `dirname $(>)` && CONTRIB=`pwd` &&
- rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
- ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
+ rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac && $(CYGWIN_PATCH) && ./bootstrap &&
+ ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static --without-mp4v2 &&
$(MAKE) && $(MAKE) install &&
$(STRIP) $CONTRIB/lib/libfaac.a
}
@@ -303,7 +307,7 @@ actions LibMpeg2
{
cd `dirname $(>)` && CONTRIB=`pwd` &&
rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) &&
- cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
+ cd mpeg2dec &&
./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl --without-x &&
$(MAKE) && $(MAKE) install &&
$(STRIP) $CONTRIB/lib/libmpeg2.a