[vlc-commits] contrib: fix lame on Win32 with mingw-w64

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov  6 11:16:48 2011 +0200| [1683e21e3f22415bdcdeaa2c29345192cfade399] | committer: Rémi Denis-Courmont

contrib: fix lame on Win32 with mingw-w64

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

 contrib/src/lame/lame-forceinline.patch |   15 +++++++++++++++
 contrib/src/lame/lame-win64.patch       |   14 --------------
 contrib/src/lame/rules.mak              |    4 +---
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/contrib/src/lame/lame-forceinline.patch b/contrib/src/lame/lame-forceinline.patch
new file mode 100644
index 0000000..883fc6d
--- /dev/null
+++ b/contrib/src/lame/lame-forceinline.patch
@@ -0,0 +1,15 @@
+diff -ru lame.orig/libmp3lame/vbrquantize.c lame/libmp3lame/vbrquantize.c
+--- lame.orig/libmp3lame/vbrquantize.c	2011-11-06 11:12:40.000000000 +0200
++++ lame/libmp3lame/vbrquantize.c	2011-11-06 11:14:52.000000000 +0200
+@@ -73,6 +73,11 @@
+ #    define FORCEINLINE __forceinline
+ #  endif
+ #  endif
++#elif defined (WIN32)
++#  define VOLATILE
++/* Make sure FORCEINLINE does not include "extern" */
++#  undef FORCEINLINE
++#  define FORCEINLINE __inline__ __attribute__((always_inline))
+ #else
+ #  define VOLATILE
+ #endif
diff --git a/contrib/src/lame/lame-win64.patch b/contrib/src/lame/lame-win64.patch
deleted file mode 100644
index d2a2a1b..0000000
--- a/contrib/src/lame/lame-win64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 14a04b4..370c9ea 100644
--- a/contrib/src/lame/rules.mak
+++ b/contrib/src/lame/rules.mak
@@ -10,9 +10,7 @@ $(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
+	$(APPLY) $(SRC)/lame/lame-forceinline.patch
 	$(MOVE)
 
 .lame: lame