[vlc-commits] contribs: fix lame build on win64

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov  3 10:30:36 2011 -0400| [c484413099d309030ef4eb7c870feb55f83b1104] | committer: Rafaël Carré

contribs: fix lame build on win64

mingw-w64 FORCEINLINE definition includes 'extern'

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

 contrib/src/lame/lame-win64.patch           |   14 ++++++++++++++
 contrib/src/lame/rules.mak                  |    3 +++
 extras/contrib/src/Patches/lame-win64.patch |   14 ++++++++++++++
 extras/contrib/src/contrib-src.mak          |    3 +++
 4 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/contrib/src/lame/lame-win64.patch b/contrib/src/lame/lame-win64.patch
new file mode 100644
index 0000000..d2a2a1b
--- /dev/null
+++ b/contrib/src/lame/lame-win64.patch
@@ -0,0 +1,14 @@
+--- lame/libmp3lame/vbrquantize.c.orig	2011-11-03 10:26:28.414360800 -0400
++++ lame/libmp3lame/vbrquantize.c	2011-11-03 10:26:30.478371043 -0400
+@@ -81,6 +81,11 @@
+ #define FORCEINLINE
+ #endif
+ 
++#ifdef WIN64
++#undef FORCEINLINE
++#define FORCEINLINE __inline__ __attribute__((always_inline))
++#endif
++
+ typedef VOLATILE union {
+     float   f;
+     int     i;
diff --git a/contrib/src/lame/rules.mak b/contrib/src/lame/rules.mak
index 960d7d3..14a04b4 100644
--- a/contrib/src/lame/rules.mak
+++ b/contrib/src/lame/rules.mak
@@ -10,6 +10,9 @@ $(TARBALLS)/lame-$(LAME_VERSION).tar.gz:
 
 lame: lame-$(LAME_VERSION).tar.gz .sum-lame
 	$(UNPACK)
+ifdef HAVE_WIN64
+	$(APPLY) $(SRC)/lame/lame-win64.patch
+endif
 	$(MOVE)
 
 .lame: lame
diff --git a/extras/contrib/src/Patches/lame-win64.patch b/extras/contrib/src/Patches/lame-win64.patch
new file mode 100644
index 0000000..d2a2a1b
--- /dev/null
+++ b/extras/contrib/src/Patches/lame-win64.patch
@@ -0,0 +1,14 @@
+--- lame/libmp3lame/vbrquantize.c.orig	2011-11-03 10:26:28.414360800 -0400
++++ lame/libmp3lame/vbrquantize.c	2011-11-03 10:26:30.478371043 -0400
+@@ -81,6 +81,11 @@
+ #define FORCEINLINE
+ #endif
+ 
++#ifdef WIN64
++#undef FORCEINLINE
++#define FORCEINLINE __inline__ __attribute__((always_inline))
++#endif
++
+ typedef VOLATILE union {
+     float   f;
+     int     i;
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index bf4ce38..951dd63 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -872,6 +872,9 @@ lame-$(LAME_VERSION).tar.gz:
 
 lame: lame-$(LAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_WIN64
+	patch -p0 < Patches/lame-win64.patch
+endif
 
 .lame: lame
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-analyser-hooks --disable-decoder --disable-shared --disable-gtktest --disable-frontend && make && make install)