From 0beca24c4269798cd0ec0d713280e0efffff98c1 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 2 Nov 2019 00:20:14 +0100 Subject: [PATCH] csound, bump version (#4319) --- media-sound/csound/csound-6.13.0.recipe | 141 +++++++++++++++++ .../csound/patches/csound-6.13.0.patchset | 145 ++++++++++++++++++ 2 files changed, 286 insertions(+) create mode 100644 media-sound/csound/csound-6.13.0.recipe create mode 100644 media-sound/csound/patches/csound-6.13.0.patchset diff --git a/media-sound/csound/csound-6.13.0.recipe b/media-sound/csound/csound-6.13.0.recipe new file mode 100644 index 000000000..15e598d46 --- /dev/null +++ b/media-sound/csound/csound-6.13.0.recipe @@ -0,0 +1,141 @@ +SUMMARY="A sound processing language and software synthesizer" +DESCRIPTION="Csound is a user-programmable and user-extensible sound processing \ +language and software synthesizer. It is not restricted to any style of music, \ +having been used for many years in at least classical, pop, techno, and ambient." +HOMEPAGE="https://github.com/csound/csound" +COPYRIGHT="1991 Barry L. Vercoe + 1991-2019 The Csound Developers" +LICENSE="GNU LGPL v2.1" +REVISION="1" +SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="183beeb3b720bfeab6cc8af12fbec0bf9fef2727684ac79289fd12d0dfee728b" +SOURCE_FILENAME="csound-$portVersion.tar.gz" +PATCHES="csound-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/python2.7/site-packages directory keep-old + " + +libVersion="6.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + csound$secondaryArchSuffix = $portVersion + cmd:atsa + cmd:cs + cmd:csanalyze + cmd:csb64enc + cmd:csbeats + cmd:csdebugger + cmd:csound + cmd:cvanal + cmd:dnoise + cmd:envext + cmd:extract + cmd:extractor + cmd:het_export + cmd:het_import + cmd:hetro + cmd:lpanal + cmd:lpc_export + cmd:lpc_import + cmd:makecsd + cmd:mixer + cmd:pv_export + cmd:pv_import + cmd:pvanal + cmd:pvlook + cmd:scale + cmd:scot + cmd:scsort + cmd:sdif2ad + cmd:sndinfo + cmd:src_conv + cmd:srconv + lib:libcsnd6$secondaryArchSuffix = $libVersionCompat + lib:libcsound64$secondaryArchSuffix = $libVersionCompat + lib:luaCsnd6$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libfluidsynth$secondaryArchSuffix + lib:libhdf5$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:liblo$secondaryArchSuffix + lib:liblua$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libsamplerate$secondaryArchSuffix + lib:libsndfile$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + csound${secondaryArchSuffix}_devel = $portVersion + devel:libcsnd6$secondaryArchSuffix = $libVersionCompat + devel:libcsound64$secondaryArchSuffix = $libVersionCompat + devel:luaCsnd6$secondaryArchSuffix + " +REQUIRES_devel=" + csound$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libfluidsynth$secondaryArchSuffix + devel:libhdf5$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:liblo$secondaryArchSuffix + devel:liblua$secondaryArchSuffix >= 5.1 + devel:libpng16$secondaryArchSuffix + devel:libsamplerate$secondaryArchSuffix + devel:libsndfile$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:bison + cmd:cmake + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:git + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:python2.7 + cmd:swig$secondaryArchSuffix + " + +PYTHON_VERSION=2.7 + +defineDebugInfoPackage csound$secondaryArchSuffix \ + $libDir/luaCsnd6.so + +BUILD() +{ + mkdir -p build && cd build + cmake .. \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_INSTALL_BINDIR=$prefix/bin \ + -DCMAKE_INSTALL_LIBDIR=$libDir \ + -DCMAKE_INSTALL_LOCALEDIR=$dataDir/locale \ + -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ + -DCMAKE_INSTALL_MODULEDIR=$dataDir/cmake/Modules/Csound \ + -DPYTHON_MODULE_INSTALL_DIR="$prefix/non-packaged/lib/python$PYTHON_VERSION/site-packages" + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + prepareInstalledDevelLibs libcsnd6 libcsound64 luaCsnd6 + + packageEntries devel \ + $developDir \ + $dataDir/cmake +} diff --git a/media-sound/csound/patches/csound-6.13.0.patchset b/media-sound/csound/patches/csound-6.13.0.patchset new file mode 100644 index 000000000..b892e0c4a --- /dev/null +++ b/media-sound/csound/patches/csound-6.13.0.patchset @@ -0,0 +1,145 @@ +From e9a832dffcc9800f0111a2a5584eb3b0b599887d Mon Sep 17 00:00:00 2001 +From: begasus +Date: Thu, 3 Oct 2019 11:17:18 +0200 +Subject: Fix Haiku's defenitions to int types (Fix by PeteCA) + + +diff --git a/InOut/ipmidi.c b/InOut/ipmidi.c +index 49338f6..1910e2c 100644 +--- a/InOut/ipmidi.c ++++ b/InOut/ipmidi.c +@@ -23,6 +23,9 @@ + + /* Realtime MIDI using ipmidi library */ + ++/* Haiku 'int32' etc definitions in net headers conflict with sysdep.h */ ++#define __HAIKU_CONFLICT ++ + #include + #ifdef WIN32 + #include +diff --git a/Opcodes/OSC.c b/Opcodes/OSC.c +index 4f77966..4f6e7ab 100644 +--- a/Opcodes/OSC.c ++++ b/Opcodes/OSC.c +@@ -22,6 +22,9 @@ + 02110-1301 USA + */ + ++/* Haiku 'int32' etc definitions in net headers conflict with sysdep.h */ ++#define __HAIKU_CONFLICT ++ + #include "csdl.h" + #include + #include +diff --git a/Opcodes/sockrecv.c b/Opcodes/sockrecv.c +index 757f2cc..4784e92 100644 +--- a/Opcodes/sockrecv.c ++++ b/Opcodes/sockrecv.c +@@ -21,6 +21,9 @@ + 02110-1301 USA + */ + ++/* Haiku 'int32' etc definitions in net headers conflict with sysdep.h */ ++#define __HAIKU_CONFLICT ++ + #include "csoundCore.h" + #include + #include +diff --git a/Opcodes/socksend.c b/Opcodes/socksend.c +index 273c344..542b2be 100644 +--- a/Opcodes/socksend.c ++++ b/Opcodes/socksend.c +@@ -22,6 +22,9 @@ + 02110-1301 USA + */ + ++/* Haiku 'int32' etc definitions in net headers conflict with sysdep.h */ ++#define __HAIKU_CONFLICT ++ + #include "csoundCore.h" + #include + #if defined(WIN32) && !defined(__CYGWIN__) +diff --git a/Top/server.c b/Top/server.c +index ff4be9a..5754e9f 100644 +--- a/Top/server.c ++++ b/Top/server.c +@@ -24,6 +24,9 @@ + typedef unsigned int u_int32_t; + #endif + ++/* Haiku 'int32' etc definitions in net headers conflict with sysdep.h */ ++#define __HAIKU_CONFLICT ++ + #include "csoundCore.h" + #if defined(WIN32) && !defined(__CYGWIN__) + #include +diff --git a/include/sysdep.h b/include/sysdep.h +index 932b091..40aebb4 100644 +--- a/include/sysdep.h ++++ b/include/sysdep.h +@@ -89,8 +89,10 @@ typedef unsigned __int32 uint32; + typedef unsigned __int16 uint16; + #else + #include +-#ifndef __HAIKU_CONFLICT +-/* Haiku has different typedefs -- only relevant to rthaiku */ ++#if defined(__HAIKU__) && defined(__HAIKU_CONFLICT) ++/* Haiku has different typedefs -- relevant to rthaiku and network*/ ++#include ++#else + typedef int_least32_t int32; + typedef int_least16_t int16; + typedef uint_least32_t uint32; +-- +2.23.0 + + +From ed27266009ae7889140cfc05005956206cbbbb81 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Thu, 3 Oct 2019 15:19:09 +0200 +Subject: Fix install paths + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c1db25..b9cb1fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,10 +20,16 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(APIVERSION "6.0") + + # Relative install paths +-set(EXECUTABLE_INSTALL_DIR "bin") ++set (CMAKE_INSTALL_BINDIR=bin) ++set (CMAKE_INSTALL_LIBDIR=lib) ++set (CMAKE_INSTALL_LOCALEDIR=share/locale) ++set (CMAKE_INSTALL_INCLUDEDIR=include/csound) ++set (CMAKE_INSTALL_MODULEDIR=share/cmake/Csound) + +-set(LOCALE_INSTALL_DIR "share/locale") +-set(HEADER_INSTALL_DIR "include/csound") ++set(EXECUTABLE_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) ++ ++set(LOCALE_INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}) ++set(HEADER_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) + + set(CS_FRAMEWORK_DEST "~/Library/Frameworks" CACHE PATH "Csound framework path") + include(TestBigEndian) +@@ -191,7 +197,7 @@ if(USE_LIB64) + set(LIBRARY_INSTALL_DIR "lib64") + add_definitions("-DLIB64") + else() +- set(LIBRARY_INSTALL_DIR "lib") ++ set(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) + endif() + message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}") + +@@ -1487,4 +1493,4 @@ endif(DOXYGEN_FOUND) + + # install CMake module + install(FILES ${CMAKE_SOURCE_DIR}/cmake/Modules/FindCsound.cmake +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/cmake/Csound") ++ DESTINATION "${CMAKE_INSTALL_MODULEDIR}") +-- +2.23.0 +