[vlc-commits] contribs: use fixed-point for faad2 iff !HAVE_FPU

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 30 15:14:22 2011 +0300| [a1f22537bd827f2ab738fc9360028c65a9714ff6] | committer: Rémi Denis-Courmont

contribs: use fixed-point for faad2 iff !HAVE_FPU

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

 .../faad2/{arm-fixed.patch => faad2-fixed.patch}   |    4 +---
 contrib/src/faad2/rules.mak                        |    7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/src/faad2/arm-fixed.patch b/contrib/src/faad2/faad2-fixed.patch
similarity index 86%
rename from contrib/src/faad2/arm-fixed.patch
rename to contrib/src/faad2/faad2-fixed.patch
index 966d97d..1c65743 100644
--- a/contrib/src/faad2/arm-fixed.patch
+++ b/contrib/src/faad2/faad2-fixed.patch
@@ -1,13 +1,11 @@
 diff -ru faad2-2.7/libfaad/common.h faad2/libfaad/common.h
 --- faad2-2.7/libfaad/common.h  2009-02-05 02:51:03.000000000 +0200
 +++ faad2/libfaad/common.h      2009-09-01 20:41:20.000000000 +0300
-@@ -79,6 +79,10 @@
+@@ -79,6 +79,8 @@
  #define FIXED_POINT
  #endif
  
-+#ifdef __arm__
 +#define FIXED_POINT
-+#endif
 +
  #define ERROR_RESILIENCE
  
diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak
index 87724ba..1cf4ed6 100644
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -12,12 +12,15 @@ $(TARBALLS)/faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz .sum-faad2
 	$(UNPACK)
-	(cd $@-$(FAAD2_VERSION); echo|$(CC) -iquote . -E - || sed -i 's/-iquote /-I/' libfaad/Makefile.am; autoreconf -ivf)
-	patch -p0 < $(SRC)/faad2/arm-fixed.patch
+ifndef HAVE_FPU
+	(cd $@-$(FAAD2_VERSION) && patch -p1) < $(SRC)/faad2/faad2-fixed.patch
+endif
+	(cd $@-$(FAAD2_VERSION) && $(CC) -iquote . -E - </dev/null || sed -i 's/-iquote /-I/' libfaad/Makefile.am)
 	mv $@-$(FAAD2_VERSION) $@
 	touch $@
 
 .faad2: faad2
+	cd $< && autoreconf -fiv
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)"
 	cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
 	cd $</libfaad && $(MAKE) install