diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index 9afabcd011b5..2650be5892d9 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,61 +1,61 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 2026.08.02 +DISTVERSION= 2026.08.31 CATEGORIES= emulators MAINTAINER= eduardo@FreeBSD.org COMMENT= DOSBox fork WWW= https://dosbox-x.com/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm LIB_DEPENDS= libpng16.so:graphics/png \ libslirp.so:net/libslirp USES= autoreconf gettext-runtime gl gnome iconv localbase pkgconfig sdl xorg USE_GITHUB= yes GH_ACCOUNT= joncampbell123 USE_GL= gl USE_GNOME= glib20 USE_SDL= net2 sdl2 USE_XORG= x11 xkbfile xrandr GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-emscripten --enable-hx-dos --enable-libslirp --enable-mt32 \ --enable-opengl --enable-printer --disable-sdl --enable-sdl2 --enable-x11 INSTALL_TARGET= install_strip PORTDOCS= NEWS README.* OPTIONS_DEFINE= ALSA DOCS FFMPEG FLUIDSYNTH FREETYPE OPTIONS_DEFAULT= FFMPEG FLUIDSYNTH OPTIONS_RADIO= DEBUGGER OPTIONS_RADIO_DEBUGGER= DEBUGGER_ENABLE DEBUGGER_HEAVY ALSA_DESC= ALSA midi support DEBUGGER_ENABLE_DESC= Enable internal debugger DEBUGGER_HEAVY_DESC= Enable internal debugger with extra features ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa alsa-midi alsatest DEBUGGER_ENABLE_CONFIGURE_ON= --enable-debug=yes DEBUGGER_HEAVY_CONFIGURE_ON= --enable-debug=heavy FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= avcodec FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CONFIGURE_ENABLE= libfluidsynth FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo index 363b89fb00ea..8e6da134bff3 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1785777723 -SHA256 (joncampbell123-dosbox-x-dosbox-x-v2026.08.02_GH0.tar.gz) = 3438f3199dc301d7fdd1ab8ce44877c1755158e699b8deab21a7ad2c43cc0331 -SIZE (joncampbell123-dosbox-x-dosbox-x-v2026.08.02_GH0.tar.gz) = 133086440 +TIMESTAMP = 1788282490 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v2026.08.31_GH0.tar.gz) = 992ea538ea858f9fb196b39de2276ce3048c731965e144e6288202abed109782 +SIZE (joncampbell123-dosbox-x-dosbox-x-v2026.08.31_GH0.tar.gz) = 133102570 diff --git a/emulators/dosbox-x/files/patch-fix-ffmpeg9 b/emulators/dosbox-x/files/patch-fix-ffmpeg9 deleted file mode 100644 index 9e4c2a9bbbef..000000000000 --- a/emulators/dosbox-x/files/patch-fix-ffmpeg9 +++ /dev/null @@ -1,44 +0,0 @@ -From 18062c0ffb33db35fa52ce937ce25223140c0293 Mon Sep 17 00:00:00 2001 -From: maron2000 <68574602+maron2000@users.noreply.github.com> -Date: Thu, 13 Aug 2026 18:02:16 +0900 -Subject: [PATCH 1/2] Fix build error on FFmpeg 9 - ---- - src/hardware/hardware.cpp | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git src/hardware/hardware.cpp src/hardware/hardware.cpp -index 79de484d2a..8cf82a3446 100644 ---- src/hardware/hardware.cpp -+++ src/hardware/hardware.cpp -@@ -1288,10 +1288,27 @@ void CAPTURE_AddImage(Bitu width, Bitu height, Bitu bpp, Bitu pitch, Bitu flags, - #else - ffmpeg_aud_ctx->ch_layout = AV_CHANNEL_LAYOUT_STEREO; - #endif -- -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 13, 100) -+ // Legacy support for FFmpeg not supporting avcodec_get_supported_config() - if (ffmpeg_aud_codec->sample_fmts != NULL) - ffmpeg_aud_ctx->sample_fmt = (ffmpeg_aud_codec->sample_fmts)[0]; -- else -+#else -+ // For FFmpeg supporting avcodec_get_supported_config() -+ const enum AVSampleFormat* formats = NULL; -+ -+ const int ret = avcodec_get_supported_config( -+ NULL, -+ ffmpeg_aud_codec, -+ AV_CODEC_CONFIG_SAMPLE_FORMAT, -+ 0, -+ reinterpret_cast(&formats), -+ NULL -+ ); -+ -+ if(ret >= 0 && formats != NULL) -+ ffmpeg_aud_ctx->sample_fmt = formats[0]; -+#endif -+ else - ffmpeg_aud_ctx->sample_fmt = AV_SAMPLE_FMT_FLT; - - if (avcodec_open2(ffmpeg_aud_ctx,ffmpeg_aud_codec,NULL) < 0) { - diff --git a/emulators/dosbox-x/files/patch-include_setup.h b/emulators/dosbox-x/files/patch-include_setup.h deleted file mode 100644 index ca81c0e0316a..000000000000 --- a/emulators/dosbox-x/files/patch-include_setup.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/setup.h.orig 2022-04-01 04:26:03 UTC -+++ include/setup.h -@@ -20,6 +20,8 @@ - #ifndef DOSBOX_SETUP_H - #define DOSBOX_SETUP_H - -+#include -+ - #ifdef _MSC_VER - //#pragma warning ( disable : 4786 ) - //#pragma warning ( disable : 4290 ) diff --git a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp index 9d216f828c5f..7f967721fb55 100644 --- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp +++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp @@ -1,31 +1,31 @@ ---- src/gui/sdl_gui.cpp.orig 2026-08-02 19:09:21 UTC +--- src/gui/sdl_gui.cpp.orig 2026-09-01 15:35:39 UTC +++ src/gui/sdl_gui.cpp -@@ -4074,6 +4074,7 @@ void GUI_Shortcut(int select) { +@@ -4075,6 +4075,7 @@ void GUI_Shortcut(int select) { shortcutid=select; shortcut=true; sel = select; +#ifndef __FreeBSD__ #if defined(USE_TTF) if (ttf.inUse && !confres) { ttf_switch_off(); -@@ -4083,12 +4084,14 @@ void GUI_Shortcut(int select) { +@@ -4084,12 +4085,14 @@ void GUI_Shortcut(int select) { } else #endif RunCfgTool(0); +#endif } void GUI_Run(bool pressed) { if (pressed || running) return; sel = -1; +#ifndef __FreeBSD__ #if defined(USE_TTF) if (ttf.inUse) { ttf_switch_off(); -@@ -4098,4 +4101,5 @@ void GUI_Run(bool pressed) { +@@ -4099,4 +4102,5 @@ void GUI_Run(bool pressed) { } else #endif RunCfgTool(0); +#endif }