CVS commit: pkgsrc/emulators/dosbox-x

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri May 16 21:46:43 UTC 2025

Modified Files:
        pkgsrc/emulators/dosbox-x: distinfo
Added Files:
        pkgsrc/emulators/dosbox-x/patches: patch-include_fpu.h
            patch-src_hardware_opl2board_opl2board.h

Log Message:
dosbox-x: Various build fixes.

The big endian fix has been sent upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/emulators/dosbox-x/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/dosbox-x/patches/patch-include_fpu.h \
    pkgsrc/emulators/dosbox-x/patches/patch-src_hardware_opl2board_opl2board.h

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-x/distinfo
diff -u pkgsrc/emulators/dosbox-x/distinfo:1.27 pkgsrc/emulators/dosbox-x/distinfo:1.28
--- pkgsrc/emulators/dosbox-x/distinfo:1.27     Sat Dec 24 15:23:41 2022
+++ pkgsrc/emulators/dosbox-x/distinfo  Fri May 16 21:46:43 2025
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.27 2022/12/24 15:23:41 wiz Exp $
+$NetBSD: distinfo,v 1.28 2025/05/16 21:46:43 nia Exp $
 
 BLAKE2s (dosbox-x-0.84.3.tar.gz) = 2d77836763becdcd507adede587b39b9051d8f26fa6d37c485f04245f5d9fd7d
 SHA512 (dosbox-x-0.84.3.tar.gz) = 82bebe82dd84962dca0182d9236cb8549d9f873f7fe562a863481535fa5d956e283b5f4f1d29cd0adbf8763c844ad0f181e3308d5e7c99ed80f44e3f47998c9f
 Size (dosbox-x-0.84.3.tar.gz) = 67868336 bytes
 SHA1 (patch-configure.ac) = 14c23c6a69579490647782b6516f39c6a09474b0
 SHA1 (patch-include_dosbox.h) = 501ec03a46a1100afe5cccc00b73af4a344858a9
+SHA1 (patch-include_fpu.h) = fe71609699cce8e17b24b891ed493b65b4caeba7
 SHA1 (patch-include_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54
 SHA1 (patch-src_dos_dos__programs.cpp) = 984c9fc621536046044e76f096969f7d90902627
+SHA1 (patch-src_hardware_opl2board_opl2board.h) = dc3fbafb17cccfea194fbbe6c0307a7e5c0e7972
 SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6
 SHA1 (patch-src_output_output__surface.cpp) = 93590fa2e76071b3e6c2e5fd5d4f4e9f50b6b481

Added files:

Index: pkgsrc/emulators/dosbox-x/patches/patch-include_fpu.h
diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-include_fpu.h:1.1
--- /dev/null   Fri May 16 21:46:43 2025
+++ pkgsrc/emulators/dosbox-x/patches/patch-include_fpu.h       Fri May 16 21:46:43 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-include_fpu.h,v 1.1 2025/05/16 21:46:43 nia Exp $
+
+From 97bca6f3df2ca4f59aea289ab7038dfecabcffca Mon Sep 17 00:00:00 2001
+From: nia <nia%NetBSD.org@localhost>
+Date: Fri, 16 May 2025 16:12:03 +0200
+Subject: [PATCH] Fix big-endian build
+
+Some new members were added to the MMX_reg union, but only
+for little endian. Add them to the big endian one too.
+
+Signed-off-by: Nia Alarie <nia%NetBSD.org@localhost>
+
+--- include/fpu.h.orig 2022-09-01 22:55:29.000000000 +0000
++++ include/fpu.h
+@@ -168,6 +168,10 @@ union alignas(8) MMX_reg {
+       } uw;
+       static_assert(sizeof(uw) == 8, "MMX packing error");
+ 
++      uint8_t uba[8];
++      uint16_t uwa[4];
++      uint32_t uda[2];
++
+       struct {
+               uint16_t w3,w2,w1,w0;
+       } sw;
Index: pkgsrc/emulators/dosbox-x/patches/patch-src_hardware_opl2board_opl2board.h
diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-src_hardware_opl2board_opl2board.h:1.1
--- /dev/null   Fri May 16 21:46:43 2025
+++ pkgsrc/emulators/dosbox-x/patches/patch-src_hardware_opl2board_opl2board.h  Fri May 16 21:46:43 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_hardware_opl2board_opl2board.h,v 1.1 2025/05/16 21:46:43 nia Exp $
+
+Add missing include for uint8_t.
+
+--- src/hardware/opl2board/opl2board.h.orig    2025-05-16 15:18:35.963407265 +0000
++++ src/hardware/opl2board/opl2board.h
+@@ -1,4 +1,5 @@
+ #include "../serialport/libserial.h"
++#include <stdint.h>
+ 
+ #ifndef OPL2_AUDIO_BOARD
+       #define OPL2_AUDIO_BOARD