diff options
| author | jbrjake <[email protected]> | 2007-12-28 18:03:01 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2007-12-28 18:03:01 +0000 |
| commit | 209d03671927cd1a8b4fef50c75b4445c9acb512 (patch) | |
| tree | 76c75111556504bbcfff9cade826686707dd015f /contrib | |
| parent | 78e44333de5428afae0bbccb05eaa7c31d7cbb3e (diff) | |
Patches mpeg4ip's build script so it doesn't check for libmp4v2 compatibility in the system-level copy of faac, since HandBrak doesn't use that copy of the library. It always trips up Linux users. Thanks, saintdev!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1150 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 2 | ||||
| -rw-r--r-- | contrib/patch-mpeg4ip-faac.patch | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 0c2fa30b2..c3ed859ec 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -221,7 +221,7 @@ if $(OS) != CYGWIN cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf mpeg4ip && (gzip -dc mpeg4ip.tar.gz | tar xf - ) && cd mpeg4ip && - $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p0 < ../patch-mpeg4ip-no_compressor_name.patch && + $(PATCH) -p1 < ../patch-mpeg4ip.patch && $(PATCH) -p0 < ../patch-mpeg4ip-no_compressor_name.patch && $(PATCH) -p1 < ../patch-mpeg4ip-faac.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 \ diff --git a/contrib/patch-mpeg4ip-faac.patch b/contrib/patch-mpeg4ip-faac.patch new file mode 100644 index 000000000..d8c46d682 --- /dev/null +++ b/contrib/patch-mpeg4ip-faac.patch @@ -0,0 +1,16 @@ +diff -ruN mpeg4ip/bootstrap mpeg4ip.work/bootstrap +--- mpeg4ip/bootstrap 2005-10-13 14:09:41.000000000 -0600 ++++ mpeg4ip.work/bootstrap 2007-02-13 16:03:30.236971291 -0700 +@@ -47,9 +47,9 @@ + # + if test $target_system = "Linux"; then + have_faac=no +- if which faac >/dev/null 2>/dev/null; then +- have_faac=yes +- fi ++# if which faac >/dev/null 2>/dev/null; then ++# have_faac=yes ++# fi + + if test $have_faac = "yes"; then + # we have lame and faac - see if faac is built with mp4 support |