* update libtwolame to 0.3.9 allows a simplification of our patch, as darwin9 linker...

diff --git a/extras/contrib/src/Patches/twolame-osx.patch b/extras/contrib/src/Patches/twolame-osx.patch
index c9eecfaf611ce997c953754adc69241c7edd36ee..463d679ba321b556059f5b1de0fe22bf4ac97c07 100644 (file)
--- a/extras/contrib/src/Patches/twolame-osx.patch
+++ b/extras/contrib/src/Patches/twolame-osx.patch
@@ -1,23 +1,16 @@
---- twolame.orig/libtwolame/bitbuffer.c        2006-05-23 19:27:49.000000000 +0200
-+++ twolame/libtwolame/bitbuffer.c     2007-01-06 17:04:49.000000000 +0100
-@@ -73,7 +73,7 @@
- }
- 
- /*write N bits into the bit stream */
--inline void buffer_putbits (bit_stream * bs, unsigned int val, int N)
-+void buffer_putbits (bit_stream * bs, unsigned int val, int N)
- {
-       static const int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
-       register int j = N;
-
---- twolame.orig/libtwolame/bitbuffer.h        2006-05-23 19:27:49.000000000 +0200
-+++ twolame/libtwolame/bitbuffer.h     2007-01-06 17:04:56.000000000 +0100
-@@ -40,7 +40,7 @@
- void buffer_deinit( bit_stream ** bs );
+--- twolame.orig/libtwolame/common.h   2006-12-31 03:34:32.000000000 +0100
++++ twolame/libtwolame/common.h        2007-01-06 17:48:01.000000000 +0100
+@@ -33,9 +33,12 @@
+ #define NO_DLL_INLINE
+ #else
+ #include "config.h"
++#ifdef __APPLE__
++#define NO_DLL_INLINE
++#else
+ #define NO_DLL_INLINE inline
+ #endif
+-
++#endif
  
- void buffer_put1bit (bit_stream *, int);
--inline void buffer_putbits (bit_stream *, unsigned int, int);
-+void buffer_putbits (bit_stream *, unsigned int, int);
- unsigned long buffer_sstell (bit_stream *);
+ #include "twolame.h"
  
- #endif

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 9d8a1fe87c259baba45740e52c3611a6ff210921..7113f6c1c20c12ac3e3fd7ba611fcd0b2a75e073 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -140,7 +140,7 @@ LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win
 GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
 MOZILLA_VERSION=1.7.5
 MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
-TWOLAME_VERSION=0.3.8
+TWOLAME_VERSION=0.3.9
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
 X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz