[SCM] csound/master: Enable lua opcodes
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Mon Sep 2 04:39:28 UTC 2013
The following commit has been merged in the master branch:
commit a943b6d4e9ed4c861184f410b00fe9b5dedc527f
Author: Felipe Sateler <fsateler at debian.org>
Date: Wed Aug 28 18:41:02 2013 -0400
Enable lua opcodes
Find lua5.1 before csound tries to find luajit.
luajit is not available on all archs
diff --git a/debian/Custom.cmake b/debian/Custom.cmake
index 9f2c860..b14dac9 100644
--- a/debian/Custom.cmake
+++ b/debian/Custom.cmake
@@ -5,6 +5,8 @@ set(PYTHON_MODULE_INSTALL_DIR "@PYLIBPATH@")
#set(JAVA_MODULE_INSTALL_DIR "")
set(LUA_MODULE_INSTALL_DIR "lib/lua/5.1/")
set(EIGEN3_INCLUDE_DIR "/usr/include/")
+find_library(LUAJIT_LIBRARIES lua5.1)
+set(LUAJIT_INCLUDE_DIR "/usr/include/lua5.1")
# Enable optimizations
add_compiler_flags("-ftree-vectorize -ffast-math -O3")
diff --git a/debian/libcsound64-6.0.install b/debian/libcsound64-6.0.install
index 53bdc5d..d515ee4 100644
--- a/debian/libcsound64-6.0.install
+++ b/debian/libcsound64-6.0.install
@@ -16,6 +16,7 @@ usr/lib/csound/plugins*/libjacko.so
usr/lib/csound/plugins*/libjackTransport.so
usr/lib/csound/plugins*/libjoystick.so
usr/lib/csound/plugins*/liblinear_algebra.so
+usr/lib/csound/plugins*/libLuaCsound.so
usr/lib/csound/plugins*/libmixer.so
usr/lib/csound/plugins*/libosc.so
usr/lib/csound/plugins*/libplaterev.so
diff --git a/debian/rules b/debian/rules
index 4f205e5..a025ab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ DEB_CMAKE_EXTRA_FLAGS += \
-DBUILD_OSC_OPCODES=ON \
-DBUILD_IMAGE_OPCODES=ON \
-DBUILD_PYTHON_OPCODES=ON \
- -DBUILD_LUA_OPCODES=OFF \
+ -DBUILD_LUA_OPCODES=ON \
-DBUILD_PD_CLASS=ON \
-DBUILD_WIIMOTE_OPCODES=OFF \
-DBUILD_P5GLOVE_OPCODES=OFF \
--
csound packaging
More information about the pkg-multimedia-commits
mailing list