From 695749c59dcf62502fdc7c9ef3438086331e712c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 31 Jul 2019 14:05:55 +0200 Subject: chuck: 1.3.5.2 -> 1.4.0.0 --- pkgs/applications/audio/chuck/clang.patch | 58 ----------------------- pkgs/applications/audio/chuck/darwin-limits.patch | 4 +- pkgs/applications/audio/chuck/default.nix | 13 +++-- 3 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 pkgs/applications/audio/chuck/clang.patch (limited to 'pkgs/applications/audio') diff --git a/pkgs/applications/audio/chuck/clang.patch b/pkgs/applications/audio/chuck/clang.patch deleted file mode 100644 index 77227ef0fd44..000000000000 --- a/pkgs/applications/audio/chuck/clang.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/ugen_osc.cpp b/src/ugen_osc.cpp -index 6b93c6b..dbefe4f 100644 ---- a/src/ugen_osc.cpp -+++ b/src/ugen_osc.cpp -@@ -1232,7 +1232,7 @@ CK_DLL_CTRL( gen5_coeffs ) - Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(in_args<0) return; -+ if(in_args!=0) return; - size = in_args->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1287,7 +1287,7 @@ CK_DLL_CTRL( gen7_coeffs ) - Chuck_Array8 * in_args = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(in_args<0) return; -+ if(in_args!=0) return; - size = in_args->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1340,7 +1340,7 @@ CK_DLL_CTRL( gen9_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1390,7 +1390,7 @@ CK_DLL_CTRL( gen10_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen10coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1441,7 +1441,7 @@ CK_DLL_CTRL( gen17_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen17coeffs, %d\n", weights); -- if(weights<0) return; -+ if(weights!=0) return; - size = weights->size(); - if(size >= genX_MAX_COEFFS) size = genX_MAX_COEFFS - 1; - -@@ -1502,7 +1502,7 @@ CK_DLL_CTRL( curve_coeffs ) - Chuck_Array8 * weights = (Chuck_Array8 *)GET_CK_OBJECT(ARGS); - - // fprintf(stdout, "calling gen17coeffs, %d\n", weights); -- if(weights<0) goto done; -+ if(weights!=0) goto done; - - nargs = weights->size(); - if (nargs < 5 || (nargs % 3) != 2) { // check number of args diff --git a/pkgs/applications/audio/chuck/darwin-limits.patch b/pkgs/applications/audio/chuck/darwin-limits.patch index 3387f7255441..dc98a1726913 100644 --- a/pkgs/applications/audio/chuck/darwin-limits.patch +++ b/pkgs/applications/audio/chuck/darwin-limits.patch @@ -1,5 +1,5 @@ ---- a/src/util_string.cpp 2014-10-27 22:52:11.875981552 +0100 -+++ b/src/util_string.cpp 2014-10-27 22:54:18.613001994 +0100 +--- a/src/core/util_string.cpp 2014-10-27 22:52:11.875981552 +0100 ++++ b/src/core/util_string.cpp 2014-10-27 22:54:18.613001994 +0100 @@ -40,6 +40,10 @@ #include #endif // __PLATFORM_LINUX__ diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6113a776a672..da26a7188357 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.5.2"; + version = "1.4.0.0"; name = "chuck-${version}"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079"; + sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; }; nativeBuildInputs = [ flex bison which ]; @@ -17,16 +17,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) alsaLib ++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ]; - patches = [ ./clang.patch ./darwin-limits.patch ]; + patches = [ ./darwin-limits.patch ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' - substituteInPlace src/makefile --replace "/usr/bin" "$out/bin" - substituteInPlace src/makefile.osx \ + substituteInPlace src/core/makefile.x/makefile.osx \ --replace "weak_framework" "framework" \ - --replace "MACOSX_DEPLOYMENT_TARGET=10.5" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" + --replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" ''; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { description = "Programming language for real-time sound synthesis and music creation"; homepage = http://chuck.cs.princeton.edu; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; }; } -- cgit 1.4.1