yoshimi: update to 1.5.10.
This commit is contained in:
parent
a3cc25b011
commit
5e0f4a0357
3 changed files with 18 additions and 62 deletions
|
@ -1,57 +0,0 @@
|
|||
--- src/CMakeLists.txt.orig 2017-10-15 22:35:17.000000000 +0200
|
||||
+++ src/CMakeLists.txt 2017-10-22 18:09:47.997475553 +0200
|
||||
@@ -105,7 +105,7 @@
|
||||
|
||||
set (BuildOptionsBasic
|
||||
"-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
|
||||
- CACHE STRING "basic X86 complier options"
|
||||
+ CACHE STRING "basic X86 compiler options"
|
||||
)
|
||||
|
||||
set (BuildOptionsDebug
|
||||
@@ -118,6 +118,34 @@
|
||||
message(FATAL_ERROR "pkg-config required but not found")
|
||||
endif (PKG_CONFIG_FOUND)
|
||||
|
||||
+include (CheckFunctionExists)
|
||||
+# musl systems don’t have random_r() and also need argp-standalone
|
||||
+check_function_exists(random_r randomR)
|
||||
+
|
||||
+if (randomR)
|
||||
+ add_definitions(-DHAVE_RANDOM_R)
|
||||
+endif(randomR)
|
||||
+
|
||||
+check_c_source_compiles (
|
||||
+ "#include <argp.h>
|
||||
+ int main () {
|
||||
+ int argc=1;
|
||||
+ char *argv[]={\"test\"};
|
||||
+ argp_parse(0,argc,argv,0,0,0);
|
||||
+ return 0;
|
||||
+ }" LIBC_HAS_ARGP
|
||||
+)
|
||||
+
|
||||
+if (NOT LIBC_HAS_ARGP)
|
||||
+ message(STATUS "libc does not have argp")
|
||||
+ find_library (ARGP_LIB argp REQUIRED)
|
||||
+ if (ARGP_LIB)
|
||||
+ message(STATUS "Found libargp")
|
||||
+ else(ARGP_LIB)
|
||||
+ message(FATAL_ERROR "libargp required but not found")
|
||||
+ endif(ARGP_LIB)
|
||||
+endif(NOT LIBC_HAS_ARGP)
|
||||
+
|
||||
# libz
|
||||
set (CMAKE_REQUIRED_LIBRARIES z)
|
||||
check_c_source_compiles (
|
||||
@@ -497,6 +525,10 @@
|
||||
|
||||
target_link_libraries (yoshimi ${ExternLibraries})
|
||||
|
||||
+if (ARGP_LIB)
|
||||
+ target_link_libraries (yoshimi ${ARGP_LIB})
|
||||
+endif(ARGP_LIB)
|
||||
+
|
||||
install (TARGETS yoshimi RUNTIME DESTINATION bin)
|
||||
|
||||
install (DIRECTORY ../banks DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yoshimi
|
13
srcpkgs/yoshimi/patches/musl.patch
Normal file
13
srcpkgs/yoshimi/patches/musl.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git src/Misc/RandomGen.h src/Misc/RandomGen.h
|
||||
index 29aeb48..f7c90f8 100644
|
||||
--- src/Misc/RandomGen.h
|
||||
+++ src/Misc/RandomGen.h
|
||||
@@ -187,7 +187,7 @@ class JenkinsPRNG
|
||||
}
|
||||
|
||||
private:
|
||||
- uint32_t rot(uint32_t x, uint k) { return (x << k)|(x >> (32-k)); }
|
||||
+ uint32_t rot(uint32_t x, unsigned int k) { return (x << k)|(x >> (32-k)); }
|
||||
};
|
||||
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
# Template file for 'yoshimi'
|
||||
pkgname=yoshimi
|
||||
version=1.5.9
|
||||
version=1.5.10
|
||||
revision=1
|
||||
build_style=cmake
|
||||
build_wrksrc=src
|
||||
build_style=cmake
|
||||
hostmakedepends="pkg-config fltk"
|
||||
makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel
|
||||
lv2 readline-devel ncurses-devel"
|
||||
short_desc="ZynAddSubFX fork with improved JACK audio & MIDI IO"
|
||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
||||
license="GPL-3"
|
||||
homepage="http://yoshimi.sourceforge.net"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="https://yoshimi.github.io/"
|
||||
distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
|
||||
checksum=fe8064f556062eeacd2521ad1f8f1816cfdccfee2083320577936f6bc93ca74e
|
||||
checksum=551ea274dd12a62551c595639d57c6c63a02a233cd7c3f65372f82ae5dcb2d98
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl) makedepends+=" argp-standalone";;
|
||||
|
|
Loading…
Reference in a new issue