Merge pull request #1181 from Zoomulator/master

New application: Milkytracker v0.90.85
This commit is contained in:
cillianderoiste 2013-11-07 02:54:32 -08:00
commit ed67672aac
4 changed files with 67 additions and 0 deletions

View File

@ -63,4 +63,5 @@
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
zef = "Zef Hemel <zef@zef.me>";
zoomulator = "Kim Simmons <zoomulator@gmail.com>";
}

View File

@ -0,0 +1,20 @@
https://bugs.archlinux.org/task/31324
https://410333.bugs.gentoo.org/attachment.cgi?id=322456
diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp
--- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200
+++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200
@@ -57,11 +57,11 @@
bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
{
- gzFile *gz_input_file = NULL;
+ gzFile gz_input_file = NULL;
int len = 0;
pp_uint8 *buf;
- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
return false;
if ((buf = new pp_uint8[0x10000]) == NULL)

View File

@ -0,0 +1,44 @@
{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl
, zlib, zziplib
}:
stdenv.mkDerivation rec {
version = "0.90.85";
name = "milkytracker-${version}";
src = fetchurl {
url = "http://milkytracker.org/files/milkytracker-0.90.85.tar.gz";
sha256 = "184pk0k9nv461a61sh6lb62wfadjwwk8ri3z5kpdbqnyssz0zfpv";
};
# Get two official patches.
no_zzip_patch = fetchurl {
url = "http://www.milkytracker.org/files/patches-0.90.85/no_zziplib_dep.patch";
sha256 = "1w550q7pxa7w6v2v19ljk03hayacrs6y887izg11a1983wk7qzb3";
};
fix_64bit_patch = fetchurl {
url = "http://www.milkytracker.org/files/patches-0.90.85/64bit_freebsd_fix.patch";
sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6";
};
patchPhase = ''
patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch}
patch < ${no_zzip_patch}
patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch}
'';
preBuild=''
export CPATH=${zlib}/lib
'';
buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II.";
homepage = http://milkytracker.org;
license = stdenv.lib.licenses.gpl3Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.zoomulator ];
};
}

View File

@ -7331,6 +7331,8 @@ let
audacity = callPackage ../applications/audio/audacity { };
milkytracker = callPackage ../applications/audio/milkytracker { };
aumix = callPackage ../applications/audio/aumix {
gtkGUI = false;
};