summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/fs2open/Makefile3
-rw-r--r--games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch66
-rw-r--r--games/melonds/Makefile34
-rw-r--r--games/melonds/distinfo6
-rw-r--r--games/melonds/files/patch-backport-43d091361e25
-rw-r--r--games/melonds/files/patch-backport-e6cc4b14b032
6 files changed, 84 insertions, 82 deletions
diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile
index 42b562c71f42..723f6532d838 100644
--- a/games/fs2open/Makefile
+++ b/games/fs2open/Makefile
@@ -7,6 +7,9 @@ MAINTAINER= pkubaj@FreeBSD.org
COMMENT= Open source video engine of FreeSpace 2
WWW= http://scp.indiegames.us
+# fix build with recent ffmpeg
+EXTRA_PATCHES= ${FILESDIR}/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch:-p1
+
LICENSE= VOLITION
LICENSE_NAME= Volition Copyright
LICENSE_FILE= ${WRKSRC}/Copying.md
diff --git a/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch
new file mode 100644
index 000000000000..2c456bb22a5f
--- /dev/null
+++ b/games/fs2open/files/af833f059cc0cfc925792e019f6c2b754c6d53c1.patch
@@ -0,0 +1,66 @@
+From af833f059cc0cfc925792e019f6c2b754c6d53c1 Mon Sep 17 00:00:00 2001
+From: Taylor Richards <taylor@notimaginative.com>
+Date: Sun, 17 Aug 2025 17:09:41 -0400
+Subject: [PATCH] fix avcodec deprecation warnings
+
+---
+ code/cutscene/ffmpeg/internal.cpp | 9 ++++++---
+ code/sound/ffmpeg/FFmpegWaveFile.cpp | 3 ++-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/code/cutscene/ffmpeg/internal.cpp b/code/cutscene/ffmpeg/internal.cpp
+index be0920a5068..4f087d10191 100644
+--- a/code/cutscene/ffmpeg/internal.cpp
++++ b/code/cutscene/ffmpeg/internal.cpp
+@@ -12,9 +12,10 @@ DecoderStatus::~DecoderStatus() {
+ videoCodec = nullptr;
+
+ if (videoCodecCtx != nullptr) {
+- avcodec_close(videoCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ avcodec_free_context(&videoCodecCtx);
++#else
++ avcodec_close(videoCodecCtx);
+ #endif
+ videoCodecCtx = nullptr;
+ }
+@@ -24,9 +25,10 @@ DecoderStatus::~DecoderStatus() {
+ audioCodec = nullptr;
+
+ if (audioCodecCtx != nullptr) {
+- avcodec_close(audioCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ avcodec_free_context(&audioCodecCtx);
++#else
++ avcodec_close(audioCodecCtx);
+ #endif
+ audioCodecCtx = nullptr;
+ }
+@@ -36,9 +38,10 @@ DecoderStatus::~DecoderStatus() {
+ subtitleCodec = nullptr;
+
+ if (subtitleCodecCtx != nullptr) {
+- avcodec_close(subtitleCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ avcodec_free_context(&subtitleCodecCtx);
++#else
++ avcodec_close(subtitleCodecCtx);
+ #endif
+ subtitleCodecCtx = nullptr;
+ }
+diff --git a/code/sound/ffmpeg/FFmpegWaveFile.cpp b/code/sound/ffmpeg/FFmpegWaveFile.cpp
+index ab1e0ddc520..77541d7b826 100644
+--- a/code/sound/ffmpeg/FFmpegWaveFile.cpp
++++ b/code/sound/ffmpeg/FFmpegWaveFile.cpp
+@@ -151,9 +151,10 @@ FFmpegWaveFile::~FFmpegWaveFile()
+ av_frame_free(&m_decodeFrame);
+
+ if (m_audioCodecCtx) {
+- avcodec_close(m_audioCodecCtx);
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+ avcodec_free_context(&m_audioCodecCtx);
++#else
++ avcodec_close(m_audioCodecCtx);
+ #endif
+ m_audioCodecCtx = nullptr;
+ }
diff --git a/games/melonds/Makefile b/games/melonds/Makefile
index bd1dc8eef1b5..6e9c93bdc393 100644
--- a/games/melonds/Makefile
+++ b/games/melonds/Makefile
@@ -1,7 +1,7 @@
PORTNAME= melonds
-PORTVERSION= 0.9.5
+PORTVERSION= 1.1
CATEGORIES= games
-PKGNAMESUFFIX= -${FLAVOR}
+PKGNAMESUFFIX= -qt6
MAINTAINER= henry.hu.sh@gmail.com
COMMENT= Nintendo DS emulator
@@ -12,33 +12,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_i386= static_assert failed due to requirement 'sizeof(TestCase) == 4312'
-LIB_DEPENDS= libslirp.so:net/libslirp
+LIB_DEPENDS= libfaad.so:audio/faad \
+ libenet.so:net/enet \
+ libslirp.so:net/libslirp
-FLAVORS= qt5 qt6
-FLAVOR?= qt5
-
-USES= cmake compiler:c++17-lang desktop-file-utils gnome \
- iconv libarchive pkgconfig qt:${FLAVOR:S/qt//} sdl kde:5
+USES= cmake compiler:c++17-lang desktop-file-utils gl gnome \
+ iconv kde:6 libarchive pkgconfig qt:6 sdl xorg
+USE_GL= egl opengl
USE_GNOME= glib20
-USE_SDL= sdl2
USE_KDE= ecm:build
-
-.if ${FLAVOR} == qt5
-CMAKE_OFF= USE_QT6
-.else
-CMAKE_ON= USE_QT6
-.endif
+USE_QT= base multimedia
+USE_SDL= sdl2
+USE_XORG= ice sm x11 xext
USE_GITHUB= yes
GH_ACCOUNT= melonDS-emu
GH_PROJECT= melonDS
-GH_TAGNAME= 0.9.5
-
-qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
-qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-_USE_QT5= core gui network widgets multimedia buildtools:build qmake:build
-_USE_QT6= base multimedia
-USE_QT= ${_USE_QT${FLAVOR:S/qt//}}
+CMAKE_ON= USE_SYSTEM_LIBSLIRP
.include <bsd.port.mk>
diff --git a/games/melonds/distinfo b/games/melonds/distinfo
index 62ab9fcd2e1a..465197ac6014 100644
--- a/games/melonds/distinfo
+++ b/games/melonds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689499885
-SHA256 (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 52c6b99340b8bba8c52b11a2242591f05e838c34ddd9ec20dcf1a6039405434a
-SIZE (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 2496704
+TIMESTAMP = 1765272179
+SHA256 (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 61e339bcb18a68a17485973637d972ea628c5624d7e6b8adf6870f895d5e26fd
+SIZE (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 3673157
diff --git a/games/melonds/files/patch-backport-43d091361e b/games/melonds/files/patch-backport-43d091361e
deleted file mode 100644
index 0eaa9e42bbae..000000000000
--- a/games/melonds/files/patch-backport-43d091361e
+++ /dev/null
@@ -1,25 +0,0 @@
-From 43d091361ed6b400a68911147fd5fe524ccecf34 Mon Sep 17 00:00:00 2001
-From: RSDuck <RSDuck@users.noreply.github.com>
-Date: Fri, 25 Nov 2022 23:47:36 +0100
-Subject: [PATCH] fix #1551
-
----
- src/frontend/duckstation/duckstation_compat.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/frontend/duckstation/duckstation_compat.h src/frontend/duckstation/duckstation_compat.h
-index a661e926..fed37805 100644
---- src/frontend/duckstation/duckstation_compat.h
-+++ src/frontend/duckstation/duckstation_compat.h
-@@ -12,6 +12,6 @@
-
- #define Panic(msg) assert(false && msg)
-
--#define UnreachableCode() __builtin_unreachable
-+#define UnreachableCode() __builtin_unreachable()
-
- #endif
-\ No newline at end of file
---
-2.41.0
-
diff --git a/games/melonds/files/patch-backport-e6cc4b14b0 b/games/melonds/files/patch-backport-e6cc4b14b0
deleted file mode 100644
index 91ec9e0976a0..000000000000
--- a/games/melonds/files/patch-backport-e6cc4b14b0
+++ /dev/null
@@ -1,32 +0,0 @@
-From e6cc4b14b0eb603001e968be9b1ace8a09e1bce1 Mon Sep 17 00:00:00 2001
-From: Nadia Holmquist Pedersen <nadia@nhp.sh>
-Date: Sun, 16 Jul 2023 15:46:50 +0200
-Subject: [PATCH] Work around a strange bug in Qt5 that causes melonDS to crash
- on launch
-
-...but only with LTO enabled
-...but only on some UNIX systems
-...but only with some additional build options except when it breaks
- without any as well
----
- src/frontend/qt_sdl/CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git src/frontend/qt_sdl/CMakeLists.txt src/frontend/qt_sdl/CMakeLists.txt
-index 0ae6ecea..24261030 100644
---- src/frontend/qt_sdl/CMakeLists.txt
-+++ src/frontend/qt_sdl/CMakeLists.txt
-@@ -222,4 +222,10 @@ if (UNIX AND NOT APPLE)
-
- install(FILES ${CMAKE_SOURCE_DIR}/res/net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
- install(TARGETS melonDS BUNDLE DESTINATION ${CMAKE_BINARY_DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+
-+ if (NOT USE_QT6)
-+ set_target_properties(melonDS PROPERTIES
-+ INTERPROCEDURAL_OPTIMIZATION OFF
-+ INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF)
-+ endif()
- endif()
---
-2.41.0
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 03:34:51 +0000