csound: fix musl, license, homepage; revbump
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller
parent
b2dd50e5de
commit
e36e8652cf
3 changed files with 106 additions and 10 deletions
95
srcpkgs/csound/patches/musl-strncpy.patch
Normal file
95
srcpkgs/csound/patches/musl-strncpy.patch
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
--- Engine/csound_orc_semantics.c.orig 2018-09-24 20:32:36.504698465 +0200
|
||||||
|
+++ Engine/csound_orc_semantics.c 2018-09-24 20:33:24.792695587 +0200
|
||||||
|
@@ -70,7 +70,7 @@
|
||||||
|
retVal = csound->Malloc(csound, len + 1);
|
||||||
|
|
||||||
|
if (len > 0) {
|
||||||
|
- strncpy(retVal, str, len);
|
||||||
|
+ memcpy(retVal, str, len);
|
||||||
|
}
|
||||||
|
retVal[len] = '\0';
|
||||||
|
|
||||||
|
@@ -389,8 +389,8 @@
|
||||||
|
len2 = strlen(argTypeRight);
|
||||||
|
inArgTypes = csound->Malloc(csound, len1 + len2 + 1);
|
||||||
|
|
||||||
|
- strncpy(inArgTypes, argTypeLeft, len1);
|
||||||
|
- strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||||
|
+ memcpy(inArgTypes, argTypeLeft, len1);
|
||||||
|
+ memcpy(inArgTypes + len1, argTypeRight, len2);
|
||||||
|
|
||||||
|
inArgTypes[len1 + len2] = '\0';
|
||||||
|
|
||||||
|
@@ -447,8 +447,8 @@
|
||||||
|
len2 = strlen(argTypeRight);
|
||||||
|
inArgTypes = csound->Malloc(csound, len1 + len2 + 1);
|
||||||
|
|
||||||
|
- strncpy(inArgTypes, argTypeLeft, len1);
|
||||||
|
- strncpy(inArgTypes + len1, argTypeRight, len2);
|
||||||
|
+ memcpy(inArgTypes, argTypeLeft, len1);
|
||||||
|
+ memcpy(inArgTypes + len1, argTypeRight, len2);
|
||||||
|
|
||||||
|
inArgTypes[len1 + len2] = '\0';
|
||||||
|
|
||||||
|
--- util1/csd_util/cs.c.orig 2018-09-24 20:42:03.578664665 +0200
|
||||||
|
+++ util1/csd_util/cs.c 2018-09-24 20:44:51.364654664 +0200
|
||||||
|
@@ -112,7 +112,7 @@
|
||||||
|
strcpy(dir, "./");
|
||||||
|
#endif
|
||||||
|
else {
|
||||||
|
- strncpy(dir, fullname, m + 1);
|
||||||
|
+ memcpy(dir, fullname, m + 1);
|
||||||
|
dir[m + 1] = '\0';
|
||||||
|
}
|
||||||
|
/* base name */
|
||||||
|
@@ -385,7 +385,8 @@
|
||||||
|
while (--j) {
|
||||||
|
i++;
|
||||||
|
if (argv[i][0] != '-' && i < 3 && tmp[0] == '\0') {
|
||||||
|
- strncpy(tmp, argv[i],256);
|
||||||
|
+ memcpy(tmp, argv[i], sizeof(tmp));
|
||||||
|
+ tmp[sizeof(tmp) - 1] = '\0';
|
||||||
|
/* strip extension */
|
||||||
|
if (is_orc(tmp) || is_sco(tmp) || is_mid(tmp) || is_csd(tmp))
|
||||||
|
tmp[strlen(tmp) - 4] = '\0';
|
||||||
|
@@ -427,20 +428,24 @@
|
||||||
|
/* first, search environment variables, based on option list */
|
||||||
|
/* (the last option has the highest precedence) */
|
||||||
|
s = getenv("CSOUND");
|
||||||
|
- if (s != NULL) /* get default setting from CSOUND, if available */
|
||||||
|
- strncpy(tmp, s, 256);
|
||||||
|
+ if (s != NULL) { /* get default setting from CSOUND, if available */
|
||||||
|
+ memcpy(tmp, s, sizeof(tmp));
|
||||||
|
+ tmp[sizeof(tmp) - 1] = '\0';
|
||||||
|
+ }
|
||||||
|
for (i = (int) strlen(optlst); --i >= 0; ) {
|
||||||
|
sprintf(tmp2, "CSOUND_%c", optlst[i]);
|
||||||
|
s = getenv(tmp2);
|
||||||
|
if (s != NULL) {
|
||||||
|
- strncpy(tmp, s, 256);
|
||||||
|
+ memcpy(tmp, s, sizeof(tmp));
|
||||||
|
+ tmp[sizeof(tmp) - 1] = '\0';
|
||||||
|
if (tmp[0] != '\0') break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* if nothing was found, use default settings */
|
||||||
|
if (tmp[0] == '\0') {
|
||||||
|
- if (opts[17]) strncpy(tmp, default_csnd_r, 256);
|
||||||
|
- else strncpy(tmp, default_csnd, 256);
|
||||||
|
+ if (opts[17]) memcpy(tmp, default_csnd_r, sizeof(default_csnd_r));
|
||||||
|
+ else memcpy(tmp, default_csnd, sizeof(default_csnd));
|
||||||
|
+ tmp[sizeof(tmp) - 1] = '\0';
|
||||||
|
}
|
||||||
|
/* convert this to a list of quoted options */
|
||||||
|
s2 = cmdline;
|
||||||
|
--- util1/scot/scot.c.orig 2018-09-24 21:04:03.987585962 +0200
|
||||||
|
+++ util1/scot/scot.c 2018-09-24 21:04:47.448583372 +0200
|
||||||
|
@@ -684,7 +684,7 @@
|
||||||
|
|
||||||
|
ps = findparam(n, ptop);
|
||||||
|
if (strcmp(s, "."))
|
||||||
|
- strncpy(ps, s, 1+strlen(s));
|
||||||
|
+ memcpy(ps, s, 1+strlen(s));
|
||||||
|
}
|
||||||
|
|
||||||
|
static /* returns pointer to */
|
||||||
|
|
@ -1,21 +1,22 @@
|
||||||
# Template file for 'csound'
|
# Template file for 'csound'
|
||||||
pkgname=csound
|
pkgname=csound
|
||||||
version=6.11.0
|
version=6.11.0
|
||||||
revision=1
|
revision=2
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="
|
configure_args="
|
||||||
-DLUA_MODULE_INSTALL_DIR=/usr/lib/lua/5.1
|
-DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1
|
||||||
-DDPD_MODULE_INSTALL_DIR=/usr/lib/pd/extra"
|
-DDPD_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/pd/extra
|
||||||
hostmakedepends="python flex"
|
-DPORTAUDIO_V19=yes"
|
||||||
makedepends="pd-devel fltk-devel fluidsynth-devel liblo-devel portaudio-devel
|
hostmakedepends="flex python"
|
||||||
portmidi-devel tk-devel libcurl-devel LuaJIT-devel boost-devel libgomp-devel
|
makedepends="LuaJIT-devel boost-devel fltk-devel fluidsynth-devel libcurl-devel
|
||||||
libsndfile-devel"
|
libgomp-devel liblo-devel libsndfile-devel pd-devel portaudio-devel
|
||||||
|
portmidi-devel tk-devel"
|
||||||
depends="pd"
|
depends="pd"
|
||||||
short_desc="A programming language for sound rendering and signal processing"
|
short_desc="A programming language for sound rendering and signal processing"
|
||||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
||||||
license="LGPL-3"
|
license="LGPL-2.1-or-later"
|
||||||
homepage="http://csound.github.io"
|
homepage="https://csound.com/"
|
||||||
distfiles="https://github.com/$pkgname/$pkgname/archive/$version.tar.gz"
|
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
|
||||||
checksum=f47df73ff270faa70bf53bad68edc85b2dc5623b9c73d06054cd03f5d3332dc0
|
checksum=f47df73ff270faa70bf53bad68edc85b2dc5623b9c73d06054cd03f5d3332dc0
|
||||||
nocross=yes
|
nocross=yes
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue