[SCM] csound/master: Enable the new Lua opcodes

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3198bb5163b2bcf0aac7e6a8881f0a0045db23f8
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Oct 22 19:40:15 2011 -0300

    Enable the new Lua opcodes

diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index ee25968..49dc8fc 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -1,7 +1,9 @@
-Description: Do not link against lua library
+Description: Only link to lua when necessary, and to the correct lib
  Lua policy recommends not linking against the lua library, because it
  doesn't help at all. All lua-using programs will load the library, not
  the modules.
+ The csound-lua bridge, on the other hand, needs to link to the library or
+ else it will fail to load. Use the correct library name.
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
@@ -14,6 +16,15 @@ Author: Felipe Sateler <fsateler at gmail.com>
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
+@@ -2063,7 +2063,7 @@
+     
+     if getPlatform() == 'linux':
+        if(luaFound == 1):
+-         luaEnvironment.Append(LIBS = ['lua51'])
++         luaEnvironment.Append(LIBS = ['lua5.1'])
+          luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+     elif getPlatform() == 'win32':
+        if(luaFound == 1):
 @@ -2413,7 +2413,7 @@
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
         else:
diff --git a/debian/rules b/debian/rules
index e1cf50c..6068839 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ DEB_SCONS_OPTIONS += \
 	buildPythonWrapper=1 \
 	pythonVersion=$(cdbs_python_current_version) \
 	buildLuaWrapper=1 \
-	buildLuaOpcodes=0 \
+	buildLuaOpcodes=1 \
 	buildTclcsound=1 \
 	tclversion=$(TCLVERSION) \
 	buildPDClass=1

-- 
csound packaging