CVS commit: pkgsrc/audio/fasttracker2

["Santhosh Raju" <fox%netbsd.org@localhost>]

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.29 -r1.30 pkgsrc/audio/fasttracker2/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/fasttracker2/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.29 pkgsrc/audio/fasttracker2/Makefile:1.30
--- pkgsrc/audio/fasttracker2/Makefile:1.29     Sat Jul 13 21:39:34 2019
+++ pkgsrc/audio/fasttracker2/Makefile  Mon Jul 22 23:38:47 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2019/07/13 21:39:34 fox Exp $
+# $NetBSD: Makefile,v 1.30 2019/07/22 23:38:47 fox Exp $
 
 DISTNAME=      ft2clone-${DISTVERSION}-code
 PKGNAME=       fasttracker2-${DISTVERSION:C/b/2./}
 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.28 pkgsrc/audio/fasttracker2/distinfo:1.29
--- pkgsrc/audio/fasttracker2/distinfo:1.28     Sat Jul 13 21:39:34 2019
+++ pkgsrc/audio/fasttracker2/distinfo  Mon Jul 22 23:38:47 2019
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.28 2019/07/13 21:39:34 fox Exp $
+$NetBSD: distinfo,v 1.29 2019/07/22 23:38:47 fox Exp $
 
 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.1
--- /dev/null   Mon Jul 22 23:38:47 2019
+++ pkgsrc/audio/fasttracker2/patches/patch-src_ft2__header.h   Mon Jul 22 23:38:47 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_ft2__header.h,v 1.1 2019/07/22 23:38:47 fox 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.1
--- /dev/null   Mon Jul 22 23:38:47 2019
+++ pkgsrc/audio/fasttracker2/patches/patch-src_ft2__sample__ed.c       Mon Jul 22 23:38:47 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_ft2__sample__ed.c,v 1.1 2019/07/22 23:38:47 fox 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).