Commit 349fa35a authored by Christophe Mutricy's avatar Christophe Mutricy

* Patch ffmpeg configure to not use twice the cross prefix.

* CVS -> SVN
parent 03562f42
...@@ -894,16 +894,19 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ...@@ -894,16 +894,19 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg: ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg $(SVN) co $(FFMPEG_SVN) ffmpeg
ifeq ($(HOST),i586-pc-beos) ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch) (cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
patch -p 0 < Patches/ffmpeg-cvs-win32.patch patch -p 0 < Patches/ffmpeg-svn-win32.patch
endif endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
patch -p 1 < Patches/ffmpeg-cvs-wince.patch patch -p 1 < Patches/ffmpeg-svn-wince.patch
endif endif
ifeq ($(HOST),i686-apple-darwin8) ifeq ($(HOST),i686-apple-darwin8)
(cd $@;patch -p 0 < ../Patches/ffmpeg-cvs-mactel.patch) (cd $@;patch -p 0 < ../Patches/ffmpeg-svn-mactel.patch)
endif
ifneq ($(HOST),$(BUILD))
patch -p 0 < Patches/ffmpeg-svn-cross.patch
endif endif
ffmpeg-$(FFMPEG_VERSION).tar.gz: ffmpeg-$(FFMPEG_VERSION).tar.gz:
......
Index: ffmpeg/configure
===================================================================
--- ffmpeg/configure (revision 5464)
+++ ffmpeg/configure (working copy)
@@ -129,12 +129,12 @@
check_cc(){
cat >$TMPC
- ${cross_prefix}$cc $CFLAGS "$@" -c -o $TMPO $TMPC >/dev/null 2>&1
+ $cc $CFLAGS "$@" -c -o $TMPO $TMPC >/dev/null 2>&1
}
check_ld(){
cat >$TMPC
- ${cross_prefix}$cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >/dev/null 2>&1
+ $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >/dev/null 2>&1
}
check_cflags(){
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