diff options
| author | jbrjake <[email protected]> | 2008-10-15 02:49:53 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2008-10-15 02:49:53 +0000 |
| commit | 36cfe6ff94ce0dc60184dec2740d2e5cf139f89b (patch) | |
| tree | cb0ddb2732a23f84a4f3c5ac07fd3459a265b4eb /contrib | |
| parent | 81866d0278b1d26de96d63cebef7cc6b8be1645b (diff) | |
Switches from mpeg4ip's copy of libmp4v2 to an independently-maintained one located at: code.google.com/p/mp4v2
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1833 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 21 | ||||
| -rw-r--r-- | contrib/version_libmp4v2.txt | 1 |
2 files changed, 6 insertions, 16 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 117fc6b79..7349677b3 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -261,30 +261,19 @@ LibMp3Lame $(SUBDIR)/lib/libmp3lame.a : $(SUBDIR)/lame.tar.gz ; rule LibMp4v2 { LIBMP4V2_PATCH = "" ; - if $(OS) = CYGWIN - { - LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch_mpeg4ip_cygwin.patch && " ; - } - LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip.patch && " ; - LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-nasm-2.00-configure.patch && " ; - LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-ac3.patch && " ; - LIBMP4V2_PATCH += "$(PATCH) -p1 < ../patch-mpeg4ip-colr.patch && " ; Depends $(<) : $(>) ; Depends lib : $(<) ; } actions LibMp4v2 { 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 && + rm -rf libmp4v2 && (gzip -dc libmp4v2.tar.gz | tar xf - ) && + cd mp4v2 && $(LIBMP4V2_PATCH) ./configure --prefix=$CONTRIB && + $(MAKE) && make install && $(STRIP) $CONTRIB/lib/libmp4v2.a } -Wget $(SUBDIR)/mpeg4ip.tar.gz : $(SUBDIR)/version_mpeg4ip.txt ; -LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/mpeg4ip.tar.gz ; +Wget $(SUBDIR)/libmp4v2.tar.gz : $(SUBDIR)/version_libmp4v2.txt ; +LibMp4v2 $(SUBDIR)/lib/libmp4v2.a : $(SUBDIR)/libmp4v2.tar.gz ; rule LibMkv { diff --git a/contrib/version_libmp4v2.txt b/contrib/version_libmp4v2.txt new file mode 100644 index 000000000..96563ff21 --- /dev/null +++ b/contrib/version_libmp4v2.txt @@ -0,0 +1 @@ +http://download.m0k.org/handbrake/contrib/libmp4v2-r19.tar.gz |