contribs: fix lame build on win64

mingw-w64 FORCEINLINE definition includes 'extern'

diff --git a/contrib/src/lame/lame-win64.patch b/contrib/src/lame/lame-win64.patch
new file mode 100644 (file)
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 960d7d3ca10e81dafc828eef43f697b981cce98f..14a04b4b794a74c3fa4ea1347b4d71babebc5102 100644 (file)
--- 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 (file)
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 bf4ce38ab619ee2a2b79736696304cc8a9c216b7..951dd639100e6ec002ec2e5a0f7b19d3e9fb84e1 100644 (file)
--- 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)