diff options
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/dolphin-emu/Makefile | 7 | ||||
-rw-r--r-- | emulators/dolphin-emu/distinfo | 6 | ||||
-rw-r--r-- | emulators/wine/Makefile | 10 | ||||
-rw-r--r-- | emulators/wine/files/patch-man | 94 | ||||
-rw-r--r-- | emulators/wine/pkg-plist | 8 |
5 files changed, 119 insertions, 6 deletions
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index a4f52e9efce0..1cbe42b46e74 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -1,8 +1,13 @@ PORTNAME= dolphin-emu PORTVERSION= 2412 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators +# XXX Backport fmt>=11 support +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= b79bdb13c05b.patch:-p1 +PATCHFILES+= 825092ad33a2.patch:-p1 + MAINTAINER= martymac@FreeBSD.org COMMENT= Gamecube and Wii Emulator WWW= https://www.dolphin-emu.org diff --git a/emulators/dolphin-emu/distinfo b/emulators/dolphin-emu/distinfo index 26bf4a00eab1..48a44bb7014e 100644 --- a/emulators/dolphin-emu/distinfo +++ b/emulators/dolphin-emu/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1737057858 +TIMESTAMP = 1747599788 SHA256 (dolphin-emu-dolphin-2412_GH0.tar.gz) = 6aafc7d3b6f735a727db26c329679d4973b1b15e028c82e4452c33c4eb9fefa4 SIZE (dolphin-emu-dolphin-2412_GH0.tar.gz) = 19926717 SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-009ecd192c1289c7529bff248a16cfe896254816_GH0.tar.gz) = 5ed5125086a92666f1698df907a29f54f11197c382996094b556a1b22186ecaf @@ -17,3 +17,7 @@ SHA256 (syoyo-tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b_GH0.tar.gz) = 63 SIZE (syoyo-tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b_GH0.tar.gz) = 5903179 SHA256 (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 9f5b073625375322236a94ce8d2d803cdedad321c91e63845f487b9ebfb2c433 SIZE (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 7234 +SHA256 (b79bdb13c05b.patch) = 1e4fe7e830f2d3ab61a24694e8b7470be844b56381481c44acce0f10945bcee2 +SIZE (b79bdb13c05b.patch) = 2867 +SHA256 (825092ad33a2.patch) = 5d68298c60ea7b891ef43e5361fe24559fa2981bcc0e40174dc8f850f95d5846 +SIZE (825092ad33a2.patch) = 829 diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index fbe10774a157..12125ec82fc2 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 10.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.0/ @@ -147,6 +148,7 @@ PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64" # FreeBSD yet. post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop + ${MV} ${WRKSRC}/loader/*.man.in ${WRKSRC}/tools/wine/ .else EXTRA_PATCHES+= files/extra-patch-tools-winebuild-res32 @@ -157,6 +159,14 @@ pre-build: cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_CMD} depend post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_MAN} ${WRKSRC}/tools/wine/wine.man ${STAGEDIR}${PREFIX}/share/man/man1/wine.1 + ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/wine.1 +.for m in de.UTF-8 fr.UTF-8 pl.UTF-8 + ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/${m}/man1 + ${INSTALL_MAN} ${WRKSRC}/tools/wine/wine.${m}.man ${STAGEDIR}${PREFIX}/share/man/${m}/man1/wine.1 + ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/${m}/man1/wine.1 +.endfor .if ${ARCH} == i386 ${MV} ${STAGEDIR}${PREFIX}/bin/wineserver ${STAGEDIR}${PREFIX}/bin/wineserver32 ${MV} ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/wine.bin diff --git a/emulators/wine/files/patch-man b/emulators/wine/files/patch-man new file mode 100644 index 000000000000..849a560ae899 --- /dev/null +++ b/emulators/wine/files/patch-man @@ -0,0 +1,94 @@ +This backports (parts of) + + commit 22a90656baebdbbe8ec30d3f00f86d6e34f1451e + Author: Alexandre Julliard <julliard@winehq.org> + Date: Thu Feb 13 13:44:17 2025 +0100 + + tools: Move the loader man pages to the new Wine loader directory. + +and + + commit 6d28db86c9c2559e67a4820175416aff20f7abec + Author: Alexandre Julliard <julliard@winehq.org> + Date: Thu Feb 13 13:40:44 2025 +0100 + + tools: Add a simpler Wine launcher in the bin directory. + +with some tweaks and hacks in the port Makefile. Luckily all of this +will be obsolete with the next major version. + +--- UTC +--- configure ++++ configure +@@ -1762,6 +1762,7 @@ enable_server + enable_tools + enable_sfnt2fon + enable_widl ++enable_wine + enable_winebuild + enable_winedump + enable_winegcc +@@ -23212,6 +23214,7 @@ wine_fn_config_makefile server enable_server + test "x$enable_tools" = xno || wine_fn_config_makefile tools enable_tools + test "x$enable_tools" = xno || wine_fn_config_makefile tools/sfnt2fon enable_sfnt2fon + test "x$enable_tools" = xno || wine_fn_config_makefile tools/widl enable_widl ++test "x$enable_tools" = xno || wine_fn_config_makefile tools/wine enable_wine + test "x$enable_tools" = xno || wine_fn_config_makefile tools/winebuild enable_winebuild + test "x$enable_tools" = xno || wine_fn_config_makefile tools/winedump enable_winedump + test "x$enable_tools" = xno || wine_fn_config_makefile tools/winegcc enable_winegcc +--- UTC +--- configure.ac ++++ configure.ac +@@ -3554,6 +3555,7 @@ WINE_CONFIG_MAKEFILE(server) + WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) + WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) + WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) ++WINE_CONFIG_MAKEFILE(tools/wine,,[test "x$enable_tools" = xno]) + WINE_CONFIG_MAKEFILE(tools/winebuild,,[test "x$enable_tools" = xno]) + WINE_CONFIG_MAKEFILE(tools/winedump,,[test "x$enable_tools" = xno]) + WINE_CONFIG_MAKEFILE(tools/winegcc,,[test "x$enable_tools" = xno]) +diff --git a/tools/wine/Makefile.in b/tools/wine/Makefile.in +new file mode 100644 +index 00000000000..445e1dde9d0 +--- UTC +--- /dev/null ++++ tools/wine/Makefile.in +@@ -0,0 +1,8 @@ ++PROGRAMS = wine ++ ++SOURCES = \ ++ wine.c \ ++ wine.de.UTF-8.man.in \ ++ wine.fr.UTF-8.man.in \ ++ wine.man.in \ ++ wine.pl.UTF-8.man.in ++ ++wine_EXTRADEFS = -DBINDIR="\"${bindir}\"" -DLIBDIR="\"${libdir}\"" ++ ++INSTALL_LIB = $(PROGRAMS) +--- UTC +--- loader/Makefile.in ++++ loader/Makefile.in +@@ -2,12 +2,8 @@ SOURCES = \ + main.c \ + preloader.c \ + preloader_mac.c \ +- wine.de.UTF-8.man.in \ + wine.desktop \ +- wine.fr.UTF-8.man.in \ + wine.inf.in \ +- wine.man.in \ +- wine.pl.UTF-8.man.in \ + wine_info.plist.in + + PROGRAMS = $(WINELOADER_PROGRAMS) +--- UTC +--- /dev/null ++++ tools/wine/wine.c +@@ -0,0 +1,6 @@ ++#include <stdarg.h> ++ ++int main( int argc, char *argv[] ) ++{ ++return 99; ++} diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index 0bfd77c65e01..23a7da444d60 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -2691,10 +2691,10 @@ lib/wine/%%WINEARCH%%-windows/xolehlp.dll lib/wine/%%WINEARCH%%-windows/xpsprint.dll lib/wine/%%WINEARCH%%-windows/xpssvcs.dll share/applications/wine.desktop -%%WINE32%%share/man/de.UTF-8/man1/wine.1.gz +share/man/de.UTF-8/man1/wine.1.gz share/man/de.UTF-8/man1/winemaker.1.gz share/man/de.UTF-8/man1/wineserver.1.gz -%%WINE32%%share/man/fr.UTF-8/man1/wine.1.gz +share/man/fr.UTF-8/man1/wine.1.gz share/man/fr.UTF-8/man1/winemaker.1.gz share/man/fr.UTF-8/man1/wineserver.1.gz share/man/man1/msiexec.1.gz @@ -2702,7 +2702,7 @@ share/man/man1/notepad.1.gz share/man/man1/regedit.1.gz share/man/man1/regsvr32.1.gz share/man/man1/widl.1.gz -%%WINE32%%share/man/man1/wine.1.gz +share/man/man1/wine.1.gz share/man/man1/wineboot.1.gz share/man/man1/winebuild.1.gz share/man/man1/winecfg.1.gz @@ -2719,7 +2719,7 @@ share/man/man1/winepath.1.gz share/man/man1/wineserver.1.gz share/man/man1/wmc.1.gz share/man/man1/wrc.1.gz -%%WINE32%%share/man/pl.UTF-8/man1/wine.1.gz +share/man/pl.UTF-8/man1/wine.1.gz %%DATADIR%%/nls/c_037.nls %%DATADIR%%/nls/c_10000.nls %%DATADIR%%/nls/c_10001.nls |