CVS commit: pkgsrc/emulators/dosbox-staging

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Dec 16 09:44:45 UTC 2025

Modified Files:
        pkgsrc/emulators/dosbox-staging: Makefile options.mk

Log Message:
emulators/dosbox-staging: move some dependencies to options.mk


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/dosbox-staging/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/dosbox-staging/options.mk

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.5 pkgsrc/emulators/dosbox-staging/Makefile:1.6
--- pkgsrc/emulators/dosbox-staging/Makefile:1.5        Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/Makefile    Tue Dec 16 09:44:45 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2025/12/14 10:07:19 vins Exp $
+# $NetBSD: Makefile,v 1.6 2025/12/16 09:44:45 vins Exp $
 
 DISTNAME=      dosbox-staging-0.82.2
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dosbox-staging/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -19,7 +19,9 @@ 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
+PTHREAD_AUTO_VARS=     yes     # loguru needs it and sets none by default.
+
+LDFLAGS.SunOS+=                -lsocket
 
 .include "options.mk"
 
@@ -28,7 +30,6 @@ 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/iir1/buildlink3.mk"
 .include "../../audio/mt32emu/buildlink3.mk"
 .include "../../audio/opusfile/buildlink3.mk"
@@ -36,11 +37,10 @@ SUBST_SED.fixme=    -e s,/usr/share/,${PREF
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/SDL2_net/buildlink3.mk"
-.include "../../net/libslirp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/dosbox-staging/options.mk
diff -u pkgsrc/emulators/dosbox-staging/options.mk:1.1 pkgsrc/emulators/dosbox-staging/options.mk:1.2
--- pkgsrc/emulators/dosbox-staging/options.mk:1.1      Sun Dec 14 10:07:19 2025
+++ pkgsrc/emulators/dosbox-staging/options.mk  Tue Dec 16 09:44:45 2025
@@ -1,23 +1,59 @@
-# $NetBSD: options.mk,v 1.1 2025/12/14 10:07:19 vins Exp $
+# $NetBSD: options.mk,v 1.2 2025/12/16 09:44:45 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dosbox-staging
 
-PKG_SUPPORTED_OPTIONS+=                alsa fluidsynth
-PKG_SUGGESTED_OPTIONS+=                fluidsynth
+PKG_SUPPORTED_OPTIONS=         alsa fluidsynth opengl slirp zlib-ng
+PKG_SUGGESTED_OPTIONS=         ${PKG_SUPPORTED_OPTIONS:S/alsa//}
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .include "../../mk/bsd.options.mk"
 
+###
+### Enable ALSA MIDI support.
+###
 .if !empty(PKG_OPTIONS:Malsa)
 MESON_ARGS+=   -Duse_alsa=true
-.include "../../audio/alsa-lib/buildlink3.mk"
+.  include "../../audio/alsa-lib/buildlink3.mk"
 .else
 MESON_ARGS+=   -Duse_alsa=false
 .endif
 
+###
+### Enable built-in MIDI support via FluidSynth.
+###
 .if !empty(PKG_OPTIONS:Mfluidsynth)
-MESON_ARGS+=    -Duse_fluidsynth=true
-.include "../../audio/fluidsynth/buildlink3.mk"
+MESON_ARGS+=   -Duse_fluidsynth=true
+.  include "../../audio/fluidsynth/buildlink3.mk"
 .else
-MESON_ARGS+=    -Duse_fluidsynth=false
+MESON_ARGS+=   -Duse_fluidsynth=false
+.endif
+
+##
+## Enable OpenGL support.
+##
+.if !empty(PKG_OPTIONS:Mopengl)
+.  include "../../graphics/MesaLib/buildlink3.mk"
+MESON_ARGS+=   -Duse_opengl=true
+.else
+MESON_ARGS+=   -Duse_opengl=false
+.endif
+
+###
+### Enable Ethernet emulation using libslirp.
+###
+.if !empty(PKG_OPTIONS:Mslirp)
+MESON_ARGS+=   -Duse_slirp=true
+.  include "../../net/libslirp/buildlink3.mk"
+.else
+MESON_ARGS+=   -Duse_slirp=false
+.endif
+
+###
+### Enable zlib-ng with SIMD optimization.
+###
+.if !empty(PKG_OPTIONS:Mzlib-ng)
+MESON_ARGS+=   -Duse_zlib_ng=native
+.  include "../../archivers/zlib-ng/buildlink3.mk"
+.else
+MESON_ARGS+=   -Duse_zlib_ng=false
 .endif