Fri Aug 2 17:16:33 2019 UTC ()
fasttracker2: Update to b163

Changes since b162

Beta #163 - 29.07.2019
- SDL updated from v2.0.9 to v2.0.10
- Bugfix: Don't unmute channels when loading a new song (FT2 behavior)
- Bugfix: Disk Op. didn't list correct kB/MB/GB filesizes (1000 vs. 1024)
  + rounding upwards on kB/MB/GB sizes.
- The Trim screen is a bit cleaner looking now
- Instrument slots are now allocated as needed (FT2 behavior). This new
  behavior means little to the user, but makes it easier for me to port the FT2
  code more directly when it works like this. This also means that XMs are
  now saved exactly the same way FT2 does it, except for certain uninitialized
  instrument header fields (FT2 bug) being set to zero.
- Updated the help text


(fox)
diff -r1.32 -r1.33 pkgsrc/audio/fasttracker2/Makefile
diff -r1.32 -r1.33 pkgsrc/audio/fasttracker2/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c
cvs diff -r1.32 -r1.33 pkgsrc/audio/fasttracker2/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/fasttracker2/Makefile 2019/07/30 00:06:50 1.32
+++ pkgsrc/audio/fasttracker2/Makefile 2019/08/02 17:16:33 1.33
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.32 2019/07/30 00:06:50 fox Exp $ 1# $NetBSD: Makefile,v 1.33 2019/08/02 17:16:33 fox Exp $
2 2
3DISTNAME= ft2clone-${DISTVERSION}-code 3DISTNAME= ft2clone-${DISTVERSION}-code
4PKGNAME= fasttracker2-${DISTVERSION:C/b/2./} 4PKGNAME= fasttracker2-${DISTVERSION:C/b/2./}
5DISTVERSION= b162 5DISTVERSION= b163
6PKGREVISION= 2 
7CATEGORIES= audio 6CATEGORIES= audio
8MASTER_SITES= https://16-bits.org/ \ 7MASTER_SITES= https://16-bits.org/ \
9 ${MASTER_SITE_FREEBSD_LOCAL:=ehaupt/} 8 ${MASTER_SITE_FREEBSD_LOCAL:=ehaupt/}
10EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
11 10
12MAINTAINER= fox@NetBSD.org 11MAINTAINER= fox@NetBSD.org
13HOMEPAGE= https://16-bits.org/ 12HOMEPAGE= https://16-bits.org/
14COMMENT= Portable Fasttracker II clone in C using SDL 2 13COMMENT= Portable Fasttracker II clone in C using SDL 2
15LICENSE= modified-bsd AND cc-by-nc-sa-v4.0-license 14LICENSE= modified-bsd AND cc-by-nc-sa-v4.0-license
16 15
17WRKSRC= ${WRKDIR}/ft2-clone-code 16WRKSRC= ${WRKDIR}/ft2-clone-code
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19 18
cvs diff -r1.32 -r1.33 pkgsrc/audio/fasttracker2/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/fasttracker2/distinfo 2019/08/02 16:54:10 1.32
+++ pkgsrc/audio/fasttracker2/distinfo 2019/08/02 17:16:33 1.33
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.32 2019/08/02 16:54:10 fox Exp $ 1$NetBSD: distinfo,v 1.33 2019/08/02 17:16:33 fox Exp $
2 2
3SHA1 (ft2clone-b162-code.zip) = 4616581dac4cd8b498c88cad381dd9910b326390 3SHA1 (ft2clone-b163-code.zip) = 7403496ab648610ceb6638901e9ef5f2477b956c
4RMD160 (ft2clone-b162-code.zip) = a24993258f783e345f812f75a35a703154fb0aec 4RMD160 (ft2clone-b163-code.zip) = e5f948072d4b38365cb8a69e8ddf5def89178d5f
5SHA512 (ft2clone-b162-code.zip) = 4b85514aece028075e8e5017c3b0c26638f0c74e18ac669788393a03457cb903959a548de9b1ca249eab8e629e18503dd1a7519aa81645a26e8f25684c4ec817 5SHA512 (ft2clone-b163-code.zip) = 170c5817c22be8076386e22d89cc147185ca07f66cf566fb3d4cfae75416894a1546f3cb49e2128b9504e4fea2c6d59f224dfb5212b95f382b92e0bdad9e4b16
6Size (ft2clone-b162-code.zip) = 3953315 bytes 6Size (ft2clone-b163-code.zip) = 6015814 bytes
7SHA1 (patch-src_ft2__diskop.c) = 6ec7fe7e9bb13b3413cfe053f1609f8ca70c956f 7SHA1 (patch-src_ft2__diskop.c) = 6ec7fe7e9bb13b3413cfe053f1609f8ca70c956f
8SHA1 (patch-src_ft2__header.h) = a685ab05efdefe712bbe65b0a2b4ed41bc1e4670 8SHA1 (patch-src_ft2__header.h) = a685ab05efdefe712bbe65b0a2b4ed41bc1e4670
9SHA1 (patch-src_ft2__sample__ed.c) = b5f38a7df35e64a4c995bd9c1b213b587a0c500a 9SHA1 (patch-src_ft2__sample__ed.c) = ea642e75bc9333a41aa4de3bb558ee2d326b6544
10SHA1 (patch-src_ft2__unicode.c) = 1302d414cfdd35441a6cfad918d3663e4c14665b 10SHA1 (patch-src_ft2__unicode.c) = 1302d414cfdd35441a6cfad918d3663e4c14665b
cvs diff -r1.3 -r1.4 pkgsrc/audio/fasttracker2/patches/Attic/patch-src_ft2__sample__ed.c (expand / switch to unified diff)

