CVS commit: pkgsrc/emulators/dosbox-x

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/dosbox-x
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Sun, 6 Nov 2022 21:31:57 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Nov  6 21:31:57 UTC 2022

Modified Files:
        pkgsrc/emulators/dosbox-x: Makefile distinfo
        pkgsrc/emulators/dosbox-x/patches: patch-configure.ac
            patch-include_dosbox.h patch-src_dos_dos__programs.cpp
Added Files:
        pkgsrc/emulators/dosbox-x/patches: patch-src_output_output__surface.cpp

Log Message:
dosbox-x: Update to 0.84.3

pkgsrc changes:
---------------
  * Fix building of FreeBSD by adding -lpthread to LDFLAGS and by disabling
    call to X11_ErrorHandlerInstall.

upstream changes:
-----------------
  * 0.84.3: https://dosbox-x.com/release-0.84.3.html
  * 0.84.2: https://dosbox-x.com/release-0.84.2.html
  * 0.84.1: https://dosbox-x.com/release-0.84.1.html
  * 0.84.0: https://dosbox-x.com/release-0.84.0.html


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/emulators/dosbox-x/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/emulators/dosbox-x/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.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-x/Makefile
diff -u pkgsrc/emulators/dosbox-x/Makefile:1.41 pkgsrc/emulators/dosbox-x/Makefile:1.42
--- pkgsrc/emulators/dosbox-x/Makefile:1.41     Tue Sep 27 20:58:23 2022
+++ pkgsrc/emulators/dosbox-x/Makefile  Sun Nov  6 21:31:57 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2022/09/27 20:58:23 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2022/11/06 21:31:57 triaxx Exp $
 
-DISTNAME=      dosbox-x-0.83.25
-PKGREVISION=   4
+DISTNAME=      dosbox-x-0.84.3
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=joncampbell123/}
 GITHUB_TAG=    dosbox-x-v${PKGVERSION_NOREV}
@@ -46,6 +45,8 @@ CONFIGURE_ARGS+=      --disable-dynamic-core
 NOT_PAX_MPROTECT_SAFE+=        bin/dosbox-x
 .endif
 
+LDFLAGS.FreeBSD+=      -lpthread
+
 INSTALLATION_DIRS+=    bin share/dosbox-x
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/pixmaps

Index: pkgsrc/emulators/dosbox-x/distinfo
diff -u pkgsrc/emulators/dosbox-x/distinfo:1.25 pkgsrc/emulators/dosbox-x/distinfo:1.26
--- pkgsrc/emulators/dosbox-x/distinfo:1.25     Tue May  3 18:26:24 2022
+++ pkgsrc/emulators/dosbox-x/distinfo  Sun Nov  6 21:31:57 2022
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.25 2022/05/03 18:26:24 nia Exp $
+$NetBSD: distinfo,v 1.26 2022/11/06 21:31:57 triaxx Exp $
 
-BLAKE2s (dosbox-x-0.83.25.tar.gz) = 8b0dd2da8dbc59ea12edb6e80506d7f2473d475ecf3c3ed27d5b80569552fe52
-SHA512 (dosbox-x-0.83.25.tar.gz) = 372214459150c7511e542a9f19e65dcede6ca6e5c57211f6a807bf324b25ea676ab5cf0743ef1e58ea3bdc503c6a7045bec4107f90f944f9400641ea6af826b7
-Size (dosbox-x-0.83.25.tar.gz) = 64715876 bytes
-SHA1 (patch-configure.ac) = 906aa99b5fce6224ef4c001d9bba1e4fc89a34f9
-SHA1 (patch-include_dosbox.h) = 6f7397b4a611511fc1782b1603c9f5cd51b74eb9
+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_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54
-SHA1 (patch-src_dos_dos__programs.cpp) = 64444c54b319fbfc7de7219d88fa6add953a0fb0
+SHA1 (patch-src_dos_dos__programs.cpp) = 984c9fc621536046044e76f096969f7d90902627
 SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6
+SHA1 (patch-src_output_output__surface.cpp) = b1f6fc85edf8f0d3afc54de0f95d8640ddce149b

Index: pkgsrc/emulators/dosbox-x/patches/patch-configure.ac
diff -u pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.5 pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.6
--- pkgsrc/emulators/dosbox-x/patches/patch-configure.ac:1.5    Tue Aug 10 11:03:50 2021
+++ pkgsrc/emulators/dosbox-x/patches/patch-configure.ac        Sun Nov  6 21:31:57 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.5 2021/08/10 11:03:50 nia Exp $
+$NetBSD: patch-configure.ac,v 1.6 2022/11/06 21:31:57 triaxx Exp $
 
 - Detect NetBSD/evbarm properly.
 - Shell portability.
@@ -14,7 +14,7 @@ $NetBSD: patch-configure.ac,v 1.5 2021/0
      AC_DEFINE(C_TARGETCPU,ARMV4LE)
      AC_MSG_RESULT(ARMv6 Little Endian)
      c_targetcpu="arm"
