aboutsummaryrefslogtreecommitdiff
path: root/emulators/dosbox-x
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/dosbox-x')
-rw-r--r--emulators/dosbox-x/Makefile2
-rw-r--r--emulators/dosbox-x/distinfo6
-rw-r--r--emulators/dosbox-x/files/patch-configure.ac4
-rw-r--r--emulators/dosbox-x/files/patch-fix-ffmpeg888
-rw-r--r--emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp8
5 files changed, 10 insertions, 98 deletions
diff --git a/emulators/dosbox-x/Makefile b/emulators/dosbox-x/Makefile
index 03c0416c7b26..9d8ae42d2c01 100644
--- a/emulators/dosbox-x/Makefile
+++ b/emulators/dosbox-x/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dosbox-x
DISTVERSIONPREFIX= ${PORTNAME}-v
-DISTVERSION= 2025.05.03
+DISTVERSION= 2025.10.07
CATEGORIES= emulators
MAINTAINER= eduardo@FreeBSD.org
diff --git a/emulators/dosbox-x/distinfo b/emulators/dosbox-x/distinfo
index 219e59f0ef95..4897e7dc05d4 100644
--- a/emulators/dosbox-x/distinfo
+++ b/emulators/dosbox-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746305468
-SHA256 (joncampbell123-dosbox-x-dosbox-x-v2025.05.03_GH0.tar.gz) = b29a2c9c38bfe1d1c1f2420d546b8c2456ae2ddce4c1f6b4d19f258841ce1581
-SIZE (joncampbell123-dosbox-x-dosbox-x-v2025.05.03_GH0.tar.gz) = 122834930
+TIMESTAMP = 1759852684
+SHA256 (joncampbell123-dosbox-x-dosbox-x-v2025.10.07_GH0.tar.gz) = fed630dba74f1ad1552bc5ec94cb68f70737e67a7ca1768f6071b255426ce117
+SIZE (joncampbell123-dosbox-x-dosbox-x-v2025.10.07_GH0.tar.gz) = 124274305
diff --git a/emulators/dosbox-x/files/patch-configure.ac b/emulators/dosbox-x/files/patch-configure.ac
index cfdc8b7bb563..a0fe5a986c29 100644
--- a/emulators/dosbox-x/files/patch-configure.ac
+++ b/emulators/dosbox-x/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig 2024-10-02 06:16:36 UTC
+--- configure.ac.orig 2025-10-07 15:49:14 UTC
+++ configure.ac
-@@ -672,7 +672,10 @@ dnl LIBRARY TEST: ALSA
+@@ -728,7 +728,10 @@ dnl LIBRARY TEST: ALSA
dnl TODO: Need GCC to know this code is using C++ lambda functions
dnl LIBRARY TEST: ALSA
diff --git a/emulators/dosbox-x/files/patch-fix-ffmpeg8 b/emulators/dosbox-x/files/patch-fix-ffmpeg8
deleted file mode 100644
index 7c1782a7b3bd..000000000000
--- a/emulators/dosbox-x/files/patch-fix-ffmpeg8
+++ /dev/null
@@ -1,88 +0,0 @@
-Fix build with FFmpeg 8
-https://github.com/joncampbell123/dosbox-x/issues/5803
-
---- src/hardware/hardware.cpp.orig 2025-08-25 08:00:00 UTC
-+++ src/hardware/hardware.cpp
-@@ -123,20 +123,18 @@ void ffmpeg_closeall() {
- ffmpeg_avformat_began = false;
- }
- avio_close(ffmpeg_fmt_ctx->pb);
-- if (ffmpeg_vid_ctx != NULL) avcodec_close(ffmpeg_vid_ctx);
-- if (ffmpeg_aud_ctx != NULL) avcodec_close(ffmpeg_aud_ctx);
-+ if (ffmpeg_vid_ctx != NULL) avcodec_free_context(&ffmpeg_vid_ctx);
-+ if (ffmpeg_aud_ctx != NULL) avcodec_free_context(&ffmpeg_aud_ctx);
- avformat_free_context(ffmpeg_fmt_ctx);
- ffmpeg_fmt_ctx = NULL;
- ffmpeg_vid_ctx = NULL; // NTS: avformat_free_context() freed this for us, don't free again
- ffmpeg_aud_ctx = NULL; // NTS: avformat_free_context() freed this for us, don't free again
- }
- if (ffmpeg_vid_ctx != NULL) {
-- avcodec_close(ffmpeg_vid_ctx);
- avcodec_free_context(&ffmpeg_vid_ctx);
- ffmpeg_vid_ctx = NULL;
- }
- if (ffmpeg_aud_ctx != NULL) {
-- avcodec_close(ffmpeg_aud_ctx);
- avcodec_free_context(&ffmpeg_aud_ctx);
- ffmpeg_aud_ctx = NULL;
- }
-@@ -171,7 +169,6 @@ void ffmpeg_audio_frame_send() {
-
- if (!pkt) E_Exit("Error: Unable to alloc packet");
-
-- ffmpeg_aud_frame->key_frame = 1;
- ffmpeg_aud_frame->pts = (int64_t)ffmpeg_audio_sample_counter;
- r=avcodec_send_frame(ffmpeg_aud_ctx,ffmpeg_aud_frame);
- if (r < 0 && r != AVERROR(EAGAIN))
-@@ -426,7 +423,6 @@ void ffmpeg_reopen_video(double fps,const int bpp) {
-
- void ffmpeg_reopen_video(double fps,const int bpp) {
- if (ffmpeg_vid_ctx != NULL) {
-- avcodec_close(ffmpeg_vid_ctx);
- avcodec_free_context(&ffmpeg_vid_ctx);
- ffmpeg_vid_ctx = NULL;
- }
-@@ -1271,7 +1267,7 @@ skip_shot:
- ffmpeg_aud_ctx->sample_rate = (int)capture.video.audiorate;
- ffmpeg_aud_ctx->flags = 0; // do not use global headers
- ffmpeg_aud_ctx->bit_rate = 320000;
-- ffmpeg_aud_ctx->profile = FF_PROFILE_AAC_LOW;
-+ // ffmpeg_aud_ctx->profile = FF_PROFILE_AAC_LOW;
-
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,24,100)
- ffmpeg_aud_ctx->channels = 2;
-@@ -1531,7 +1527,6 @@ skip_shot:
-
- // encode it
- ffmpeg_vid_frame->pts = (int64_t)capture.video.frames; // or else libx264 complains about non-monotonic timestamps
-- ffmpeg_vid_frame->key_frame = ((capture.video.frames % 15) == 0)?1:0;
-
- r=avcodec_send_frame(ffmpeg_vid_ctx,ffmpeg_vid_frame);
- if (r < 0 && r != AVERROR(EAGAIN))
-@@ -1768,7 +1763,7 @@ skip_mt_wav:
- }
-
- #pragma pack(push,1)
--typedef struct pcap_hdr_struct_t {
-+typedef struct {
- uint32_t magic_number; /* magic number */
- uint16_t version_major; /* major version number */
- uint16_t version_minor; /* minor version number */
-@@ -1776,14 +1771,14 @@ typedef struct pcap_hdr_struct_t {
- uint32_t sigfigs; /* accuracy of timestamps */
- uint32_t snaplen; /* max length of captured packets, in octets */
- uint32_t network; /* data link type */
--};
-+} pcap_hdr_struct_t;
-
--typedef struct pcaprec_hdr_struct_t {
-+typedef struct {
- uint32_t ts_sec; /* timestamp seconds */
- uint32_t ts_usec; /* timestamp microseconds */
- uint32_t incl_len; /* number of octets of packet saved in file */
- uint32_t orig_len; /* actual length of packet */
--};
-+} pcaprec_hdr_struct_t;
- #pragma pack(pop)
-
- void Capture_WritePacket(bool /*send*/,const unsigned char *buf,size_t len) {
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 80b3eeb0c45a..29dc9baa8070 100644
--- a/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp
+++ b/emulators/dosbox-x/files/patch-src_gui_sdl__gui.cpp
@@ -1,6 +1,6 @@
---- src/gui/sdl_gui.cpp.orig 2024-10-02 06:16:36 UTC
+--- src/gui/sdl_gui.cpp.orig 2025-10-07 15:49:14 UTC
+++ src/gui/sdl_gui.cpp
-@@ -3888,6 +3888,7 @@ void GUI_Shortcut(int select) {
+@@ -3886,6 +3886,7 @@ void GUI_Shortcut(int select) {
shortcutid=select;
shortcut=true;
sel = select;
@@ -8,7 +8,7 @@
#if defined(USE_TTF)
if (ttf.inUse && !confres) {
ttf_switch_off();
-@@ -3897,12 +3898,14 @@ void GUI_Shortcut(int select) {
+@@ -3895,12 +3896,14 @@ void GUI_Shortcut(int select) {
} else
#endif
RunCfgTool(0);
@@ -23,7 +23,7 @@
#if defined(USE_TTF)
if (ttf.inUse) {
ttf_switch_off();
-@@ -3912,4 +3915,5 @@ void GUI_Run(bool pressed) {
+@@ -3910,4 +3913,5 @@ void GUI_Run(bool pressed) {
} else
#endif
RunCfgTool(0);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-10 00:48:30 +0000