Commit 6e9dfd31 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: ssse3 patch was merged upstream

parent 4e4e2bb4
...@@ -890,7 +890,7 @@ VPX_DEPS-$(ENABLED) = ...@@ -890,7 +890,7 @@ VPX_DEPS-$(ENABLED) =
VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm
.libvpx: libvpx $(VPX_DEPS-1) .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 -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 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? (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 ...@@ -1087,7 +1087,7 @@ endif
PHONY += ffmpeg-svn ffmpeg-tar PHONY += ffmpeg-svn ffmpeg-tar
ffmpeg/.svn: ffmpeg/.svn:
$(SVN) co $(FFMPEG_SVN) ffmpeg # $(SVN) co $(FFMPEG_SVN) ffmpeg
ifdef HAVE_ISA_THUMB ifdef HAVE_ISA_THUMB
patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
endif endif
...@@ -1102,7 +1102,6 @@ endif ...@@ -1102,7 +1102,6 @@ endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
sed -i "s/std=c99/std=gnu99/" ffmpeg/configure sed -i "s/std=c99/std=gnu99/" ffmpeg/configure
endif endif
(cd ffmpeg; patch -p1 < ../Patches/ffmpeg-h264-ssse3.patch )
(cd ffmpeg; patch -p1 < ../Patches/libavformat-ape.c.patch ) (cd ffmpeg; patch -p1 < ../Patches/libavformat-ape.c.patch )
touch $@ touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment