diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/Ymir/Makefile | 2 | ||||
| -rw-r--r-- | emulators/Ymir/distinfo | 6 | ||||
| -rw-r--r-- | emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_views_debug_debug__output__view.cpp | 11 | ||||
| -rw-r--r-- | emulators/wine-devel/Makefile | 61 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 2 |
5 files changed, 46 insertions, 36 deletions
diff --git a/emulators/Ymir/Makefile b/emulators/Ymir/Makefile index b6cfa0301e45..aaf5d4ed0a8c 100644 --- a/emulators/Ymir/Makefile +++ b/emulators/Ymir/Makefile @@ -1,6 +1,6 @@ PORTNAME= Ymir DISTVERSIONPREFIX= v -DISTVERSION= 0.1.7 +DISTVERSION= 0.1.8 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org diff --git a/emulators/Ymir/distinfo b/emulators/Ymir/distinfo index 78b5b3eb2cee..ea0e78976f0f 100644 --- a/emulators/Ymir/distinfo +++ b/emulators/Ymir/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1754870707 -SHA256 (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 8453407de50a4abef05c985f4eabf32b5185bf5a651583d250f820ff60bae93a -SIZE (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 5431708 +TIMESTAMP = 1757486628 +SHA256 (StrikerX3-Ymir-v0.1.8_GH0.tar.gz) = 6a5951c25a4a1796c0643aacdced3f31099014e4f89412c5eb11bb385c0218d3 +SIZE (StrikerX3-Ymir-v0.1.8_GH0.tar.gz) = 5477804 SHA256 (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 384d3a3ee249ebda0766fa5dc9f8bc5a871c8b2e3d3eedf46f330e6350058738 SIZE (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 34871 diff --git a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_views_debug_debug__output__view.cpp b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_views_debug_debug__output__view.cpp new file mode 100644 index 000000000000..aa1b8f1f6ff6 --- /dev/null +++ b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_ui_views_debug_debug__output__view.cpp @@ -0,0 +1,11 @@ +--- apps/ymir-sdl3/src/app/ui/views/debug/debug_output_view.cpp.orig 2025-09-10 06:46:50 UTC ++++ apps/ymir-sdl3/src/app/ui/views/debug/debug_output_view.cpp +@@ -4,7 +4,7 @@ + + #include <util/sdl_file_dialog.hpp> + +-#include <misc/cpp/imgui_stdlib.h> ++#include <imgui_stdlib.h> + + namespace app::ui { + diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index fbe30ff5b05d..a4bdf3863d39 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -18,18 +18,21 @@ ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex # Only devel/llvm17 and later come with necessary include files - PR274542 -USES= bison cpe desktop-file-utils gmake \ - llvm:min=17,build,noexport localbase \ - pkgconfig sdl shebangfix tar:xz +USES= bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \ + localbase pkgconfig sdl shebangfix tar:xz +CPE_VENDOR= winehq USE_GCC= yes +WINELIBDIR= ${PREFIX}/lib +.if !defined(USE_LDCONFIG32) +USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine +.endif USE_SDL= sdl2 -CPE_VENDOR= winehq - -CONFLICTS_INSTALL= wine +SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ + tools/winedump/function_grep.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--verbose \ +CONFIGURE_ARGS= --verbose \ --disable-kerberos \ --disable-tests \ --without-capi \ @@ -53,70 +56,66 @@ CONFIGURE_ARGS+=--verbose \ --without-unwind \ --without-usb CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" -WINELIBDIR= ${PREFIX}/lib -.if !defined(USE_LDCONFIG32) -USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine -.endif -SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ - tools/winedump/function_grep.pl + +PIE_UNSAFE= yes + +CONFLICTS_INSTALL= wine BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} SUB_FILES= pkg-message -PIE_UNSAFE= yes - PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO -OPTIONS_DEFAULT=ALSA GNUTLS WAYLAND X11 -OPTIONS_RADIO= AUDIO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GECKO GNUTLS MONO V4L WAYLAND X11 +OPTIONS_DEFAULT= ALSA GNUTLS WAYLAND X11 +OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS -OPTIONS_SUB= yes +OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine WAYLAND_DESC= Wayland Support -ALSA_CONFIGURE_WITH= alsa -ALSA_USES= gnome gstreamer -ALSA_USE= GNOME=glib20 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins +ALSA_USES= gnome gstreamer +ALSA_USE= GNOME=glib20 +ALSA_CONFIGURE_WITH= alsa -CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_WITH= cups DOSBOX_RUN_DEPENDS= dosbox:emulators/dosbox GECKO_RUN_DEPENDS= wine-gecko-devel>0:emulators/wine-gecko-devel -GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel -OSS_CONFIGURE_WITH= oss OSS_USES= gnome gstreamer OSS_USE= GNOME=glib20 +OSS_CONFIGURE_WITH= oss -V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l +V4L_CONFIGURE_WITH= v4l2 -WAYLAND_CONFIGURE_WITH= wayland WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon +WAYLAND_CONFIGURE_WITH= wayland -X11_CONFIGURE_WITH= x fontconfig freetype opengl xinerama xinput2 xrandr xrender -X11_USES= gl xorg -X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libvulkan.so:graphics/vulkan-loader +X11_USES= gl xorg +X11_USE= GL=glu XORG=x11,xcomposite,xcursor,xext,xi,xinerama,xrandr,xrender +X11_CONFIGURE_WITH= fontconfig freetype opengl x xinerama xinput2 xrandr xrender .include <bsd.port.pre.mk> @@ -147,7 +146,7 @@ post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop .else -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-tools-winebuild-res32 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-tools-winebuild-res32 PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" .endif diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 013bd97963f6..2dd3035e125d 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -82,7 +82,7 @@ GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine WAYLAND_DESC= Wayland Support -PORTSCOUT= limit:^9\.0 +PORTSCOUT= limit:^10\.0 ALSA_CONFIGURE_WITH= alsa ALSA_USES= gnome gstreamer |