vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Mar 18 14:19:22 2011 +0100| [6e9dfd3158ed5d30398f0bf87f4d8b1330e53806] | committer: Felix Paul Kühne
contribs: ssse3 patch was merged upstream > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e9dfd3158ed5d30398f0bf87f4d8b1330e53806 --- extras/contrib/src/contrib-src.mak | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index d241335..99bbd92 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -890,7 +890,7 @@ VPX_DEPS-$(ENABLED) = VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm .libvpx: libvpx $(VPX_DEPS-1) - (cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET-1) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install) +# (cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET-1) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install) (rm -rf $(PREFIX)/include/vpx/ && mkdir -p $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install? rm $(PREFIX)/include/vpx/config.h (cd $<; $(RANLIB) libvpx.a && mkdir -p $(PREFIX)/lib && cp libvpx.a $(PREFIX)/lib/) # Of course, why the hell would one expect it to be listed or in make install? @@ -1087,7 +1087,7 @@ endif PHONY += ffmpeg-svn ffmpeg-tar ffmpeg/.svn: - $(SVN) co $(FFMPEG_SVN) ffmpeg +# $(SVN) co $(FFMPEG_SVN) ffmpeg ifdef HAVE_ISA_THUMB patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch endif @@ -1102,7 +1102,6 @@ endif ifdef HAVE_WIN32 sed -i "s/std=c99/std=gnu99/" ffmpeg/configure endif - (cd ffmpeg; patch -p1 < ../Patches/ffmpeg-h264-ssse3.patch ) (cd ffmpeg; patch -p1 < ../Patches/libavformat-ape.c.patch ) touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
