Skip to content

Commit be396f0

Browse files
committed
emulators/dosbox-x: update to 2023.10.06
Release Notes: https://dosbox-x.com/release-2023.10.06.html Also move manpage in share/ and add several build options. Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D43959
1 parent 35bca82 commit be396f0

File tree

6 files changed

+63
-23
lines changed

6 files changed

+63
-23
lines changed

‎emulators/dosbox-x/Makefile‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,61 @@
11
PORTNAME= dosbox-x
22
DISTVERSIONPREFIX= ${PORTNAME}-v
3-
DISTVERSION= 2022.12.26
3+
DISTVERSION= 2023.10.06
44
CATEGORIES= emulators
55

6+
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
7+
PATCHFILES+= 48c13acd1f3048891252cb92087cb6b20c29dc16.patch:-p1
8+
# https://github.com/joncampbell123/dosbox-x/pull/4575
9+
# dos_programs.cpp:5929:17: error: cannot initialize return object of type 'bool' with an rvalue of type 'std::nullptr_t'
10+
611
MAINTAINER= ports@FreeBSD.org
712
COMMENT= DOSBox fork
813
WWW= https://dosbox-x.com/
914

1015
LICENSE= GPLv2
1116

12-
LIB_DEPENDS= libpng.so:graphics/png
13-
14-
USES= autoreconf iconv sdl
17+
LIB_DEPENDS= libpng.so:graphics/png \
18+
libslirp.so:net/libslirp
19+
BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}}
20+
BUILD_DEPENDS_amd64= nasm:devel/nasm
21+
BUILD_DEPENDS_i386= nasm:devel/nasm
22+
23+
USES= autoreconf gettext-runtime gl gnome iconv localbase pkgconfig sdl xorg
24+
USE_GL= gl
25+
USE_GNOME= glib20
26+
USE_SDL= net2 sdl2
27+
USE_XORG= x11 xkbfile xrandr
1528
GNU_CONFIGURE= yes
16-
CONFIGURE_ARGS= --enable-core-inline
17-
USE_SDL= net sdl sound
29+
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
30+
CONFIGURE_ARGS= --disable-emscripten --enable-hx-dos --enable-libslirp --enable-mt32 \
31+
--enable-opengl --enable-printer --disable-sdl --enable-sdl2 --enable-x11
32+
INSTALL_TARGET= install_strip
1833

1934
USE_GITHUB= yes
2035
GH_ACCOUNT= joncampbell123
2136

22-
OPTIONS_DEFINE= DOCS
37+
OPTIONS_DEFINE= ALSA DOCS FFMPEG FLUIDSYNTH FREETYPE
38+
OPTIONS_DEFAULT= FFMPEG FLUIDSYNTH
2339
OPTIONS_RADIO= DEBUGGER
2440
OPTIONS_RADIO_DEBUGGER= DEBUGGER_ENABLE DEBUGGER_HEAVY
41+
42+
ALSA_DESC= ALSA midi support
43+
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
44+
ALSA_CONFIGURE_ENABLE= alsa alsa-midi alsatest
45+
2546
DEBUGGER_ENABLE_DESC= Enable internal debugger
2647
DEBUGGER_HEAVY_DESC= Enable internal debugger with extra features
2748

2849
DEBUGGER_ENABLE_CONFIGURE_ON= --enable-debug=yes
2950
DEBUGGER_HEAVY_CONFIGURE_ON= --enable-debug=heavy
3051

52+
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
53+
FFMPEG_CONFIGURE_ENABLE= avcodec
54+
55+
FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
56+
FLUIDSYNTH_CONFIGURE_ENABLE= libfluidsynth
57+
58+
FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
59+
FREETYPE_CONFIGURE_ENABLE= freetype
60+
3161
.include <bsd.port.mk>

‎emulators/dosbox-x/distinfo‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
TIMESTAMP = 1674249678
2-
SHA256 (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 39fb1ed19ea31e11883aa57655493b3100ac6b328ef59c799b840b9bfdfacb7b
3-
SIZE (joncampbell123-dosbox-x-dosbox-x-v2022.12.26_GH0.tar.gz) = 67886370
1+
TIMESTAMP = 1708108946
2+
SHA256 (joncampbell123-dosbox-x-dosbox-x-v2023.10.06_GH0.tar.gz) = 65f756e29f9c9b898fdbd22b0cb9b3b24c6e3becb5dcda588aa20a3fde9539a5
3+
SIZE (joncampbell123-dosbox-x-dosbox-x-v2023.10.06_GH0.tar.gz) = 119420489
4+
SHA256 (48c13acd1f3048891252cb92087cb6b20c29dc16.patch) = 38896e53c3b594dd31ac0aa9d347acb90ebc6fe199bd84ff7a8acb2913e538b1
5+
SIZE (48c13acd1f3048891252cb92087cb6b20c29dc16.patch) = 1574
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- configure.ac.orig 2023-10-07 05:52:23 UTC
2+
+++ configure.ac
3+
@@ -656,7 +656,10 @@ esac
4+
dnl TODO: Need GCC to know this code is using C++ lamda functions
5+
6+
dnl LIBRARY TEST: ALSA
7+
-AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : )
8+
+AC_ARG_ENABLE(alsa,AC_HELP_STRING([--disable-alsa],[Disable ALSA]),,enable_alsa=yes)
9+
+if test x$enable_alsa != xno; then
10+
+ AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : )
11+
+fi
12+
13+
dnl Some stuff for the icon.
14+
case "$host" in

‎emulators/dosbox-x/files/patch-src_gui_sdlmain.cpp‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎emulators/dosbox-x/pkg-descr‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
DOSBox-X is a cross-platform DOS emulator based on the DOSBox project.
1+
DOSBox-X is an open-source cross-platform DOS emulator for running DOS
2+
applications and games based on the DOSBox project.
3+
DOS-based Windows such as Windows 3.x and Windows 9x are officially supported.
4+
Compared to DOSBox, DOSBox-X is much more flexible and provides more features.

‎emulators/dosbox-x/pkg-plist‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
bin/dosbox-x
2-
man/man1/dosbox-x.1.gz
32
share/applications/com.dosbox_x.DOSBox-X.desktop
43
share/bash-completion/completions/dosbox-x
54
%%DATADIR%%/CHANGELOG
@@ -49,9 +48,11 @@ share/bash-completion/completions/dosbox-x
4948
%%DATADIR%%/glshaders/yeetron.glsl
5049
%%DATADIR%%/glshaders/zfast_crt.glsl
5150
%%DATADIR%%/languages/de_DE.lng
51+
%%DATADIR%%/languages/de_pc98.lng
5252
%%DATADIR%%/languages/en_US.lng
5353
%%DATADIR%%/languages/es_ES.lng
5454
%%DATADIR%%/languages/fr_FR.lng
55+
%%DATADIR%%/languages/it_IT.lng
5556
%%DATADIR%%/languages/ja_JP.lng
5657
%%DATADIR%%/languages/ko_KR.lng
5758
%%DATADIR%%/languages/nl_NL.lng
@@ -62,4 +63,5 @@ share/bash-completion/completions/dosbox-x
6263
%%DATADIR%%/wqy_11pt.bdf
6364
%%DATADIR%%/wqy_12pt.bdf
6465
share/icons/hicolor/scalable/apps/dosbox-x.svg
66+
share/man/man1/dosbox-x.1.gz
6567
share/metainfo/com.dosbox_x.DOSBox-X.metainfo.xml

0 commit comments

Comments
 (0)