CVS commit: [pkgsrc-2019Q2] pkgsrc/audio/fasttracker2

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jul 23 13:05:46 UTC 2019

Modified Files:
        pkgsrc/audio/fasttracker2 [pkgsrc-2019Q2]: Makefile distinfo
Added Files:
        pkgsrc/audio/fasttracker2/patches [pkgsrc-2019Q2]:
            patch-src_ft2__header.h patch-src_ft2__sample__ed.c

Log Message:
Pullup ticket #6011 - requested by fox
audio/fasttracker2: update, i386 build fix

Revisions pulled up:
- audio/fasttracker2/Makefile                                   1.28-1.30
- audio/fasttracker2/distinfo                                   1.27-1.29
- audio/fasttracker2/patches/patch-src_ft2__header.h            1.1
- audio/fasttracker2/patches/patch-src_ft2__sample__ed.c        1.1

---
   Module Name:    pkgsrc
   Committed By:   fox
   Date:           Sat Jul  6 16:11:35 UTC 2019

   Modified Files:
           pkgsrc/audio/fasttracker2: Makefile distinfo

   Log Message:
   fasttracker2: update to b161

   Changes since b160

   Beta #161 - 04.07.2019
   - Bugfix: If you held down a sample data loop pin while a system request was
     about to be shown, the loop pins would act strange lateron.
   - Bugfix: Fixed a MIDI-related memory leak when pressing "Load config." in the
     Config screen.
   - Bugfix: The palette editor scrollbar thumbs would not draw properly when
     dragging them.
   - Bugfix: Attempting to sample in stereo (Smp. Ed.) at the last sample slot
     would result in a crash.
   - Bugfix: Using keyboard shortcuts to interact with a system request/message
     could trigger an unwanted "note key up" event after the box closed. (déjà vu)
   - The palette editor is now rewritten to behave exactly like original FT2
   - Code cleanup
   - Updated src\gfxdata\bmp\readme.txt

---
   Module Name:    pkgsrc
   Committed By:   fox
   Date:           Sat Jul 13 21:39:35 UTC 2019

   Modified Files:
           pkgsrc/audio/fasttracker2: Makefile distinfo

   Log Message:
   fasttracker2: update to b162

   Changes since b161

   Beta #162 - 12.07.2019
   - Added a "Hardware mouse" option in Config -> Layout
   - Changed the help text a little ("Problems/FAQ" and "Known bugs")

---
   Module Name:    pkgsrc
   Committed By:   fox
   Date:           Mon Jul 22 23:38:47 UTC 2019

   Modified Files:
           pkgsrc/audio/fasttracker2: Makefile distinfo
   Added Files:
           pkgsrc/audio/fasttracker2/patches: patch-src_ft2__header.h
               patch-src_ft2__sample__ed.c

   Log Message:
   fasttracker2: Fixes build failures.

   Fixes build failures in i386 platforms where SSE option is not available.

   Fix suggested by leot%NetBSD.org@localhost


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.2.1 pkgsrc/audio/fasttracker2/Makefile
cvs rdiff -u -r1.26 -r1.26.2.1 pkgsrc/audio/fasttracker2/distinfo
cvs rdiff -u -r0 -r1.2.2.2 \
    pkgsrc/audio/fasttracker2/patches/patch-src_ft2__header.h \
    pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/fasttracker2/Makefile
diff -u pkgsrc/audio/fasttracker2/Makefile:1.27 pkgsrc/audio/fasttracker2/Makefile:1.27.2.1
--- pkgsrc/audio/fasttracker2/Makefile:1.27     Thu Jun 20 11:39:06 2019
+++ pkgsrc/audio/fasttracker2/Makefile  Tue Jul 23 13:05:45 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2019/06/20 11:39:06 fox Exp $
+# $NetBSD: Makefile,v 1.27.2.1 2019/07/23 13:05:45 bsiegert Exp $
 
 DISTNAME=      ft2clone-${DISTVERSION}-code
 PKGNAME=       fasttracker2-${DISTVERSION:C/b/2./}
-DISTVERSION=   b160
+DISTVERSION=   b162
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  https://16-bits.org/ \
                ${MASTER_SITE_FREEBSD_LOCAL:=ehaupt/}

Index: pkgsrc/audio/fasttracker2/distinfo
diff -u pkgsrc/audio/fasttracker2/distinfo:1.26 pkgsrc/audio/fasttracker2/distinfo:1.26.2.1
--- pkgsrc/audio/fasttracker2/distinfo:1.26     Thu Jun 20 11:39:06 2019
+++ pkgsrc/audio/fasttracker2/distinfo  Tue Jul 23 13:05:45 2019
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.26 2019/06/20 11:39:06 fox Exp $
+$NetBSD: distinfo,v 1.26.2.1 2019/07/23 13:05:45 bsiegert Exp $
 