-@@ -1007,7 +1007,7 @@ esac
+@@ -1029,7 +1029,7 @@ esac
  dnl FEATURE: Whether to use libslirp, and enable userspace TCP/IP emulation
  AH_TEMPLATE(C_SLIRP, [Define to 1 to enable userspace TCP/IP emulation, requires libslirp])
  AC_ARG_ENABLE(libslirp,AC_HELP_STRING([--disable-libslirp],[Disable libslirp support]),enable_libslirp=$enableval,enable_libslirp=yes)

Index: pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h
diff -u pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.2 pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.3
--- pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h:1.2        Tue Jan  5 11:01:49 2021
+++ pkgsrc/emulators/dosbox-x/patches/patch-include_dosbox.h    Sun Nov  6 21:31:57 2022
@@ -1,21 +1,24 @@
-$NetBSD: patch-include_dosbox.h,v 1.2 2021/01/05 11:01:49 nia Exp $
+$NetBSD: patch-include_dosbox.h,v 1.3 2022/11/06 21:31:57 triaxx Exp $
 
 GCC having 80-bit long double is far from a safe assumption.
 
---- include/dosbox.h.orig      2020-12-01 02:49:53.000000000 +0000
+--- include/dosbox.h.orig      2022-09-01 22:55:29.000000000 +0000
 +++ include/dosbox.h
-@@ -69,16 +69,6 @@
+@@ -68,19 +68,6 @@
  # define pref_struct_stat     struct stat
  #endif
  
 -// TODO: The autoconf script should test the size of long double
 -#if defined(_MSC_VER)
 -// Microsoft C++ sizeof(long double) == sizeof(double)
--#elif defined(__arm__)
+-#undef HAS_LONG_DOUBLE
+-#elif defined(__arm__) || defined(__aarch64__)
 -// ARMv7 (Raspberry Pi) does not have long double, sizeof(long double) == sizeof(double)
+-// ARM 64 has a quadruple-precision float instead of the 80-bit extended precision one used by x87
+-#undef HAS_LONG_DOUBLE
 -#else
 -// GCC, other compilers, have sizeof(long double) == 10 80-bit IEEE
--# define HAS_LONG_DOUBLE              1
+-#define HAS_LONG_DOUBLE               1
 -#endif
 -
  GCC_ATTRIBUTE(noreturn) void          E_Exit(const char * format,...) GCC_ATTRIBUTE( __format__(__printf__, 1, 2));

Index: pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp
diff -u pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.4 pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.5
--- pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp:1.4       Mon Mar  7 16:37:52 2022
+++ pkgsrc/emulators/dosbox-x/patches/patch-src_dos_dos__programs.cpp   Sun Nov  6 21:31:57 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_dos_dos__programs.cpp,v 1.4 2022/03/07 16:37:52 nia Exp $
+$NetBSD: patch-src_dos_dos__programs.cpp,v 1.5 2022/11/06 21:31:57 triaxx Exp $
 
 dos_programs.cpp: In member function 'bool AUTOTYPE::ReadDoubleArg(const string&, const char*, const double&, const double&, const double&, double&)':
 dos_programs.cpp:5556:12: error: expected unqualified-id before '(' token
@@ -6,7 +6,7 @@ dos_programs.cpp:5556:12: error: expecte
 
 --- src/dos/dos_programs.cpp.orig      2022-03-01 02:12:39.000000000 +0000
 +++ src/dos/dos_programs.cpp
-@@ -6756,11 +6756,7 @@ bool AUTOTYPE::ReadDoubleArg(const std::
+@@ -6935,11 +6935,7 @@ bool AUTOTYPE::ReadDoubleArg(const std::
        if (cmd->FindString(flag, str_value, true)) {
                // Can the user's value be parsed?
                const double user_value = to_finite<double>(str_value);

Added files:

Index: pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp
diff -u /dev/null pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp:1.1
--- /dev/null   Sun Nov  6 21:31:57 2022
+++ pkgsrc/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp      Sun Nov  6 21:31:57 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_output_output__surface.cpp,v 1.1 2022/11/06 21:31:57 triaxx Exp $
+
+Fix linking error on FreeBSD (from FreeBSD ports).
+
+--- src/output/output_surface.cpp.orig 2022-09-01 22:55:29.000000000 +0000
++++ src/output/output_surface.cpp
+@@ -24,7 +24,9 @@ void OUTPUT_SURFACE_Initialize()
+     // blitting the wrong dimensions to the window and trigger an X11 BadValue error.
+     // Set up an error handler that prints the error to STDERR and then returns,
+     // instead of the default handler which prints an error and exit()s this program.
++#if !defined(__FreeBSD__)
+     X11_ErrorHandlerInstall();
++#endif
+ #endif
+ }
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index