--- pkgsrc/audio/fasttracker2/patches/Attic/patch-src_ft2__sample__ed.c 2019/08/02 16:54:10 1.3
+++ pkgsrc/audio/fasttracker2/patches/Attic/patch-src_ft2__sample__ed.c 2019/08/02 17:16:33 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-src_ft2__sample__ed.c,v 1.3 2019/08/02 16:54:10 fox Exp $ 1$NetBSD: patch-src_ft2__sample__ed.c,v 1.4 2019/08/02 17:16:33 fox Exp $
2 2
3Add the HAS_SSE macro so that build failures do not occur in i386 3Add the HAS_SSE macro so that build failures do not occur in i386
4systems that lack SSE support. 4systems that lack SSE support.
5 5
6For example: On i386, the compiler may be targeting a CPU that does 6For example: On i386, the compiler may be targeting a CPU that does
7not have SSE (e.g., on NetBSD, the i386 target is i486). fasttracker2 7not have SSE (e.g., on NetBSD, the i386 target is i486). fasttracker2
8various assembly pieces that use different CPU features. HAS_SSE macro 8various assembly pieces that use different CPU features. HAS_SSE macro
9needs to be set in systems which has these CPU features and compile 9needs to be set in systems which has these CPU features and compile
10correctly. 10correctly.
11 11
12Note: Contacted the upstream author regarding the patch and awaiting a 12Note: Contacted the upstream author regarding the patch and awaiting a
13reply. https://16-bits.org/ft2.php 13reply. https://16-bits.org/ft2.php
14 14
15--- src/ft2_sample_ed.c.orig 2019-07-22 16:27:23.010951973 +0000 15--- src/ft2_sample_ed.c.orig 2019-07-22 16:27:23.010951973 +0000
16+++ src/ft2_sample_ed.c 16+++ src/ft2_sample_ed.c
17@@ -689,7 +689,7 @@ static void sampleLine(int16_t x1, int16 17@@ -743,7 +743,7 @@ static void sampleLine(int16_t x1, int16
18  18
19 static void getMinMax16(const void *p, uint32_t scanLen, int16_t *min16, int16_t *max16) 19 static void getMinMax16(const void *p, uint32_t scanLen, int16_t *min16, int16_t *max16)
20 { 20 {
21-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__ 21-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__
22+#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__ 22+#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__
23 if (cpu.hasSSE2) 23 if (cpu.hasSSE2)
24 { 24 {
25 /* Taken with permission from the OpenMPT project (and slightly modified). 25 /* Taken with permission from the OpenMPT project (and slightly modified).
26@@ -775,7 +775,7 @@ static void getMinMax16(const void *p, u 26@@ -829,7 +829,7 @@ static void getMinMax16(const void *p, u
27  27
28 static void getMinMax8(const void *p, uint32_t scanLen, int8_t *min8, int8_t *max8) 28 static void getMinMax8(const void *p, uint32_t scanLen, int8_t *min8, int8_t *max8)
29 { 29 {
30-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__ 30-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__
31+#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__ 31+#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__
32 if (cpu.hasSSE2) 32 if (cpu.hasSSE2)
33 { 33 {
34 /* Taken with permission from the OpenMPT project (and slightly modified). 34 /* Taken with permission from the OpenMPT project (and slightly modified).