[vlc-devel] commit: contrib: turn off Thumb ISA for libavcodec and libmad ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 18:44:47 2009 +0300| [7f41d196b6ab0d53a4a962a930b3787aafcf8bf9] | committer: Rémi Denis-Courmont 

contrib: turn off Thumb ISA for libavcodec and libmad

Conflicts:

	extras/contrib/src/Makefile
(cherry picked from commit 8bba45f80a3d68a0063235c2d9d47b96fdbda7b4)

Conflicts:

	extras/contrib/src/Makefile

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f41d196b6ab0d53a4a962a930b3787aafcf8bf9
---

 extras/contrib/bootstrap                           |    1 +
 extras/contrib/src/Makefile                        |   12 +++++++++++-
 .../src/Patches/ffmpeg-avcodec-no-thumb.patch      |   10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 9f37796..4b50bc9 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -264,6 +264,7 @@ case $HOST in
             EXTRA_CFLAGS=" -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a"
             EXTRA_CLFAGS="$EXTRA_CFLAGS -mfpu=vfp"
             EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -mthumb-interwork"
+            echo 'HAVE_ISA_THUMB = 1' >> config.mak
         fi
     ;;
     *86_64*linux*)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 48a0464..ca9540c 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -171,6 +171,10 @@ endif
 X264CONF += --enable-pic
 endif
 
+ifdef HAVE_ISA_THUMB
+NOTHUMB ?= -mno-thumb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -677,7 +681,7 @@ ifdef HAVE_DARWIN_OS
 endif
 
 .mad: libmad
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3 $(NOTHUMB)" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1026,6 +1030,9 @@ ffmpeg:
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
+ifdef HAVE_ISA_THUMB
+	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
+endif
 ifdef HAVE_WINCE
 	patch -p1 < Patches/ffmpeg-svn-wince.patch
 endif
@@ -1085,6 +1092,9 @@ else
 .ffmpeg: ffmpeg .lame .gsm
 endif
 endif
+ifdef HAVE_ISA_THUMB
+	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
+endif
 	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS)" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
 	touch $@
 
diff --git a/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch b/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch
new file mode 100644
index 0000000..21b51a5
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch
@@ -0,0 +1,10 @@
+Index: ffmpeg/libavcodec/Makefile
+===================================================================
+--- ffmpeg/libavcodec/Makefile	(révision 19635)
++++ ffmpeg/libavcodec/Makefile	(copie de travail)
+@@ -1,4 +1,5 @@
+ include $(SUBDIR)../config.mak
++CFLAGS+=-mno-thumb
+ 
+ NAME = avcodec
+ FFLIBS = avutil