pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/dosbox-staging
Module Name: pkgsrc
Committed By: vins
Date: Sun Dec 14 10:07:19 UTC 2025
Modified Files:
pkgsrc/emulators/dosbox-staging: Makefile distinfo
Added Files:
pkgsrc/emulators/dosbox-staging: MESSAGE.NetBSD options.mk
pkgsrc/emulators/dosbox-staging/patches:
patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp
patch-include_support.h patch-src_dos_drives.cpp
Log Message:
emulators/dosbox-staging: some changes
* Fix build on SunOS.
* Support ALSA on Linux and make it optional. Also, enable fluidsynth
support as an opt-out pkg option.
* Import MESSAGE for NetBSD form emulators/dosbox. Likely still needed.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/dosbox-staging/MESSAGE.NetBSD \
pkgsrc/emulators/dosbox-staging/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/dosbox-staging/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/dosbox-staging/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/emulators/dosbox-staging/patches/patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp \
pkgsrc/emulators/dosbox-staging/patches/patch-include_support.h \
pkgsrc/emulators/dosbox-staging/patches/patch-src_dos_drives.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/emulators/dosbox-staging/Makefile
diff -u pkgsrc/emulators/dosbox-staging/Makefile:1.4 pkgsrc/emulators/dosbox-staging/Makefile:1.5
--- pkgsrc/emulators/dosbox-staging/Makefile:1.4 Thu Dec 11 20:08:50 2025
+++ pkgsrc/emulators/dosbox-staging/Makefile Sun Dec 14 10:07:19 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2025/12/11 20:08:50 vins Exp $
+# $NetBSD: Makefile,v 1.5 2025/12/14 10:07:19 vins Exp $
DISTNAME= dosbox-staging-0.82.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=dosbox-staging/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -19,8 +19,16 @@ USE_TOOLS+= bash:build pkg-config
USE_CXX_FEATURES= c++20 # notify_all/wait support in struct std::atomic<>
GCC_REQD+= 11 # which requires gcc-11 at least
+LDFLAGS.SunOS+= -lsocket
+
+.include "options.mk"
+
+SUBST_CLASSES+= fixme
+SUBST_STAGE.fixme= pre-configure
+SUBST_FILES.fixme= docs/dosbox.1
+SUBST_SED.fixme= -e s,/usr/share/,${PREFIX}/share/,g
+
.include "../../archivers/zlib-ng/buildlink3.mk"
-.include "../../audio/fluidsynth/buildlink3.mk"
.include "../../audio/iir1/buildlink3.mk"
.include "../../audio/mt32emu/buildlink3.mk"
.include "../../audio/opusfile/buildlink3.mk"
Index: pkgsrc/emulators/dosbox-staging/distinfo
diff -u pkgsrc/emulators/dosbox-staging/distinfo:1.2 pkgsrc/emulators/dosbox-staging/distinfo:1.3
--- pkgsrc/emulators/dosbox-staging/distinfo:1.2 Thu Dec 11 20:08:50 2025
+++ pkgsrc/emulators/dosbox-staging/distinfo Sun Dec 14 10:07:19 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2025/12/11 20:08:50 vins Exp $
+$NetBSD: distinfo,v 1.3 2025/12/14 10:07:19 vins Exp $
BLAKE2s (dosbox-staging-0.82.2.tar.gz) = 3c87ed08f06ea4b215d952ffea43531d1e8d3e8f04cb3678af4b9e6c4f6a0c63
SHA512 (dosbox-staging-0.82.2.tar.gz) = 09dfd20f3a749e141a3eca41bd4556fdcb33df864a908710fb6f6163dbdab4f427c2738354c089cea53af0ae8f7cd3f526ad9939e5e562abb9c9705a443c3c5d
Size (dosbox-staging-0.82.2.tar.gz) = 6691414 bytes
+SHA1 (patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp) = 0f7edfc413a1fa124a89b906163108c6c307d9f2
+SHA1 (patch-include_support.h) = a215b4fe997a772f2e90fff38eb4de8636c091c4
+SHA1 (patch-src_dos_drives.cpp) = d9e31cb1e6cb126533a5535bca6365a0695cebca
SHA1 (patch-src_libs_loguru_loguru.cpp) = a64a4d3dcfbc9722dff2f0d39e90ffe939ca5860
Added files:
Index: pkgsrc/emulators/dosbox-staging/MESSAGE.NetBSD
diff -u /dev/null pkgsrc/emulators/dosbox-staging/MESSAGE.NetBSD:1.1
--- /dev/null Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/MESSAGE.NetBSD Sun Dec 14 10:07:19 2025
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2025/12/14 10:07:19 vins Exp $
+
+Lowering the system audio latency (or blk_ms) with sysctl(8) may be
+required to achieve full performance and framerates.
+
+===========================================================================
Index: pkgsrc/emulators/dosbox-staging/options.mk
diff -u /dev/null pkgsrc/emulators/dosbox-staging/options.mk:1.1
--- /dev/null Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/options.mk Sun Dec 14 10:07:19 2025
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2025/12/14 10:07:19 vins Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.dosbox-staging
+
+PKG_SUPPORTED_OPTIONS+= alsa fluidsynth
+PKG_SUGGESTED_OPTIONS+= fluidsynth
+PKG_SUGGESTED_OPTIONS.Linux+= alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+MESON_ARGS+= -Duse_alsa=true
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+MESON_ARGS+= -Duse_alsa=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mfluidsynth)
+MESON_ARGS+= -Duse_fluidsynth=true
+.include "../../audio/fluidsynth/buildlink3.mk"
+.else
+MESON_ARGS+= -Duse_fluidsynth=false
+.endif
Index: pkgsrc/emulators/dosbox-staging/patches/patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp
diff -u /dev/null pkgsrc/emulators/dosbox-staging/patches/patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp:1.1
--- /dev/null Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/patches/patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp Sun Dec 14 10:07:19 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-contrib_check-speexdsp_test__speexdsp__float__api.cpp,v 1.1 2025/12/14 10:07:19 vins Exp $
+
+Dirty workaround for broken assert on SunOS.
+
+--- contrib/check-speexdsp/test_speexdsp_float_api.cpp.orig 2025-12-14 08:32:14.743429064 +0000
++++ contrib/check-speexdsp/test_speexdsp_float_api.cpp
+@@ -28,10 +28,13 @@
+ //
+ // No output is provided because it's typically run by the build system.
+ //
+-
+-#ifdef NDEBUG
++#ifdef __sun
++#define NDEBUG
++#else
++# ifdef NDEBUG
+ # undef NDEBUG
+-#endif // Ensure asserts are enabled
++# endif // Ensure asserts are enabled
++#endif // __sun
+ #include <cassert>
+
+ #include <array>
Index: pkgsrc/emulators/dosbox-staging/patches/patch-include_support.h
diff -u /dev/null pkgsrc/emulators/dosbox-staging/patches/patch-include_support.h:1.1
--- /dev/null Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/patches/patch-include_support.h Sun Dec 14 10:07:19 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_support.h,v 1.1 2025/12/14 10:07:19 vins Exp $
+
+Fix call to non-constexpr function 'long int _sysconf(int)'.
+
+--- include/support.h.orig 2025-06-17 09:01:32.000000000 +0000
++++ include/support.h
+@@ -53,7 +53,11 @@
+
+ #ifdef PAGESIZE
+ // Some platforms like ppc64 have page sizes of 64K, so uint16_t isn't enough.
++# ifdef __sun
++const uint32_t host_pagesize = {PAGESIZE};
++# else
+ constexpr uint32_t host_pagesize = {PAGESIZE};
++# endif
+ #else
+ constexpr uint16_t host_pagesize = 4096;
+ #endif
Index: pkgsrc/emulators/dosbox-staging/patches/patch-src_dos_drives.cpp
diff -u /dev/null pkgsrc/emulators/dosbox-staging/patches/patch-src_dos_drives.cpp:1.1
--- /dev/null Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/patches/patch-src_dos_drives.cpp Sun Dec 14 10:07:19 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dos_drives.cpp,v 1.1 2025/12/14 10:07:19 vins Exp $
+
+Make call to log10 unambiguous.
+
+--- src/dos/drives.cpp.orig 2025-12-14 09:10:59.640371138 +0000
++++ src/dos/drives.cpp
+@@ -95,7 +95,7 @@ std::string generate_8x3(const char *lfn
+ input.pop_back();
+ size_t len = 0;
+ auto found = input.rfind('.');
+- unsigned int tilde_pos = 6 - (unsigned int)floor(log10(num));
++ unsigned int tilde_pos = 6 - (unsigned int)floor(log10(static_cast<double>(num)));
+ if (num == 1 || start) {
+ result.clear();
+ len = found != std::string::npos ? found : input.size();
Home |
Main Index |
Thread Index |
Old Index