Sat Dec 24 15:23:42 2022 UTC ()
dosbox-x: fix build on non-Linux & non-FreeBSD


(wiz)
diff -r1.26 -r1.27 pkgsrc/emulators/dosbox-x/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp
cvs diff -r1.26 -r1.27 pkgsrc/emulators/dosbox-x/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/distinfo 2022/11/06 21:31:57 1.26
+++ pkgsrc/emulators/dosbox-x/distinfo 2022/12/24 15:23:41 1.27
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.26 2022/11/06 21:31:57 triaxx Exp $ 1$NetBSD: distinfo,v 1.27 2022/12/24 15:23:41 wiz Exp $
2 2
3BLAKE2s (dosbox-x-0.84.3.tar.gz) = 2d77836763becdcd507adede587b39b9051d8f26fa6d37c485f04245f5d9fd7d 3BLAKE2s (dosbox-x-0.84.3.tar.gz) = 2d77836763becdcd507adede587b39b9051d8f26fa6d37c485f04245f5d9fd7d
4SHA512 (dosbox-x-0.84.3.tar.gz) = 82bebe82dd84962dca0182d9236cb8549d9f873f7fe562a863481535fa5d956e283b5f4f1d29cd0adbf8763c844ad0f181e3308d5e7c99ed80f44e3f47998c9f 4SHA512 (dosbox-x-0.84.3.tar.gz) = 82bebe82dd84962dca0182d9236cb8549d9f873f7fe562a863481535fa5d956e283b5f4f1d29cd0adbf8763c844ad0f181e3308d5e7c99ed80f44e3f47998c9f
5Size (dosbox-x-0.84.3.tar.gz) = 67868336 bytes 5Size (dosbox-x-0.84.3.tar.gz) = 67868336 bytes
6SHA1 (patch-configure.ac) = 14c23c6a69579490647782b6516f39c6a09474b0 6SHA1 (patch-configure.ac) = 14c23c6a69579490647782b6516f39c6a09474b0
7SHA1 (patch-include_dosbox.h) = 501ec03a46a1100afe5cccc00b73af4a344858a9 7SHA1 (patch-include_dosbox.h) = 501ec03a46a1100afe5cccc00b73af4a344858a9
8SHA1 (patch-include_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54 8SHA1 (patch-include_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54
9SHA1 (patch-src_dos_dos__programs.cpp) = 984c9fc621536046044e76f096969f7d90902627 9SHA1 (patch-src_dos_dos__programs.cpp) = 984c9fc621536046044e76f096969f7d90902627
10SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6 10SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6
11SHA1 (patch-src_output_output__surface.cpp) = b1f6fc85edf8f0d3afc54de0f95d8640ddce149b 11SHA1 (patch-src_output_output__surface.cpp) = 93590fa2e76071b3e6c2e5fd5d4f4e9f50b6b481
cvs diff -r1.1 -r1.2 pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp (expand / switch to unified diff)

--- pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp 2022/11/06 21:31:57 1.1
+++ pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp 2022/12/24 15:23:42 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-src_output_output__surface.cpp,v 1.1 2022/11/06 21:31:57 triaxx Exp $ 1$NetBSD: patch-src_output_output__surface.cpp,v 1.2 2022/12/24 15:23:42 wiz Exp $
2 2
3Fix linking error on FreeBSD (from FreeBSD ports). 3Match #ifdef with the one for the code definition.
4 4
5--- src/output/output_surface.cpp.orig 2022-09-01 22:55:29.000000000 +0000 5--- src/output/output_surface.cpp.orig 2022-09-01 22:55:29.000000000 +0000
6+++ src/output/output_surface.cpp 6+++ src/output/output_surface.cpp
7@@ -24,7 +24,9 @@ void OUTPUT_SURFACE_Initialize() 7@@ -24,8 +24,10 @@ void OUTPUT_SURFACE_Initialize()
8 // blitting the wrong dimensions to the window and trigger an X11 BadValue error. 8 // blitting the wrong dimensions to the window and trigger an X11 BadValue error.
9 // Set up an error handler that prints the error to STDERR and then returns, 9 // Set up an error handler that prints the error to STDERR and then returns,
10 // instead of the default handler which prints an error and exit()s this program. 10 // instead of the default handler which prints an error and exit()s this program.
11+#if !defined(__FreeBSD__) 11+#ifdef LINUX
12 X11_ErrorHandlerInstall(); 12 X11_ErrorHandlerInstall();
13+#endif 
14 #endif 13 #endif
 14+#endif
15 } 15 }
16  16
 17 void OUTPUT_SURFACE_Select()