[mswin] misc changes to build scripts

git-svn-id: svn://svn.berlios.de/avidemux/branches/avidemux_2.6_branch_mean@7642 30592fff-cfd4-0310-bf0e-8235a3c7be26
szlldm · Nov 1, 2011 · 44e6dd7 · 44e6dd7
1 parent 5601778
commit 44e6dd7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/foreignBuilds/mswin/avidemux/Package Notes.xml b/foreignBuilds/mswin/avidemux/Package Notes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <log>
+  <buildentry revision="7604" date="2011-10-11" />
   <buildentry revision="7590" date="2011-09-28" />
   <buildentry revision="7573" date="2011-09-22">
     <comment>Updated x264 to r2085.</comment>

diff --git a/foreignBuilds/mswin/lame/Perform Build.bat b/foreignBuilds/mswin/lame/Perform Build.bat
@@ -17,15 +17,16 @@ verify >nul
 call "../Set Common Environment Variables"
 if errorlevel 1 goto end
 
-set package=lame-3.98.4.tar.gz
-set sourceFolder=lame-3.98.4-%BuildBits%
-set tarFolder=lame-3.98.4
+set version=3.99
+set package=lame-%version%.tar.gz
+set sourceFolder=lame-%version%-%BuildBits%
+set tarFolder=lame-%version%
 set curDir=%CD%
 
 if not exist %package% (
 	echo.
 	echo Downloading
-	wget http://sourceforge.net/projects/lame/files/lame/3.98.4/%package%/download/
+	wget http://sourceforge.net/projects/lame/files/lame/%version%/%package%/download/
 )
 
 if errorlevel 1 goto end
@@ -47,6 +48,10 @@ for /f "delims=" %%a in ('dir /b %tarFolder%') do (
   move "%CD%\%tarFolder%\%%a" "%CD%"
 )
 
+echo.
+echo Patching
+patch -p0 -i "%curDir%\vbrquantize.c.patch"
+
 echo.
 echo Configuring
 set CFLAGS=%CFLAGS% -O2

diff --git a/foreignBuilds/mswin/lame/vbrquantize.c.patch b/foreignBuilds/mswin/lame/vbrquantize.c.patch
@@ -0,0 +1,12 @@
+--- ./libmp3lame/vbrquantize.c.org	2011-05-07 17:05:17 +0100
++++ ./libmp3lame/vbrquantize.c	2011-11-01 14:08:17 +0000
+@@ -22,6 +22,9 @@
+
+ /* $Id: vbrquantize.c,v 1.141 2011/05/07 16:05:17 rbrito Exp $ */
+
++#undef FORCEINLINE
++#define FORCEINLINE
++
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+ #endif