diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile index 058e0585293d..0a184128401b 100644 --- a/emulators/dosbox-x/Makefile +++ b/emulators/dosbox-x/Makefile @@ -1,61 +1,61 @@ PORTNAME= dosbox-x DISTVERSIONPREFIX= ${PORTNAME}-v -DISTVERSION= 2024.07.01 +DISTVERSION= 2024.10.01 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 3f027f0d1a4a..31ced073fe30 100644 --- a/emulators/dosbox-x/distinfo +++ b/emulators/dosbox-x/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719901073 -SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.07.01_GH0.tar.gz) = 23462a3398303f8558e86973af9ba5d3d6d53bdaf324ec749610f2baf1dd449b -SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.07.01_GH0.tar.gz) = 119702042 +TIMESTAMP = 1727854016 +SHA256 (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 9940662759b9910e3c4549216be8db0278ceaaa80ace5b19f87b04d0b6ff8a3a +SIZE (joncampbell123-dosbox-x-dosbox-x-v2024.10.01_GH0.tar.gz) = 121316697 diff --git a/emulators/dosbox-x/files/patch-configure.ac b/emulators/dosbox-x/files/patch-configure.ac index cb301169b08a..cfdc8b7bb563 100644 --- a/emulators/dosbox-x/files/patch-configure.ac +++ b/emulators/dosbox-x/files/patch-configure.ac @@ -1,14 +1,14 @@ ---- configure.ac.orig 2023-10-07 05:52:23 UTC +--- configure.ac.orig 2024-10-02 06:16:36 UTC +++ configure.ac -@@ -656,7 +656,10 @@ esac - dnl TODO: Need GCC to know this code is using C++ lamda functions +@@ -672,7 +672,10 @@ dnl LIBRARY TEST: ALSA + dnl TODO: Need GCC to know this code is using C++ lambda functions dnl LIBRARY TEST: ALSA -AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : ) +AC_ARG_ENABLE(alsa,AC_HELP_STRING([--disable-alsa],[Disable ALSA]),,enable_alsa=yes) +if test x$enable_alsa != xno; then + AM_PATH_ALSA(0.9.0, AC_DEFINE(HAVE_ALSA,1,[Define to 1 to use ALSA for MIDI]) , : ) +fi dnl Some stuff for the icon. case "$host" in 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 37f14d2e82da..80b3eeb0c45a 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 2022-12-27 02:28:50 UTC +--- src/gui/sdl_gui.cpp.orig 2024-10-02 06:16:36 UTC +++ src/gui/sdl_gui.cpp -@@ -3646,6 +3646,7 @@ void GUI_Shortcut(int select) { +@@ -3888,6 +3888,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(); -@@ -3655,12 +3656,14 @@ void GUI_Shortcut(int select) { +@@ -3897,12 +3898,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(); -@@ -3670,4 +3673,5 @@ void GUI_Run(bool pressed) { +@@ -3912,4 +3915,5 @@ void GUI_Run(bool pressed) { } else #endif RunCfgTool(0); +#endif }