CVS commit: pkgsrc/audio/fasttracker2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 31 22:33:50 UTC 2025

Modified Files:
        pkgsrc/audio/fasttracker2: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/fasttracker2/patches: patch-src_ft2__diskop.c

Log Message:
fasttracker2: Build fixes, clean up.

Verified to build on illumos, CentOS 7, FreeBSD, macOS by drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/audio/fasttracker2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/fasttracker2/PLIST
cvs rdiff -u -r1.118 -r1.119 pkgsrc/audio/fasttracker2/distinfo
cvs rdiff -u -r0 -r1.8 \
    pkgsrc/audio/fasttracker2/patches/patch-src_ft2__diskop.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.133 pkgsrc/audio/fasttracker2/Makefile:1.134
--- pkgsrc/audio/fasttracker2/Makefile:1.133    Mon Mar 10 09:23:31 2025
+++ pkgsrc/audio/fasttracker2/Makefile  Mon Mar 31 22:33:49 2025
@@ -1,41 +1,30 @@
-# $NetBSD: Makefile,v 1.133 2025/03/10 09:23:31 fox Exp $
+# $NetBSD: Makefile,v 1.134 2025/03/31 22:33:49 nia Exp $
 
 DISTNAME=      fasttracker2-1.95
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=8bitbubsy/}
 GITHUB_PROJECT=        ft2-clone
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-EXTRACT_USING= bsdtar
 
 MAINTAINER=    fox%NetBSD.org@localhost
 HOMEPAGE=      https://16-bits.org/
 COMMENT=       Portable Fasttracker II clone in C using SDL 2
 LICENSE=       modified-bsd AND cc-by-nc-sa-v4.0-license
 
-USE_LANGUAGES= c99 c++
+USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
+FORCE_C_STD=   gnu99
+
 CMAKE_CONFIGURE_ARGS+= -DEXTERNAL_LIBFLAC:BOOL=ON
 
 LDFLAGS+=      ${BUILDLINK_LDADD.iconv}
 
-TOOL_DEPENDS+= icoutils-[0-9]*:../../graphics/icoutils
-
-ICON_SIZES=    16 24 32 48 64 128 256
-
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/appdata
-.for s in ${ICON_SIZES}
-INSTALLATION_DIRS+=    share/icons/hicolor/${s}x${s}/apps
-.endfor
-
-pre-configure:
-.for s in ${ICON_SIZES}
-       cd ${WRKSRC} && ${PREFIX}/bin/icotool \
-           -w ${s} -h ${s} -x -o ${s}.png \
-           src/gfxdata/icon/ft2-clone.ico
-.endfor
+INSTALLATION_DIRS+=    share/pixmaps
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/release/other/ft2-clone \
@@ -44,20 +33,18 @@ do-install:
                ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA} ${FILESDIR}/fasttracker2.appdata.xml \
                ${DESTDIR}${PREFIX}/share/appdata
-.for s in ${ICON_SIZES}
-       ${INSTALL_DATA} ${WRKSRC}/${s}.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/fasttracker2.png
-.endfor
+       ${INSTALL_DATA} ${WRKSRC}/src/gfxdata/icon/ft2-clone.png \
+           ${DESTDIR}${PREFIX}/share/pixmaps/fasttracker2.png
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
-BUILDLINK_TRANSFORM+=  rm:-lasound
-.else
+.if ${OPSYS} == "Linux"
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../audio/flac/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+PTHREAD_OPTS?= require
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/fasttracker2/PLIST
diff -u pkgsrc/audio/fasttracker2/PLIST:1.3 pkgsrc/audio/fasttracker2/PLIST:1.4
--- pkgsrc/audio/fasttracker2/PLIST:1.3 Thu Oct  3 01:44:00 2019
+++ pkgsrc/audio/fasttracker2/PLIST     Mon Mar 31 22:33:49 2025
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2019/10/03 01:44:00 fox Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/03/31 22:33:49 nia Exp $
 bin/fasttracker2
 share/appdata/fasttracker2.appdata.xml
 share/applications/fasttracker2.desktop
-share/icons/hicolor/128x128/apps/fasttracker2.png
-share/icons/hicolor/16x16/apps/fasttracker2.png
-share/icons/hicolor/24x24/apps/fasttracker2.png
-share/icons/hicolor/256x256/apps/fasttracker2.png
-share/icons/hicolor/32x32/apps/fasttracker2.png
-share/icons/hicolor/48x48/apps/fasttracker2.png
-share/icons/hicolor/64x64/apps/fasttracker2.png
+share/pixmaps/fasttracker2.png

Index: pkgsrc/audio/fasttracker2/distinfo
diff -u pkgsrc/audio/fasttracker2/distinfo:1.118 pkgsrc/audio/fasttracker2/distinfo:1.119
--- pkgsrc/audio/fasttracker2/distinfo:1.118    Mon Mar 10 09:23:31 2025
+++ pkgsrc/audio/fasttracker2/distinfo  Mon Mar 31 22:33:49 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.118 2025/03/10 09:23:31 fox Exp $
+$NetBSD: distinfo,v 1.119 2025/03/31 22:33:49 nia Exp $
 
 BLAKE2s (fasttracker2-1.95.tar.gz) = 1ce4b73406c500bccaff7cba8e2e8616d86654d73d381175fe82baae1a6d62b0
 SHA512 (fasttracker2-1.95.tar.gz) = c8ccda7dbd866bddf27270173d36d6d8c77498e1bcb43a60bbbef74bfaeac5c3688e76906f86ff000bdb8628ccc2aa15c8665ba9377e225fca2b2598bac725e5
 Size (fasttracker2-1.95.tar.gz) = 5229238 bytes
 SHA1 (patch-CMakeLists.txt) = 95b3f8e836a98d2c75b9ae6db91bc528eeb9f17f
+SHA1 (patch-src_ft2__diskop.c) = 900e72818483db2f04f68e166200fd12d7ac1c65

Added files:

Index: pkgsrc/audio/fasttracker2/patches/patch-src_ft2__diskop.c
diff -u /dev/null pkgsrc/audio/fasttracker2/patches/patch-src_ft2__diskop.c:1.8
--- /dev/null   Mon Mar 31 22:33:50 2025
+++ pkgsrc/audio/fasttracker2/patches/patch-src_ft2__diskop.c   Mon Mar 31 22:33:49 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_ft2__diskop.c,v 1.8 2025/03/31 22:33:49 nia Exp $
+
+Fix build with older glibc which does not like fts.h being included
+when _FILE_OFFSET_BITS is defined.
+
+--- src/ft2_diskop.c.orig      2025-03-31 21:27:31.508418094 +0000
++++ src/ft2_diskop.c
+@@ -3,7 +3,9 @@
+ #include <crtdbg.h>
+ #endif
+ 
++#ifndef __linux
+ #define _FILE_OFFSET_BITS 64
++#endif
+ 
+ #include <stdint.h>
+ #include <stdio.h>