[vlc-commits] contrib: prefer PIC for a52

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug  3 13:25:20 2011 +0300| [bb4910905c969ec50df1ea0b66790f1f0169a73b] | committer: Rémi Denis-Courmont

contrib: prefer PIC for a52

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

 contrib/src/a52/liba52-pic.patch |   13 +++++++++++++
 contrib/src/a52/rules.mak        |    3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/contrib/src/a52/liba52-pic.patch b/contrib/src/a52/liba52-pic.patch
new file mode 100644
index 0000000..910d956
--- /dev/null
+++ b/contrib/src/a52/liba52-pic.patch
@@ -0,0 +1,13 @@
+diff -ru a52dec.orig/liba52/configure.incl a52dec/liba52/configure.incl
+--- a52dec.orig/liba52/configure.incl	2011-08-03 13:22:24.000000000 +0300
++++ a52dec/liba52/configure.incl	2011-08-03 13:22:46.000000000 +0300
+@@ -1,9 +1,6 @@
+ AC_SUBST([LIBA52_CFLAGS])
+ AC_SUBST([LIBA52_LIBS])
+ 
+-dnl avoid -fPIC when possible
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+-
+ AC_ARG_ENABLE([double],
+     [  --enable-double         use double-precision samples])
+ if test x"$enable_double" = x"yes"; then
diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index d84a7b3..a0c9d71 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -12,15 +12,14 @@ $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
 
 a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
 	$(UNPACK)
+	$(APPLY) $(SRC)/a52/liba52-pic.patch
 ifndef HAVE_FPU
 	$(APPLY) $(SRC)/a52/liba52-fixed.diff
 endif
 	$(MOVE)
 
 .a52: a52dec
-ifdef HAVE_WIN64
 	$(RECONF)
-endif
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $</liba52 && $(MAKE) install
 	cd $</include && $(MAKE) install