diff --git a/games-emulation/mame/mame-0.277.recipe b/games-emulation/mame/mame-0.277.recipe index bd167ce74..3a9c1b924 100644 --- a/games-emulation/mame/mame-0.277.recipe +++ b/games-emulation/mame/mame-0.277.recipe @@ -62,9 +62,9 @@ REQUIRES=" lib:libGL$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libSDL2_ttf_2.0$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix @@ -85,9 +85,9 @@ BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix devel:librapidjson$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + devel:libQt6Widgets$secondaryArchSuffix devel:libSDL2_2.0$secondaryArchSuffix devel:libSDL2_ttf_2.0$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix @@ -99,7 +99,6 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:moc$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix cmd:python3 cmd:sed @@ -140,6 +139,7 @@ BUILD() PRECOMPILE=0 \ NOWERROR=1 \ OPTIMIZE=$optimize \ + QT_HOME=/boot/system/lib/Qt6/ \ USE_QTDEBUG=1 \ USE_SYSTEM_LIB_ASIO=1 \ USE_SYSTEM_LIB_EXPAT=1 \ diff --git a/games-emulation/mame/patches/mame-0.277.patchset b/games-emulation/mame/patches/mame-0.277.patchset index 62f4773ea..92de12895 100644 --- a/games-emulation/mame/patches/mame-0.277.patchset +++ b/games-emulation/mame/patches/mame-0.277.patchset @@ -1,4 +1,4 @@ -From 8750f4b58380e36b325ed359fc206e9279d5a397 Mon Sep 17 00:00:00 2001 +From 86ea8891c3aae13a69702c458383443b6c4c8abc Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 10 Jun 2020 22:35:16 +1000 Subject: Haiku patches @@ -802,7 +802,7 @@ index 57ff069..e0ff74e 100644 2.48.1 -From d5e923e7c1ba3c8e16599c45a2ac932da073a52a Mon Sep 17 00:00:00 2001 +From 3cb6a7191c1fdba3fa5b4dccdd1a3325c5c47aa1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 11 Jun 2020 08:59:34 +1000 Subject: Use stat Haiku @@ -843,7 +843,7 @@ index dab8620..ceb2263 100644 2.48.1 -From 0488c4a5961b38cacfaaf50be669877ed9b66afd Mon Sep 17 00:00:00 2001 +From 55b8109ab4b808a558dfd2a7bb6129b56c7ddfd5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 11 Jun 2020 09:00:11 +1000 Subject: Disable ptty @@ -866,7 +866,7 @@ index e0ff74e..39a0a5a 100644 2.48.1 -From 05f9b98fd6e385f2eb1044bfbb006ce787868f72 Mon Sep 17 00:00:00 2001 +From 000e4647455661e12aea143854d5c77f54917221 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Fri, 5 Aug 2022 19:24:12 +0200 Subject: Allow use of Qt Debugger on Haiku @@ -905,7 +905,7 @@ index 93dba9a..79a69f1 100644 2.48.1 -From 2bc790bed38750d54cd6f7c084e6d8ff0cdc6cb4 Mon Sep 17 00:00:00 2001 +From e278d52a6565324af2f2c915e6d4b0d5bbfa5feb Mon Sep 17 00:00:00 2001 From: Alex Brown Date: Sat, 14 Oct 2023 11:26:57 +0100 Subject: toolchain.lua: set targetdir for Haiku @@ -960,7 +960,7 @@ index c730cd7..5069f04 100644 2.48.1 -From 636f530628959f4ef15efcc5ab22cbed1259c2c3 Mon Sep 17 00:00:00 2001 +From c6b586aa344b1ff9dccdc68604a9b25667ed14f7 Mon Sep 17 00:00:00 2001 From: Alex Brown Date: Sat, 14 Oct 2023 09:14:19 +0100 Subject: Set LinkSupportCircularDependencies for Haiku @@ -985,3 +985,62 @@ index 819b753..926b60e 100644 -- 2.48.1 + +From 839886e0047cf3182463bb54a0e0992396c11399 Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Thu, 1 May 2025 09:47:57 +0200 +Subject: Fix search for Qt6 + +Our Qt6 qmake is located in an unusual place, for some reason not in the bin +directory. + +diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua +index ca49a26..4919d85 100644 +--- a/scripts/src/osd/modules.lua ++++ b/scripts/src/osd/modules.lua +@@ -384,7 +384,7 @@ function qtdebuggerbuild() + if _OPTIONS["QT_HOME"]~=nil then + MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null") + if (MOCTST=='') then +- local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS") ++ local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/qmake -query QT_HOST_LIBEXECS") + if not string.starts(qt_host_libexecs,"/") then + qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec" + end +@@ -438,7 +438,7 @@ function qtdebuggerbuild() + else + if _OPTIONS["QT_HOME"]~=nil then + buildoptions { +- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), ++ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/qmake -query QT_INSTALL_HEADERS"), + } + else + buildoptions { +@@ -517,9 +517,9 @@ function osdmodulestargetconf() + end + else + if _OPTIONS["QT_HOME"]~=nil then +- local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION")) ++ local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/qmake -query QT_VERSION")) + linkoptions { +- "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), ++ "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/qmake -query QT_INSTALL_LIBS"), + } + if qt_version < 60000 then + links { +diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua +index f3a970c..544d447 100644 +--- a/scripts/src/osd/sdl_cfg.lua ++++ b/scripts/src/osd/sdl_cfg.lua +@@ -138,7 +138,7 @@ if _OPTIONS["targetos"]=="windows" then + elseif _OPTIONS["targetos"]=="linux" then + if _OPTIONS["QT_HOME"]~=nil then + buildoptions { +- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"), ++ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/qmake -query QT_INSTALL_HEADERS"), + } + else + buildoptions { +-- +2.48.1 +