csound: Upgrade 6.1.3 -> 6.1.5

* That version builds fine with gcc10/-fno-common * Fix meta-python2 leftover Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2026-09-12 03:49:32 +02:00 · 2020-09-06 17:43:01 +02:00
parent ab1c458591
commit 06b3fa48d1
4 changed files with 86 additions and 64 deletions
--- a/recipes-musicians/csound/csound/0001-Do-not-set-include-path-to-usr-local-include.patch
+++ b/recipes-musicians/csound/csound/0001-Do-not-set-include-path-to-usr-local-include.patch
@@ -1,6 +1,6 @@
 From 1ae6204460552d524398765ca3931f73c7647472 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 20 May 2018 20:22:21 +0200
+Date: Sun, 6 Sep 2020 16:39:30 +0200
 Subject: [PATCH] Do not set include path to /usr/local/include
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 2 deletions(-)

 diff --git a/InOut/CMakeLists.txt b/InOut/CMakeLists.txt
-index 9422575e3..535528c83 100644
+index 0ec1dc8c8..97ddf8d14 100644
 --- a/InOut/CMakeLists.txt
 +++ b/InOut/CMakeLists.txt
-@@ -16,8 +16,6 @@ option(USE_FLTK "Use FLTK for graphs and widget opcodes" ON)
+@@ -15,8 +15,6 @@ option(USE_AUDIOUNIT "Build the CoreAudio AudioUnit I/O module (requires CoreAud
+ option(USE_FLTK "Use FLTK for graphs and widget opcodes" ON)
 option(BUILD_VIRTUAL_KEYBOARD "Build Virtual MIDI keyboard" ON)
- option(NEED_PORTTIME "porttime library separate from portmidi" ON)
 
-set(CMAKE_REQUIRED_INCLUDES /usr/local/include)
+-list(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
 -
 # FIND LIBRARIES AND HEADERS
 
- if(USE_ALSA)
+ if(USE_ALSA AND LINUX)
 -- 
-2.14.3
+2.26.2

--- a/recipes-musicians/csound/csound/0002-use-standard-plugins-path.patch
+++ b/recipes-musicians/csound/csound/0002-use-standard-plugins-path.patch
@@ -0,0 +1,68 @@
+From d707f174bb67b5b1d8a4ab00b024990a07dc5e37 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 1 Feb 2018 09:29:23 +0000
+Subject: [PATCH 3/4] use standard plugins path
+
+Stolen from [1]
+
+[1] https://src.fedoraproject.org/rpms/csound/tree/master
+
+Upstream-Status: Pending
+---
+ CMakeLists.txt              | 8 +-------
+ Top/csmodule.c              | 4 ++--
+ installer/misc/mkpackage.py | 2 +-
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c1db25d5..ee88ca66f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -198,13 +198,7 @@
+ endif()
+ message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
+ 
+-if(USE_DOUBLE)
+-    message(STATUS "Building with 64-bit floats")
+-    set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}")
+-else()
+-    message(STATUS "Building with 32-bit floats")
+-    set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+-endif()
+set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ 
+ execute_process (
+     COMMAND python -c
+diff --git a/Top/csmodule.c b/Top/csmodule.c
+index 21381b9f0..0a16616b1 100644
+--- a/Top/csmodule.c
+++ b/Top/csmodule.c
+@@ -159,9 +159,9 @@ static  const   char    *plugindir64_envvar = "OPCODE6DIR64";
+ #  define ENABLE_OPCODEDIR_WARNINGS 0
+ #  ifndef CS_DEFAULT_PLUGINDIR
+ #    ifndef USE_DOUBLE
+-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib/csound/plugins"
+ #    else
+-#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins64"
+#      define CS_DEFAULT_PLUGINDIR  "/usr/lib64/csound/plugins"
+ #    endif
+ #  endif
+ #endif
+diff --git a/installer/misc/mkpackage.py b/installer/misc/mkpackage.py
+index 801311b18..fe3d86077 100755
+--- a/installer/misc/mkpackage.py
+++ b/installer/misc/mkpackage.py
+@@ -27,7 +27,7 @@ libDir2     = libDir + '/csound/lib'
+ # single precision plugin libraries
+ pluginDir32 = libDir + '/csound/plugins'
+ # double precision plugin libraries
+-pluginDir64 = libDir + '/csound/plugins64'
+pluginDir64 = libDir + '/csound/plugins'
+ # documentation
+ docDir      = instPrefix + '/share/doc/csound'
+ # tclcsound.so
+-- 
+2.21.0
+
+
--- a/recipes-musicians/csound/csound_git.bb
+++ b/recipes-musicians/csound/csound_git.bb
@@ -9,7 +9,7 @@ DEPENDS += " \
    flex-native \
    bison-native \
    swig-native \
-    python \
+    python3 \
    alsa-lib \
    libsndfile1 \
    portaudio-v19 \
@@ -25,20 +25,21 @@ DEPENDS += " \
 "

 SRC_URI = " \
-    git://github.com/csound/csound.git \
+    git://github.com/csound/csound.git;branch=develop \
    file://0001-Do-not-set-include-path-to-usr-local-include.patch \
-    file://0002-Do-not-use-try_run-for-portaudio.patch \
+    file://0002-use-standard-plugins-path.patch \
 "
-SRCREV = "297845a370b8b5e1b555a60a0be3c5c757599530"
+SRCREV = "18c2c7897425f462b9a7743cee157cb410c88198"
 S = "${WORKDIR}/git"
-PV = "6.13.0"
+PV = "6.15.0"

 # Where to get lua-version from?
 LUA_VERSION = "5.3"

 EXTRA_OECMAKE += " \
    -DUSE_DOUBLE=OFF \
-    -DPYTHON_MODULE_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \
+    -DPYTHON_MODULE_INSTALL_DIR:STRING=${PYTHON_SITEPACKAGES_DIR} \
+    -DPYTHON3_MODULE_INSTALL_DIR:STRING=${PYTHON_SITEPACKAGES_DIR} \
    -DUSE_LIB64=${@bb.utils.contains("baselib", "lib64", "ON", "OFF",d)} \
 "

@@ -49,9 +50,13 @@ PACKAGECONFIG[luajit] = "-DLUA_MODULE_INSTALL_DIR=${libdir}/lua/${LUA_VERSION},,
 PACKAGES =+ " \
    ${PN}-python \
    ${PN}-luajit \
+    ${PN}-samples \
 "

 FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
 RDEPENDS_${PN}-python += "python3-core"

 FILES_${PN}-luajit = "${libdir}/lua"
+
+FILES_${PN}-samples = "${datadir}/samples"
+
--- a/recipes-musicians/csound/files/0002-Do-not-use-try_run-for-portaudio.patch
+++ b/recipes-musicians/csound/files/0002-Do-not-use-try_run-for-portaudio.patch
@@ -1,51 +0,0 @@
-From 70b48196f3f2eb7a8cd2b21a3c39986bdb24bff2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 20 May 2018 20:59:59 +0200
-Subject: [PATCH] Do not use try_run for portaudio
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- InOut/CMakeLists.txt | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/InOut/CMakeLists.txt b/InOut/CMakeLists.txt
-index 9422575e3..7590a8c01 100644
--- a/InOut/CMakeLists.txt
-+++ b/InOut/CMakeLists.txt
-@@ -27,19 +27,6 @@ endif()
- if(USE_PORTAUDIO)
-     find_path(PORTAUDIO_INCLUDE_PATH portaudio.h)
-     find_library(PORTAUDIO_LIBRARY NAMES portaudio portaudio_x64)
-
-    if(PORTAUDIO_INCLUDE_PATH AND PORTAUDIO_LIBRARY)
-        try_run(PORTAUDIO_V19 PORTAUDIO_TEST_COMPILED
-            ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/portaudio_test.c
-            CMAKE_FLAGS -DLINK_LIBRARIES:STRING=${PORTAUDIO_LIBRARY}
-            COMPILE_DEFINITIONS "-I${PORTAUDIO_INCLUDE_PATH}"
-            COMPILE_OUTPUT_VARIABLE OUTPUT)
-        if(NOT PORTAUDIO_TEST_COMPILED AND NOT WIN32)
-            set(PORTAUDIO_V19 false)
-        endif()
-    else()
-        set(PORTAUDIO_V19 false)
-    endif()
- endif()
- if(USE_PORTMIDI)
-     find_path(PORTMIDI_INCLUDE_PATH portmidi.h)
-@@ -117,7 +117,7 @@ endif()
- if(WIN32)
-     check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY)
- else()
-    check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY PORTAUDIO_TEST_COMPILED)
-+    check_deps(USE_PORTAUDIO PORTAUDIO_INCLUDE_PATH PORTAUDIO_LIBRARY)
- endif()
- if(USE_PORTAUDIO AND PORTAUDIO_V19 MATCHES 1)
-     message(STATUS "Building rtpa module.")
-- 
-2.14.3
-