[SCM] csound/master: Backport luajit cmake variable fix

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Thu Aug 15 00:07:14 UTC 2013


The following commit has been merged in the master branch:
commit 6b067a37f44d9a5818d0581ba9755bb6a886966f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Aug 14 18:31:32 2013 -0400

    Backport luajit cmake variable fix

diff --git a/debian/patches/0001-lua-luajit.diff b/debian/patches/0001-lua-luajit.diff
new file mode 100644
index 0000000..a86ad62
--- /dev/null
+++ b/debian/patches/0001-lua-luajit.diff
@@ -0,0 +1,29 @@
+--- a/Opcodes/CMakeLists.txt
++++ b/Opcodes/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set(Python_ADDITIONAL_VERSIONS 2.7)
+ find_package(PythonLibs)
+ 
+-find_library(LUA_LIBRARIES luajit)
++find_library(LUAJIT_LIBRARIES luajit)
+ check_include_file(wiiuse.h WIIUSE_H)
+ find_library(WIIUSE_LIB wiiuse)
+ check_include_file(p5glove.h P5GLOVE_H)
+@@ -139,13 +139,13 @@
+ endif()
+ 
+ # this is broken at the moment
+-check_deps(BUILD_LUA_OPCODES LUA_LIBRARIES)
++check_deps(BUILD_LUA_OPCODES LUAJIT_LIBRARIES)
+ if(BUILD_LUA_OPCODES)
+-        find_path(LUA_INCLUDE_DIR  lua.h
++    find_path(LUAJIT_INCLUDE_DIR  lua.h
+             /usr/include/luajit-2.0
+             /usr/local/include/luajit-2.0)
+-        include_directories(${LUA_INCLUDE_DIR})
+-        make_plugin(LuaCsound LuaCsound.cpp ${LUA_LIBRARIES})
++        include_directories(${LUAJIT_INCLUDE_DIR})
++        make_plugin(LuaCsound LuaCsound.cpp ${LUAJIT_LIBRARIES})
+         add_compiler_flags(${OpenMP_CXX_FLAGS} TARGETS LuaCsound)
+         add_compiler_flags(${OpenMP_CXX_FLAGS} TARGETS LuaCsound LINKER)
+         endif()
diff --git a/debian/patches/series b/debian/patches/series
index b5c3ace..78dd284 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0000-cmake-flags-fixes.patch
+0001-lua-luajit.diff
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2004-fix-gettext.diff

-- 
csound packaging



More information about the pkg-multimedia-commits mailing list