aboutsummaryrefslogtreecommitdiff
path: root/emulators/86Box
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/86Box')
-rw-r--r--emulators/86Box/Makefile40
-rw-r--r--emulators/86Box/distinfo6
-rw-r--r--emulators/86Box/files/86Box-install-roms.sh.in2
-rw-r--r--emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake10
-rw-r--r--emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake10
-rw-r--r--emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake12
-rw-r--r--emulators/86Box/files/patch-cmake_flags-gcc.cmake11
-rw-r--r--emulators/86Box/files/patch-src_printer_CMakeLists.txt10
-rw-r--r--emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp10
9 files changed, 18 insertions, 93 deletions
diff --git a/emulators/86Box/Makefile b/emulators/86Box/Makefile
index 001776a75946..09e35b8a4d42 100644
--- a/emulators/86Box/Makefile
+++ b/emulators/86Box/Makefile
@@ -1,9 +1,9 @@
PORTNAME= 86Box
DISTVERSIONPREFIX= v
-DISTVERSION= 4.2.1
+DISTVERSION= 5.1
CATEGORIES= emulators
-MAINTAINER= tiago.gasiba@gmail.com
+MAINTAINER= tiga@FreeBSD.org
COMMENT= Emulator of x86-based machines based on PCem
WWW= https://86box.net/
@@ -23,38 +23,28 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \
libsndfile.so:audio/libsndfile \
libxkbcommon.so:x11/libxkbcommon
-FLAVORS= qt6 qt5
-FLAVOR?= qt6
-qt5_PKGNAMESUFFIX= -qt5
-qt6_PKGNAMESUFFIX= -qt6
-
-USES= cmake compiler:c++11-lang gnome pkgconfig qmake sdl xorg
+USES= cmake compiler:c++11-lang gl gnome pkgconfig qmake qt:6 sdl \
+ xorg
USE_GITHUB= yes
+USE_GL= opengl
USE_GNOME= glib20
+USE_QT= base tools:build
USE_SDL= sdl2
USE_XORG= x11 xcb xext xi
-.if ${FLAVOR} == qt5
-USES+= qt:5
-USE_QT= core gui network opengl widgets buildtools:build \
- linguisttools:build
-.else
BUILD_DEPENDS+= vulkan-headers>0:graphics/vulkan-headers
-USES+= gl qt:6
-USE_GL= opengl
-USE_QT= base tools:build
CMAKE_ON= USE_QT6
-CXXFLAGS+= -I${LOCALBASE}/include/qt6/QtGui/`pkg-config --modversion Qt6Gui`/QtGui
-.endif
-CMAKE_ON+= RELEASE ${CMAKE_ON_${ARCH}}
+CMAKE_ON+= ${CMAKE_ON_${ARCH}} RELEASE
CMAKE_ON_aarch64= NEW_DYNAREC
-CMAKE_OFF= DISCORD ${CMAKE_OFF_${ARCH}}
+CMAKE_OFF= ${CMAKE_OFF_${ARCH}} DISCORD
CMAKE_OFF_powerpc64le= DYNAREC
-SUB_FILES= 86Box-install-roms.sh
-SUB_LIST= DISTVERSION=${DISTVERSION} \
- DISTVERSIONPREFIX=${DISTVERSIONPREFIX}
+CXXFLAGS+= -I${LOCALBASE}/include/qt6/QtGui/`pkg-config --modversion Qt6Gui`/QtGui
+
+SUB_FILES= 86Box-install-roms.sh
+SUB_LIST= DISTVERSION=${DISTVERSION} \
+ DISTVERSIONPREFIX=${DISTVERSIONPREFIX}
OPTIONS_DEFINE= NLS WAYLAND
OPTIONS_DEFAULT= WAYLAND
@@ -64,7 +54,7 @@ NLS_CONFIGURE_ENABLE= nls
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
WAYLAND_USES= kde:5
-WAYLAND_USE= kde=ecm:build
+WAYLAND_USE= KDE=ecm:build
WAYLAND_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Wayland:BOOL=ON
ICON_RESOLUTIONS= 128x128 192x192 256x256 48x48 512x512 64x64 72x72 96x96
@@ -72,8 +62,6 @@ ICON_RESOLUTIONS= 128x128 192x192 256x256 48x48 512x512 64x64 72x72 96x96
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/.build/src/86Box ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKDIR}/86Box-install-roms.sh ${STAGEDIR}${PREFIX}/bin
- ${REINPLACE_CMD} -e 's|Exec=86Box|Exec=/bin/sh -c "${PREFIX}/bin/86Box -C $${HOME}/.config/86Box.cfg"|' \
- ${WRKSRC}/src/unix/assets/net.86box.86Box.desktop
${INSTALL_DATA} ${WRKSRC}/src/unix/assets/net.86box.86Box.desktop \
${STAGEDIR}${DESKTOPDIR}
.for F in ${ICON_RESOLUTIONS}
diff --git a/emulators/86Box/distinfo b/emulators/86Box/distinfo
index 4c04656dbfcc..2af26efb0b3d 100644
--- a/emulators/86Box/distinfo
+++ b/emulators/86Box/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1728389339
-SHA256 (86Box-86Box-v4.2.1_GH0.tar.gz) = 9d5627ef96feb815e66b87f167a1b26f4615fccd730334053293eb038f5ec3a9
-SIZE (86Box-86Box-v4.2.1_GH0.tar.gz) = 5320110
+TIMESTAMP = 1759866999
+SHA256 (86Box-86Box-v5.1_GH0.tar.gz) = 942e9a2c8c8db3545eddf47854e8ac7585512060f41dbd7bb67b810f537b5eaa
+SIZE (86Box-86Box-v5.1_GH0.tar.gz) = 13904013
diff --git a/emulators/86Box/files/86Box-install-roms.sh.in b/emulators/86Box/files/86Box-install-roms.sh.in
index 0c0cf18f342b..6b899380545a 100644
--- a/emulators/86Box/files/86Box-install-roms.sh.in
+++ b/emulators/86Box/files/86Box-install-roms.sh.in
@@ -5,7 +5,7 @@ DEFAULT_TARGET_DIR="$HOME/.local/share/86Box/"
TARGET_DIR=${TARGET_DIR:-$DEFAULT_TARGET_DIR}
install_roms() {
- if [ -d "$TARGET_DIR" ] && [ "$(ls -A $TARGET_DIR)" ]; then
+ if [ -d "$TARGET_DIR/roms" ] && [ "$(ls -A $TARGET_DIR/roms)" ]; then
echo "ROMs already installed in $TARGET_DIR"
echo "To (re)install, please first remove ROMs with -r parameter"
exit 1
diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake
deleted file mode 100644
index 3a58a593294f..000000000000
--- a/emulators/86Box/files/patch-cmake_flags-gcc-aarch64.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/flags-gcc-aarch64.cmake.orig 2024-07-26 18:14:45 UTC
-+++ cmake/flags-gcc-aarch64.cmake
-@@ -14,7 +14,4 @@
- # Copyright 2021 David Hrdlička.
- #
-
--string(APPEND CMAKE_C_FLAGS_INIT " -march=armv8-a")
--string(APPEND CMAKE_CXX_FLAGS_INIT " -march=armv8-a")
--
- include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake
deleted file mode 100644
index 5809748fa55e..000000000000
--- a/emulators/86Box/files/patch-cmake_flags-gcc-armv7.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/flags-gcc-armv7.cmake.orig 2024-07-26 18:16:08 UTC
-+++ cmake/flags-gcc-armv7.cmake
-@@ -14,7 +14,4 @@
- # Copyright 2021 David Hrdlička.
- #
-
--string(APPEND CMAKE_C_FLAGS_INIT " -march=armv7-a+fp -mfloat-abi=hard")
--string(APPEND CMAKE_CXX_FLAGS_INIT " -march=armv7-a+fp -mfloat-abi=hard")
--
- include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
diff --git a/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake b/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake
deleted file mode 100644
index 100bdd0cb47c..000000000000
--- a/emulators/86Box/files/patch-cmake_flags-gcc-x86__64.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/flags-gcc-x86_64.cmake.orig 2024-07-26 18:16:26 UTC
-+++ cmake/flags-gcc-x86_64.cmake
-@@ -14,7 +14,7 @@
- # Copyright 2021 David Hrdlička.
- #
-
--string(APPEND CMAKE_C_FLAGS_INIT " -m64 -march=x86-64 -msse2 -mfpmath=sse -mstackrealign")
--string(APPEND CMAKE_CXX_FLAGS_INIT " -m64 -march=x86-64 -msse2 -mfpmath=sse -mstackrealign")
-+string(APPEND CMAKE_C_FLAGS_INIT " -mstackrealign")
-+string(APPEND CMAKE_CXX_FLAGS_INIT " -mstackrealign")
-
- include(${CMAKE_CURRENT_LIST_DIR}/flags-gcc.cmake)
diff --git a/emulators/86Box/files/patch-cmake_flags-gcc.cmake b/emulators/86Box/files/patch-cmake_flags-gcc.cmake
deleted file mode 100644
index d9b56c9c71ed..000000000000
--- a/emulators/86Box/files/patch-cmake_flags-gcc.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/flags-gcc.cmake.orig 2024-07-26 18:17:03 UTC
-+++ cmake/flags-gcc.cmake
-@@ -16,8 +16,6 @@ string(APPEND CMAKE_CXX_FLAGS_INIT " -fom
- # Define our flags
- string(APPEND CMAKE_C_FLAGS_INIT " -fomit-frame-pointer -Wall -fno-strict-aliasing -Werror=implicit-int -Werror=implicit-function-declaration -Werror=int-conversion -Werror=strict-prototypes -Werror=old-style-definition")
- string(APPEND CMAKE_CXX_FLAGS_INIT " -fomit-frame-pointer -Wall -fno-strict-aliasing")
--string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -g0 -O3")
--string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -g0 -O3")
- string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -ggdb -Og")
- string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -ggdb -Og")
- string(APPEND CMAKE_C_FLAGS_OPTIMIZED_INIT " -march=native -mtune=native -O3 -ffp-contract=fast -flto")
diff --git a/emulators/86Box/files/patch-src_printer_CMakeLists.txt b/emulators/86Box/files/patch-src_printer_CMakeLists.txt
deleted file mode 100644
index a6da4a25f91e..000000000000
--- a/emulators/86Box/files/patch-src_printer_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/printer/CMakeLists.txt.orig 2024-08-02 00:15:09 UTC
-+++ src/printer/CMakeLists.txt
-@@ -29,6 +29,7 @@ target_link_libraries(86Box PkgConfig::FREETYPE)
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2)
- target_link_libraries(86Box PkgConfig::FREETYPE)
-+target_include_directories(print PRIVATE ${FREETYPE_INCLUDE_DIRS})
- if(STATIC_BUILD)
- # if(QT)
- # Qt provides its own version of harfbuzz which leads to duplicated symbols.
diff --git a/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp b/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp
deleted file mode 100644
index e6bbf8c52860..000000000000
--- a/emulators/86Box/files/patch-src_qt_qt__mainwindow.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qt/qt_mainwindow.cpp.orig 2024-08-02 00:15:09 UTC
-+++ src/qt/qt_mainwindow.cpp
-@@ -378,6 +378,7 @@ MainWindow::MainWindow(QWidget *parent)
-
- #if QT_CONFIG(vulkan)
- bool vulkanAvailable = false;
-+ if (0)
- {
- QVulkanInstance instance;
- instance.setApiVersion(QVersionNumber(1, 0));
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 00:28:03 +0000