-SHA1 (ft2clone-b160-code.zip) = 4d98b6c27fd730961385dc0a98dbacd0096538ba
-RMD160 (ft2clone-b160-code.zip) = 304076cf25d6e97b045f186a7211119fe1d0c894
-SHA512 (ft2clone-b160-code.zip) = cd74a115e0907a3b96d8cfb7e7e7ea47a5f11b032f5ab4a6c070483facb60a46ab994b9682cc37dc45ce13bcd81f2085089232a4d0368ac6a5b763369b791efa
-Size (ft2clone-b160-code.zip) = 3954825 bytes
+SHA1 (ft2clone-b162-code.zip) = 4616581dac4cd8b498c88cad381dd9910b326390
+RMD160 (ft2clone-b162-code.zip) = a24993258f783e345f812f75a35a703154fb0aec
+SHA512 (ft2clone-b162-code.zip) = 4b85514aece028075e8e5017c3b0c26638f0c74e18ac669788393a03457cb903959a548de9b1ca249eab8e629e18503dd1a7519aa81645a26e8f25684c4ec817
+Size (ft2clone-b162-code.zip) = 3953315 bytes
 SHA1 (patch-src_ft2__diskop.c) = 0ade49429ec36d44b6cb6bc3b829317fcd08df81
+SHA1 (patch-src_ft2__header.h) = d1a575cfb4bb0c3c384686fad2346cc8929d88c5
+SHA1 (patch-src_ft2__sample__ed.c) = aa7acc6c3061049cdfee8024dec2e417521c5fc8
 SHA1 (patch-src_ft2__unicode.c) = 3dca4d5b2de1a2794bde7060d2f7bf6f4923c91c

Added files:

Index: pkgsrc/audio/fasttracker2/patches/patch-src_ft2__header.h
diff -u /dev/null pkgsrc/audio/fasttracker2/patches/patch-src_ft2__header.h:1.2.2.2
--- /dev/null   Tue Jul 23 13:05:46 2019
+++ pkgsrc/audio/fasttracker2/patches/patch-src_ft2__header.h   Tue Jul 23 13:05:46 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_ft2__header.h,v 1.2.2.2 2019/07/23 13:05:46 bsiegert Exp $
+
+Add the HAS_SSE macro so that build failures do not occur in i386
+systems that lack SSE support.
+
+Suggestion by leot@
+
+--- src/ft2_header.h.orig      2019-07-22 16:21:07.522137321 +0000
++++ src/ft2_header.h
+@@ -77,7 +77,7 @@
+ #define float2int32_round(i, f) (i = _mm_cvt_ss2si(_mm_load_ss(&f)))
+ #define double2int32_round(i, d) (i = _mm_cvtsd_si32(_mm_load_sd(&d)))
+ 
+-#elif defined _WIN32 || defined __i386__ // may have SSE and SSE2
++#elif defined HAS_SSE && (defined _WIN32 || defined __i386__) // may have SSE and SSE2
+ 
+ #define float2int32_round(i, f) \
+       if (cpu.hasSSE) \
Index: pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c
diff -u /dev/null pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c:1.2.2.2
--- /dev/null   Tue Jul 23 13:05:46 2019
+++ pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c       Tue Jul 23 13:05:46 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_ft2__sample__ed.c,v 1.2.2.2 2019/07/23 13:05:46 bsiegert Exp $
+
+Add the HAS_SSE macro so that build failures do not occur in i386
+systems that lack SSE support.
+
+Suggestion by leot@
+
+--- src/ft2_sample_ed.c.orig   2019-07-22 16:27:23.010951973 +0000
++++ src/ft2_sample_ed.c
+@@ -689,7 +689,7 @@ static void sampleLine(int16_t x1, int16
+ 
+ static void getMinMax16(const void *p, uint32_t scanLen, int16_t *min16, int16_t *max16)
+ {
+-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__
++#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__
+       if (cpu.hasSSE2)
+       {
+               /* Taken with permission from the OpenMPT project (and slightly modified).
+@@ -775,7 +775,7 @@ static void getMinMax16(const void *p, u
+ 
+ static void getMinMax8(const void *p, uint32_t scanLen, int8_t *min8, int8_t *max8)
+ {
+-#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__
++#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__
+       if (cpu.hasSSE2)
+       {
+               /* Taken with permission from the OpenMPT project (and slightly modified).