diff options
Diffstat (limited to 'games-emulation')
-rw-r--r-- | games-emulation/Manifest.gz | bin | 12075 -> 12073 bytes | |||
-rw-r--r-- | games-emulation/dolphin/Manifest | 14 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-2407-r1.ebuild | 307 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-2412-r1.ebuild | 301 | ||||
-rw-r--r-- | games-emulation/dolphin/dolphin-2503.ebuild | 2 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-2407-fix-llvm-build.patch | 27 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-2407-libfmt-11-fix.patch | 103 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch | 68 | ||||
-rw-r--r-- | games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch | 75 | ||||
-rw-r--r-- | games-emulation/openmsx/Manifest | 2 | ||||
-rw-r--r-- | games-emulation/openmsx/openmsx-20.0.ebuild | 99 |
11 files changed, 103 insertions, 895 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex 64d0114c108a..2593c262f0cf 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index 0f88946d84e1..cc69ec414709 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -1,24 +1,12 @@ -AUX dolphin-2407-fix-llvm-build.patch 1361 BLAKE2B 262b0a84544204a72025da8ed7397cb5619736befdf7a3cf5099eb35ffe131ad46ddbfa5544a50dec1160b63b515b947fc25a6967ab365ea25fba97b87f1099b SHA512 3df2faab776861c29cbcf7fc40ca439e04dc03438434647519e65e066d86cf34f7fc155f99323f53fdc30a4368c0d95c87df384b21d839ee01be762aee8a6cb9 -AUX dolphin-2407-libfmt-11-fix.patch 2822 BLAKE2B 89c183a2841ad27c40f18b1d607b28b7908e7a34b2a649f6a84862ce695d8b6525bef70f3270c12983e918c8bd7d0e6cd3247325a7e0e4a632adac4e1556759b SHA512 ca07ed0582a9fde6e8d8035dfa778b55783a407c9f10c9de8d481591bfe5caf2d7f9e9a61f6b62c8d4db3dfe1cbef31c5d771ae44004a5cd52aacd3ddcec3cc2 AUX dolphin-2407-minizip.patch 422 BLAKE2B 359afbcaf0cc12e0320fd5c1074f2e47fc285e7eb97302daefa4b932c333c68f5bcc5385cb9a23aeb5b9547486632e532d2e20634ac12907ce7eeeada975c00e SHA512 d867cc862494d699ffe4fd83fc5ef360ebb89d1d7c3d879c5dd04257acba7187db35d772d2ff6d12264ee438f5a221f8b94c3c4ccbfa2a14c4f95735f80d8a81 -AUX dolphin-2412-fix-build-without-retro-achievements.patch 1979 BLAKE2B cba96c09b38253f0adc6879ccee6213f461b8ba08cbf71c0153ac335ca557e3aae9bc4e2625a724b4c7869006f42d4512f77edcfb340219035c4f535f22d5fef SHA512 9de8408eaec3b944ddbbcfebdb79d9787ae979684e776207b859e61a621d36e97c5eda75f45c6d48e2e3dde4d21930f603dde261d0ac0cfdae70378224c9b321 -AUX dolphin-2412-fix-libfmt-11.1.patch 3207 BLAKE2B 7d7a629fb5fc8ba65d4c513ac43405c66c5435ee9bb45f9c1272fc6d4ebc41692ac0210c84e40ad0a94a26ddb64f7092ed947dce222545a0fcefb4d548b8dd12 SHA512 44105f66f30351298805bc7ba21ea5969b23900afae8bb2b0117f095b40d9ea9755b33931b2ced6c0f58905e775db2f9375d1fc424a89427e0a686f4579dfaa8 -DIST Vulkan-Headers-05fe2cc910a68c9ba5dac07db46ef78573acee72.tar.gz 2288519 BLAKE2B bd11ba3ecac3bf0f6df255a4b87556092b9630c85b97cbcc2c0901d5293882da6f996e326cce8f410f8503f9e29454f0a2994c4adceb4565490d435b307d4495 SHA512 3679a087ea024a15b2d30730834345d2af3869ae012bcc5a996eed90558516d16b762010d887b9c762b5177bfc0a21b3bd29dbc4e236e067132623482068b058 DIST Vulkan-Headers-39f924b810e561fd86b2558b6711ca68d4363f68.tar.gz 2497345 BLAKE2B 66c276e4ecb6f648fb0ba7f211edda51d6ef8c439b88abdafd0bb33a7aa255e9189e88ef2a40179e9ab8433c82f98cbb40a8aaadbbd6a6e72c7a838ad68d07ae SHA512 2d722e32e3c5a217a62d0583fd1597fcf5e05c7092f0c629f54025ae8fdb22b12dba375d1aeeeb90e4a69507e254f33aebe435bf8f058f55a5ed3f5e6d351d6f -DIST VulkanMemoryAllocator-009ecd192c1289c7529bff248a16cfe896254816.tar.gz 904841 BLAKE2B 64966d40b86197a18f86c9715acb2ea649ea6b69d3de38d9385a8130e35519036eca49b7503886123284be58d5c248dd9d7c5cb16a489c64d385439c382dcd30 SHA512 3a47a4bc81562b96f598f357b803d2219fa167e6eb87779837efa6e85fc6eaff8e1cfbdea0935117a7b3c630cc99944b94e91823eafa8a94d80b2c459f33c317 DIST VulkanMemoryAllocator-3bab6924988e5f19bf36586a496156cf72f70d9f.tar.gz 937902 BLAKE2B d4c9d002ab787045e4d117237c3f7d031ec4dae514e958881529c6dc11cc6105dd57a26f214791f8e0943e2cfa105f90e99ee958b97c1c386ef44fcaad6b7d33 SHA512 6e2935ce6fbafc2cc8c5a34bf3eaa5dc2e8f65c97c886cfa57da0b45ca83bc8ade4429a7556ce6292af9aeb947d69231b50ae64a55a281c304176e8ea1cd2098 -DIST dolphin-2407.tar.gz 19773792 BLAKE2B a6de162479d45e6b1cba5444df5abdeafd92773d1e49cc837dfc6c1ab45ed11d7a3f72a582ddb56d0ecc6b550d03c1a02a9389852ba438d8a9235d5ea3285d4b SHA512 8bb8459d8b653708e34d5df184d96ba9705e8c50b00d066862d4012f78b7e71938207979b3bd900dd14c35c3b6c0258bb5c8fad9ba73267188e98d8a2edfb73f -DIST dolphin-2412.tar.gz 19926717 BLAKE2B 89036561987283067a1f116aa38a94c92d0c8e3114d28a0545787f63b389cb204b265bdd4c2452ec02ca3fe90fccf5fc0fd55be3acb9b8bd346e3738f3f96767 SHA512 3025e24b4cdc8cf3493e23a7968064cb9090d622a3a830b0a964fc87af840227125de8c0f69243c7d3975fc5ea2dd0c485d870301c25e8fa078abe83ae88bca9 DIST dolphin-2503.tar.gz 20148047 BLAKE2B 3b41fd126f3b61d2bb6e6232b3009901a6ec1b8a21e2df6932205aa1a4dc63441aff0fd60ecba1683350bb6b49c42d97e33d22c96ac150ce518eb8d79355693b SHA512 dd61676b2200d4f3a6b053b563f9687740bddc043733240ae0bf44f037b782ba292465c55a63930c8119f2e515476947f90b9e0348208881ecbd88c5def52e0c DIST implot-18c72431f8265e2b0b5378a3a73d8a883b2175ff.tar.gz 138121 BLAKE2B 481fe2b4ebd1ab3554465aff07b2c2e85f2db033de1ac69b95bcf56d269fcf01d8a0f951ad45ddcc0e192f1cc6cac3478633f006f403b8e930350891945ae87f SHA512 9cb2581a4e8d844914606f55a667afcfb31374973b0035b4d81488253e350df67439e97b46b236324c2a1e01146e6a191ad94d70823a3888c97e9380715272fa -DIST implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz 137924 BLAKE2B c830275b05a74e8a60a7164f22c01dd9a5a35f9219736785c9cc17830dae809eb8cba65604b0388c3966d7658c9fe71cb9a8468c23d3ed17b7890581a2222cb8 SHA512 ab9935e759f38d19e6f60ed195c22018929ba46fccf783f4486346d7ffb7040b6097bc4c3d3b3577cc91f0c413684e07449a24bebf3db9c937638092c181de92 DIST mgba-8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz 14488880 BLAKE2B 5beec2de9a0999a93a4ad704f45246b551824a9ddd576a5b77e731b269fb8f7d311d1c4e2cfb217f34e22a49050498c70e52d714d9c0bb7b4e4d178f49f15c3d SHA512 782d456b7bf827591c774f146a88821b41b3b936faefddb5aee82bb0dd16ca7ad7228a1c331e1e517eac40a71cc4c94cc44bee12560946328c8433e1c6327225 -DIST minizip-ng-3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70.tar.gz 770054 BLAKE2B 7d5b24a5be7134ac17178869883625b28fa80a55f878231ca4156901057db72b20b4d342f8d0bb04a436fcd72d7ccbb0f79adc8503a16e1197a84f3a476da730 SHA512 f76a2cefd7d9ad47f8c3c73b3483b657fab0507605e0b29895eaec759718a65f0d2915ea7022831f3f98493891a1ab4f5035971bf09d4860abbf4cde0b091869 DIST minizip-ng-55db144e03027b43263e5ebcb599bf0878ba58de.tar.gz 772757 BLAKE2B 853a252d2a8f8c0668804cf961626413aaf89a7eb85b27142860e379e933a54c0d847d976b007071636461b29dd85d6b910d44a6c140581b983b59b14bc4fd9c SHA512 88d1222886a3b5cd3ca1aff7b12902d1d19462c446ef39a092a56bb91b5889956afcce047b4227c79a50a95d9275bd0a23f5cd6cbef76478b6e21bbf86dd486b DIST tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz 5903179 BLAKE2B 0ef4b36cf26f3a5a544d0c739317b8cce041121b1dec58d1d9dbc3bbc892df284d80aa4c45ec1ebc332ba96b151230a5b0dbf95b95aefcf86ee7878c393eda5d SHA512 486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d DIST zlib-ng-ce01b1e41da298334f8214389cc9369540a7560f.tar.gz 2223118 BLAKE2B c79a138c31c74c291ae38a6c4d8983e0884169ced4147d7242d1a766f70777de0368ceba815ac2261bd2543dba55a6106b70f7e040fae4f200863da217f88978 SHA512 73f4e56410ae298ef211ebab52b1a0d3d5bfae91c2de3cd294b56cd0a78ab50e1203b396c7df462f360c1aaaa9392ec5625473d1e9eb084cc64bc813e28d12a1 -EBUILD dolphin-2407-r1.ebuild 7929 BLAKE2B eb479d7fcc7b26e29ca411ad94da93274cfce50c1ede826b8b44f7d69f57c4025137c729b5759615912e294ba000cf13da500c8d17a88bf6496749ef1e010cc7 SHA512 6ddda2a1ef5b4e35e51398cb1e9b0d42725d24d41a4026773669193af6fa7ef0df49f05d61f898ab8945e38230ea3b94c5f2d82fed2a52920ff69b387658c8fb -EBUILD dolphin-2412-r1.ebuild 7850 BLAKE2B 6724f234932cac0ec5c7333c167a037916ddc927a56479688f1fabf7e2be22991b2d742f451bdf20e7f01d96c5aa00d5cde7519bb33d17c2ee680f8470433ad5 SHA512 1e1450b045917e76c241835f07eee54004ad80e26be1733bc14787caedbfd8d1feb580391a29e5d365a5281b5a7a2bab71f21b9161eeffc255acb14eb020dfe7 -EBUILD dolphin-2503.ebuild 7749 BLAKE2B 2f354875467cb13ecffff7247afa58ee292faa3b75fe1e3a98e96f33f0d5751f0d4a142598be9a0951f96149709fbd8d0ef5eb6e48a3525ef724bc3fa3c714d8 SHA512 8ff1b0e8e741a2c42541546fb366c9ac1bae30c52d792165dc67ce475408b87e6d6cfa908f4f9df126963c49b0aadf60665d1bcfc16382528a8900e74709720b +EBUILD dolphin-2503.ebuild 7748 BLAKE2B cbe89f017e82a48c2f013a506847d833a9ffd6eab640253258716464ae422d0ba89807ed9d5a06cc3eb8f8389ab441f63618b1cd24f78710c1acda8fc44d4a4c SHA512 6bad1a8e5891c8e2ea7d60904c38f40942fb81f7a158f38c45ff4ca3ba6c6cd38bd676bf1b5aa5a3fb1fe9031cebfacf244b5a3dd3b0ef1b1a300ee843ecd8f4 EBUILD dolphin-9999.ebuild 7749 BLAKE2B 2f354875467cb13ecffff7247afa58ee292faa3b75fe1e3a98e96f33f0d5751f0d4a142598be9a0951f96149709fbd8d0ef5eb6e48a3525ef724bc3fa3c714d8 SHA512 8ff1b0e8e741a2c42541546fb366c9ac1bae30c52d792165dc67ce475408b87e6d6cfa908f4f9df126963c49b0aadf60665d1bcfc16382528a8900e74709720b MISC metadata.xml 1003 BLAKE2B 29d426769469da0b23975299b97d310f962b1c3c18a765389b47b8361821014f45b068991b1b21a57344ce34815a1ce609e6c552ed992eff9b84045b74872e41 SHA512 50c546c0a35693c1e1c3d8b53e697e19fc675dd577f6803abe04b1348e08576b0e79640e6978b31484182ecc24cc42557b301c90e2cc31b9c3ead055fdc21458 diff --git a/games-emulation/dolphin/dolphin-2407-r1.ebuild b/games-emulation/dolphin/dolphin-2407-r1.ebuild deleted file mode 100644 index e77aefc415c6..000000000000 --- a/games-emulation/dolphin/dolphin-2407-r1.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 18 ) -LLVM_OPTIONAL=1 - -inherit cmake llvm-r1 pax-utils xdg-utils - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" - EGIT_SUBMODULES=( - Externals/mGBA/mgba - Externals/implot/implot - Externals/tinygltf/tinygltf - Externals/Vulkan-Headers - Externals/VulkanMemoryAllocator - Externals/zlib-ng/zlib-ng - Externals/minizip-ng/minizip-ng - ) -else - MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 - IMPLOT_COMMIT=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d - TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b - VULKAN_HEADERS_COMMIT=05fe2cc910a68c9ba5dac07db46ef78573acee72 - VULKANMEMORYALLOCATOR_COMMIT=009ecd192c1289c7529bff248a16cfe896254816 - ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f - MINIZIP_NG_COMMIT=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70 - SRC_URI=" - https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/epezent/implot/archive/${IMPLOT_COMMIT}.tar.gz - -> implot-${IMPLOT_COMMIT}.tar.gz - https://github.com/syoyo/tinygltf/archive/${TINYGLTF_COMMIT}.tar.gz - -> tinygltf-${TINYGLTF_COMMIT}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_COMMIT}.tar.gz - -> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz - https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - -> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz - -> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz - https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz - -> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz - mgba? ( - https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz - -> mgba-${MGBA_COMMIT}.tar.gz - ) - " - KEYWORDS="amd64 ~arm64" -fi - -DESCRIPTION="Gamecube and Wii game emulator" -HOMEPAGE="https://dolphin-emu.org/" - -LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB" -SLOT="0" -IUSE=" - alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba - profile pulseaudio sdl systemd telemetry test upnp vulkan -" -REQUIRED_USE=" - mgba? ( gui ) - llvm? ( ${LLVM_REQUIRED_USE} ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/bzip2:= - >=app-arch/lz4-1.8:= - app-arch/xz-utils - >=app-arch/zstd-1.4.0:= - dev-libs/hidapi - <dev-libs/libfmt-11.1:= - >=dev-libs/libfmt-10.1 - dev-libs/lzo:2 - dev-libs/pugixml - dev-libs/xxhash - media-libs/cubeb - media-libs/libsfml:= - media-libs/libspng - >=net-libs/enet-1.3.18:1.3= - net-libs/mbedtls:0= - net-misc/curl - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXrandr - virtual/libusb:1 - virtual/opengl - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - evdev? ( - dev-libs/libevdev - virtual/udev - ) - ffmpeg? ( media-video/ffmpeg:= ) - gui? ( - dev-qt/qtbase:6[X,gui,widgets] - dev-qt/qtsvg:6 - ) - llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') ) - profile? ( dev-util/oprofile ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2 ) - systemd? ( sys-apps/systemd:0= ) - upnp? ( net-libs/miniupnpc:= ) -" -DEPEND=" - ${RDEPEND} - egl? ( media-libs/libglvnd ) - test? ( dev-cpp/gtest ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# vulkan-loader required for vulkan backend which can be selected -# at runtime. -RDEPEND+=" - vulkan? ( media-libs/vulkan-loader ) -" - -# [directory]=license -declare -A KEEP_BUNDLED=( - # please keep this list in CMakeLists.txt order - - # TODO: use system libraries - [zlib-ng]=ZLIB - [minizip-ng]=ZLIB - - [Bochs_disasm]=LGPL-2.1+ - [cpp-optparse]=MIT - [imgui]=MIT - [implot]=MIT - [glslang]=BSD - - [tinygltf]=MIT - - [FreeSurround]=GPL-2+ - [soundtouch]=LGPL-2.1+ - - # FIXME: discord-rpc not packaged - [discord-rpc]=MIT - - [mGBA]=MPL-2.0 - - [picojson]=BSD-2 - [expr]=MIT - [rangeset]=ZLIB - [FatFs]=FatFs - [Vulkan-Headers]="|| ( Apache-2.0 MIT )" - [VulkanMemoryAllocator]=MIT -) - -PATCHES=( - "${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch - "${FILESDIR}"/dolphin-2407-minizip.patch - "${FILESDIR}"/dolphin-2407-fix-llvm-build.patch -) - -add_bundled_licenses() { - for license in ${KEEP_BUNDLED[@]}; do - LICENSE+=" ${license}" - done -} -add_bundled_licenses - -pkg_setup() { - use llvm && llvm-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} != *9999 ]]; then - mv -T "${WORKDIR}/implot-${IMPLOT_COMMIT}" Externals/implot/implot || die - mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die - mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die - mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die - mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die - mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die - if use mgba; then - mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die - fi - fi - - cmake_src_prepare - - local s remove=() - for s in Externals/*; do - [[ -f ${s} ]] && continue - if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then - remove+=( "${s}" ) - fi - done - - einfo "removing sources: ${remove[*]}" - rm -r "${remove[@]}" || die - - # About 50% compile-time speedup - if ! use vulkan; then - sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die - fi - - # Remove dirty suffix: needed for netplay - sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DDSPTOOL=ON - -DENABLE_ALSA=$(usex alsa) - -DENABLE_ANALYTICS=$(usex telemetry) - -DENABLE_AUTOUPDATE=OFF - -DENABLE_BLUEZ=$(usex bluetooth) - -DENABLE_CLI_TOOL=ON - -DENABLE_EGL=$(usex egl) - -DENABLE_EVDEV=$(usex evdev) - -DENABLE_LLVM=$(usex llvm) - -DENABLE_LTO=OFF # just adds -flto, user can do that via flags - -DENABLE_NOGUI=$(usex !gui) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_QT=$(usex gui) - -DENABLE_SDL=$(usex sdl) - -DENABLE_TESTS=$(usex test) - -DENABLE_VULKAN=$(usex vulkan) - -DENCODE_FRAMEDUMPS=$(usex ffmpeg) - -DFASTLOG=$(usex log) - -DOPROFILING=$(usex profile) - -DSTEAM=OFF - -DUSE_DISCORD_PRESENCE=$(usex discord-presence) - -DUSE_MGBA=$(usex mgba) - -DUSE_RETRO_ACHIEVEMENTS=OFF - -DUSE_UPNP=$(usex upnp) - - -DCMAKE_DISABLE_FIND_PACKAGE_SYSTEMD=$(usex !systemd) - - # Use system libraries - -DUSE_SYSTEM_FMT=ON - -DUSE_SYSTEM_PUGIXML=ON - -DUSE_SYSTEM_ENET=ON - -DUSE_SYSTEM_XXHASH=ON - -DUSE_SYSTEM_BZIP2=ON - -DUSE_SYSTEM_LIBLZMA=ON - -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_ZLIB=OFF - -DUSE_SYSTEM_MINIZIP=OFF - -DUSE_SYSTEM_LZO=ON - -DUSE_SYSTEM_LZ4=ON - -DUSE_SYSTEM_SPNG=ON - -DUSE_SYSTEM_CUBEB=ON - -DUSE_SYSTEM_LIBUSB=ON - -DUSE_SYSTEM_SFML=ON - -DUSE_SYSTEM_MBEDTLS=ON - -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_ICONV=ON - -DUSE_SYSTEM_HIDAPI=ON - - # Use ccache only when user did set FEATURES=ccache (or similar) - # not when ccache binary is present in system (automagic). - -DCCACHE_BIN=CCACHE_BIN-NOTFOUND - - # Undo cmake.eclass's defaults. - # All dolphin's libraries are private - # and rely on circular dependency resolution. - -DBUILD_SHARED_LIBS=OFF - - # Avoid warning spam around unset variables. - -Wno-dev - ) - - # System installed git shouldnt affect non live builds - [[ ${PV} != *9999 ]] && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ) - - use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON ) - use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF ) - use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON ) - use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON ) - - cmake_src_configure -} - -src_test() { - cmake_build unittests -} - -src_install() { - cmake_src_install - - dodoc Readme.md - if use doc; then - dodoc -r docs/ActionReplay docs/DSP docs/WiiMote - fi - - # Add pax markings for hardened systems - pax-mark -m "${ED}"/usr/bin/"${PN}"{-emu{,-nogui},-tool} -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/games-emulation/dolphin/dolphin-2412-r1.ebuild b/games-emulation/dolphin/dolphin-2412-r1.ebuild deleted file mode 100644 index cc1a5417142e..000000000000 --- a/games-emulation/dolphin/dolphin-2412-r1.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 18 ) -LLVM_OPTIONAL=1 - -inherit cmake llvm-r1 pax-utils xdg-utils - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" - EGIT_SUBMODULES=( - Externals/mGBA/mgba - Externals/implot/implot - Externals/tinygltf/tinygltf - Externals/Vulkan-Headers - Externals/VulkanMemoryAllocator - Externals/zlib-ng/zlib-ng - Externals/minizip-ng/minizip-ng - ) -else - MGBA_COMMIT=8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51 - IMPLOT_COMMIT=cc5e1daa5c7f2335a9460ae79c829011dc5cef2d - TINYGLTF_COMMIT=c5641f2c22d117da7971504591a8f6a41ece488b - VULKAN_HEADERS_COMMIT=05fe2cc910a68c9ba5dac07db46ef78573acee72 - VULKANMEMORYALLOCATOR_COMMIT=009ecd192c1289c7529bff248a16cfe896254816 - ZLIB_NG_COMMIT=ce01b1e41da298334f8214389cc9369540a7560f - MINIZIP_NG_COMMIT=3eed562ef0ea3516db30d1c8ecb0e1b486d8cb70 - SRC_URI=" - https://github.com/dolphin-emu/dolphin/archive/${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/epezent/implot/archive/${IMPLOT_COMMIT}.tar.gz - -> implot-${IMPLOT_COMMIT}.tar.gz - https://github.com/syoyo/tinygltf/archive/${TINYGLTF_COMMIT}.tar.gz - -> tinygltf-${TINYGLTF_COMMIT}.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/${VULKAN_HEADERS_COMMIT}.tar.gz - -> Vulkan-Headers-${VULKAN_HEADERS_COMMIT}.tar.gz - https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - -> VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}.tar.gz - https://github.com/zlib-ng/zlib-ng/archive/${ZLIB_NG_COMMIT}.tar.gz - -> zlib-ng-${ZLIB_NG_COMMIT}.tar.gz - https://github.com/zlib-ng/minizip-ng/archive/${MINIZIP_NG_COMMIT}.tar.gz - -> minizip-ng-${MINIZIP_NG_COMMIT}.tar.gz - mgba? ( - https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz - -> mgba-${MGBA_COMMIT}.tar.gz - ) - " - KEYWORDS="~amd64 ~arm64" -fi - -DESCRIPTION="Gamecube and Wii game emulator" -HOMEPAGE="https://dolphin-emu.org/" - -LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB" -SLOT="0" -IUSE=" - alsa bluetooth discord-presence doc egl +evdev ffmpeg +gui llvm log mgba - profile pulseaudio sdl systemd telemetry test upnp vulkan -" -REQUIRED_USE=" - mgba? ( gui ) - llvm? ( ${LLVM_REQUIRED_USE} ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/bzip2:= - >=app-arch/lz4-1.8:= - app-arch/xz-utils - >=app-arch/zstd-1.4.0:= - dev-libs/hidapi - >=dev-libs/libfmt-10.1:= - dev-libs/lzo:2 - dev-libs/pugixml - dev-libs/xxhash - media-libs/cubeb - media-libs/libsfml:= - media-libs/libspng - >=net-libs/enet-1.3.18:1.3= - net-libs/mbedtls:0= - net-misc/curl - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXrandr - virtual/libusb:1 - virtual/opengl - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - evdev? ( - dev-libs/libevdev - virtual/udev - ) - ffmpeg? ( media-video/ffmpeg:= ) - gui? ( - dev-qt/qtbase:6[X,gui,widgets] - dev-qt/qtsvg:6 - ) - llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') ) - profile? ( dev-util/oprofile ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( >=media-libs/libsdl2-2.30.9 ) - systemd? ( sys-apps/systemd:0= ) - upnp? ( net-libs/miniupnpc:= ) -" -DEPEND=" - ${RDEPEND} - egl? ( media-libs/libglvnd ) - test? ( dev-cpp/gtest ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# vulkan-loader required for vulkan backend which can be selected -# at runtime. -RDEPEND+=" - vulkan? ( media-libs/vulkan-loader ) -" - -# [directory]=license -declare -A KEEP_BUNDLED=( - # please keep this list in CMakeLists.txt order - - # TODO: use system libraries - # bug #873952 - # https://github.com/dolphin-emu/dolphin/pull/13089 - [zlib-ng]=ZLIB - [minizip-ng]=ZLIB - - [Bochs_disasm]=LGPL-2.1+ - [cpp-optparse]=MIT - [imgui]=MIT - [implot]=MIT - [glslang]=BSD - - [tinygltf]=MIT - - [FreeSurround]=GPL-2+ - [soundtouch]=LGPL-2.1+ - - # FIXME: discord-rpc not packaged - [discord-rpc]=MIT - - [mGBA]=MPL-2.0 - - [picojson]=BSD-2 - [expr]=MIT - [rangeset]=ZLIB - [FatFs]=FatFs - [Vulkan-Headers]="|| ( Apache-2.0 MIT )" - [VulkanMemoryAllocator]=MIT -) - -PATCHES=( - "${FILESDIR}"/dolphin-2407-minizip.patch - "${FILESDIR}"/dolphin-2412-fix-libfmt-11.1.patch - "${FILESDIR}"/dolphin-2412-fix-build-without-retro-achievements.patch -) - -add_bundled_licenses() { - for license in ${KEEP_BUNDLED[@]}; do - LICENSE+=" ${license}" - done -} -add_bundled_licenses - -pkg_setup() { - use llvm && llvm-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} != *9999 ]]; then - mv -T "${WORKDIR}/implot-${IMPLOT_COMMIT}" Externals/implot/implot || die - mv -T "${WORKDIR}/tinygltf-${TINYGLTF_COMMIT}" Externals/tinygltf/tinygltf || die - mv -T "${WORKDIR}/Vulkan-Headers-${VULKAN_HEADERS_COMMIT}" Externals/Vulkan-Headers || die - mv -T "${WORKDIR}/VulkanMemoryAllocator-${VULKANMEMORYALLOCATOR_COMMIT}" Externals/VulkanMemoryAllocator || die - mv -T "${WORKDIR}/zlib-ng-${ZLIB_NG_COMMIT}" Externals/zlib-ng/zlib-ng || die - mv -T "${WORKDIR}/minizip-ng-${MINIZIP_NG_COMMIT}" Externals/minizip-ng/minizip-ng || die - if use mgba; then - mv -T "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die - fi - fi - - cmake_src_prepare - - local s remove=() - for s in Externals/*; do - [[ -f ${s} ]] && continue - if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then - remove+=( "${s}" ) - fi - done - - einfo "removing sources: ${remove[*]}" - rm -r "${remove[@]}" || die - - # Remove dirty suffix: needed for netplay - sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die -} - -src_configure() { - local mycmakeargs=( - -DDSPTOOL=ON - -DENABLE_ALSA=$(usex alsa) - -DENABLE_ANALYTICS=$(usex telemetry) - -DENABLE_AUTOUPDATE=OFF - -DENABLE_BLUEZ=$(usex bluetooth) - -DENABLE_CLI_TOOL=ON - -DENABLE_EGL=$(usex egl) - -DENABLE_EVDEV=$(usex evdev) - -DENABLE_LLVM=$(usex llvm) - -DENABLE_LTO=OFF # just adds -flto, user can do that via flags - -DENABLE_NOGUI=$(usex !gui) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_QT=$(usex gui) - -DENABLE_SDL=$(usex sdl) - -DENABLE_TESTS=$(usex test) - -DENABLE_VULKAN=$(usex vulkan) - -DENCODE_FRAMEDUMPS=$(usex ffmpeg) - -DFASTLOG=$(usex log) - -DOPROFILING=$(usex profile) - -DUSE_DISCORD_PRESENCE=$(usex discord-presence) - -DUSE_MGBA=$(usex mgba) - -DUSE_RETRO_ACHIEVEMENTS=OFF - -DUSE_UPNP=$(usex upnp) - - -DCMAKE_DISABLE_FIND_PACKAGE_SYSTEMD=$(usex !systemd) - - # Use system libraries - -DUSE_SYSTEM_FMT=ON - -DUSE_SYSTEM_PUGIXML=ON - -DUSE_SYSTEM_ENET=ON - -DUSE_SYSTEM_XXHASH=ON - -DUSE_SYSTEM_BZIP2=ON - -DUSE_SYSTEM_LIBLZMA=ON - -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_MINIZIP=OFF - -DUSE_SYSTEM_LZO=ON - -DUSE_SYSTEM_LZ4=ON - -DUSE_SYSTEM_SPNG=ON - -DUSE_SYSTEM_CUBEB=ON - -DUSE_SYSTEM_LIBUSB=ON - -DUSE_SYSTEM_SFML=ON - -DUSE_SYSTEM_MBEDTLS=ON - -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_ICONV=ON - -DUSE_SYSTEM_HIDAPI=ON - - # Use ccache only when user did set FEATURES=ccache (or similar) - # not when ccache binary is present in system (automagic). - -DCCACHE_BIN=CCACHE_BIN-NOTFOUND - - # Undo cmake.eclass's defaults. - # All dolphin's libraries are private - # and rely on circular dependency resolution. - -DBUILD_SHARED_LIBS=OFF - - # Avoid warning spam around unset variables. - -Wno-dev - ) - - # System installed git shouldnt affect non live builds - [[ ${PV} != *9999 ]] && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ) - - use test && mycmakeargs+=( -DUSE_SYSTEM_GTEST=ON ) - use mgba && mycmakeargs+=( -DUSE_SYSTEM_LIBMGBA=OFF ) - use sdl && mycmakeargs+=( -DUSE_SYSTEM_SDL2=ON ) - use upnp && mycmakeargs+=( -DUSE_SYSTEM_MINIUPNPC=ON ) - - cmake_src_configure -} - -src_test() { - cmake_build unittests -} - -src_install() { - cmake_src_install - - dodoc Readme.md - if use doc; then - dodoc -r docs/ActionReplay docs/DSP docs/WiiMote - fi - - # Add pax markings for hardened systems - pax-mark -m "${ED}"/usr/bin/"${PN}"{-emu{,-nogui},-tool} -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/games-emulation/dolphin/dolphin-2503.ebuild b/games-emulation/dolphin/dolphin-2503.ebuild index f23c09401258..fdb23b429d1a 100644 --- a/games-emulation/dolphin/dolphin-2503.ebuild +++ b/games-emulation/dolphin/dolphin-2503.ebuild @@ -48,7 +48,7 @@ else -> mgba-${MGBA_COMMIT}.tar.gz ) " - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 ~arm64" fi DESCRIPTION="Gamecube and Wii game emulator" diff --git a/games-emulation/dolphin/files/dolphin-2407-fix-llvm-build.patch b/games-emulation/dolphin/files/dolphin-2407-fix-llvm-build.patch deleted file mode 100644 index 2a678d176ae8..000000000000 --- a/games-emulation/dolphin/files/dolphin-2407-fix-llvm-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/dolphin-emu/dolphin/pull/12986 -https://github.com/dolphin-emu/dolphin/commit/9c5cd817e39b44ff2eb68c75d9405c582207b53b - -From 9c5cd817e39b44ff2eb68c75d9405c582207b53b Mon Sep 17 00:00:00 2001 -From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> -Date: Thu, 8 Aug 2024 09:42:14 -0700 -Subject: [PATCH] CMakeLists: Fix LLVM Usage In UICommon - -This compile definition was removed in 68cbd2640d4663fe29e21234dc068769cb9bc673 because it was complicated by changes in 50dc0ffbceebe0f633bd63cd4710a3e2f548d688. Thus, the LLVM disassembler would never be used in UICommon's Disassembler class. ---- a/Source/Core/UICommon/CMakeLists.txt -+++ b/Source/Core/UICommon/CMakeLists.txt -@@ -56,6 +56,7 @@ if(ENABLE_LLVM) - find_package(LLVM CONFIG) - if(LLVM_FOUND) - message(STATUS "LLVM found, enabling LLVM support in disassembler") -+ target_compile_definitions(uicommon PRIVATE HAVE_LLVM) - # Minimal documentation about LLVM's CMake functions is available here: - # https://releases.llvm.org/16.0.0/docs/CMake.html#embedding-llvm-in-your-project - # https://groups.google.com/g/llvm-dev/c/YeEVe7HTasQ?pli=1 -@@ -69,6 +70,7 @@ if(ENABLE_LLVM) - llvm_config(uicommon USE_SHARED - mcdisassembler target ${LLVM_EXPAND_COMPONENTS} - ) -+ target_include_directories(uicommon PRIVATE ${LLVM_INCLUDE_DIRS}) - endif() - endif() - diff --git a/games-emulation/dolphin/files/dolphin-2407-libfmt-11-fix.patch b/games-emulation/dolphin/files/dolphin-2407-libfmt-11-fix.patch deleted file mode 100644 index bee165ac49fb..000000000000 --- a/games-emulation/dolphin/files/dolphin-2407-libfmt-11-fix.patch +++ /dev/null @@ -1,103 +0,0 @@ -From f69c099c20afb5ae5262e93208f1a28e39d911f1 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Fri, 9 Aug 2024 08:54:08 +0300 -Subject: [PATCH 1/2] Add support for libfmt-11 - -fmt::join was moved into fmt/ranges.h ---- a/Source/Core/Common/StringUtil.cpp -+++ b/Source/Core/Common/StringUtil.cpp -@@ -22,6 +22,7 @@ - #include <vector> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - - #include "Common/CommonFuncs.h" - #include "Common/CommonPaths.h" ---- a/Source/Core/Core/HW/EXI/EXI_Device.h -+++ b/Source/Core/Core/HW/EXI/EXI_Device.h -@@ -111,7 +111,7 @@ struct fmt::formatter<ExpansionInterface::EXIDeviceType> - constexpr formatter() : EnumFormatter(names) {} - - template <typename FormatContext> -- auto format(const ExpansionInterface::EXIDeviceType& e, FormatContext& ctx) -+ auto format(const ExpansionInterface::EXIDeviceType& e, FormatContext& ctx) const - { - if (e != ExpansionInterface::EXIDeviceType::None) - { ---- a/Source/Core/Core/NetPlayClient.cpp -+++ b/Source/Core/Core/NetPlayClient.cpp -@@ -17,6 +17,7 @@ - #include <vector> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - - #include "Common/Assert.h" - #include "Common/CommonPaths.h" ---- a/Source/Core/Core/NetPlayServer.cpp -+++ b/Source/Core/Core/NetPlayServer.cpp -@@ -18,6 +18,7 @@ - #include <vector> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - - #include "Common/CommonPaths.h" - #include "Common/ENet.h" ---- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp -+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp -@@ -7,6 +7,7 @@ - #include <cmath> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - - #include <QApplication> - #include <QClipboard> ---- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp -+++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp -@@ -25,6 +25,8 @@ - #include <algorithm> - #include <sstream> - -+#include <fmt/ranges.h> -+ - #include "Common/CommonPaths.h" - #include "Common/Config/Config.h" - #include "Common/HttpRequest.h" ---- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp -+++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp -@@ -7,6 +7,8 @@ - #include <string> - #include <string_view> - -+#include <fmt/ranges.h> -+ - #include "Common/Assert.h" - #include "Common/GL/GLContext.h" - #include "Common/GL/GLExtensions/GLExtensions.h" ---- a/Source/Core/VideoCommon/VertexLoaderBase.cpp -+++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp -@@ -11,6 +11,7 @@ - #include <vector> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - - #include "Common/Assert.h" - #include "Common/BitUtils.h" ---- a/Source/UnitTests/Common/BitFieldTest.cpp -+++ b/Source/UnitTests/Common/BitFieldTest.cpp -@@ -1,6 +1,8 @@ - // Copyright 2014 Dolphin Emulator Project - // SPDX-License-Identifier: GPL-2.0-or-later - -+#include <fmt/ranges.h> -+ - #include <gtest/gtest.h> - - #include "Common/BitField.h" --- -2.45.2 - diff --git a/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch b/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch deleted file mode 100644 index 01575fb551c3..000000000000 --- a/games-emulation/dolphin/files/dolphin-2412-fix-build-without-retro-achievements.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://github.com/dolphin-emu/dolphin/pull/13226 - -https://github.com/dolphin-emu/dolphin/commit/84ab15e020a993286329e1fc0b0e47ffc3c0a536 -From 84ab15e020a993286329e1fc0b0e47ffc3c0a536 Mon Sep 17 00:00:00 2001 -From: JosJuice <josjuice@gmail.com> -Date: Sun, 15 Dec 2024 18:00:14 +0100 -Subject: [PATCH 1/2] AchievementManager: Add required forward declarations - -This was causing compilation errors when building without -USE_RETRO_ACHIEVEMENTS. ---- a/Source/Core/Core/AchievementManager.h -+++ b/Source/Core/Core/AchievementManager.h -@@ -275,11 +275,21 @@ class AchievementManager - - #include <string> - -+namespace ActionReplay -+{ -+struct ARCode; -+} -+ - namespace DiscIO - { - class Volume; - } - -+namespace Gecko -+{ -+class GeckoCode; -+} -+ - class AchievementManager - { - public: - -https://github.com/dolphin-emu/dolphin/commit/ad24ddb6bb01ddaba19bf72e8eda5cae354701ae -From ad24ddb6bb01ddaba19bf72e8eda5cae354701ae Mon Sep 17 00:00:00 2001 -From: JosJuice <josjuice@gmail.com> -Date: Sun, 15 Dec 2024 18:15:57 +0100 -Subject: [PATCH 2/2] VerifyTool: Add missing USE_RETRO_ACHIEVEMENTS ifdefs - ---- a/Source/Core/DolphinTool/VerifyCommand.cpp -+++ b/Source/Core/DolphinTool/VerifyCommand.cpp -@@ -133,8 +133,10 @@ int VerifyCommand(const std::vector<std::string>& args) - hashes_to_calculate.md5 = true; - else if (algorithm == "sha1") - hashes_to_calculate.sha1 = true; -+#ifdef USE_RETRO_ACHIEVEMENTS - else if (algorithm == "rchash") - rc_hash_calculate = true; -+#endif - } - - if (!hashes_to_calculate.crc32 && !hashes_to_calculate.md5 && !hashes_to_calculate.sha1 && -@@ -163,11 +165,13 @@ int VerifyCommand(const std::vector<std::string>& args) - verifier.Finish(); - const DiscIO::VolumeVerifier::Result& result = verifier.GetResult(); - -+#ifdef USE_RETRO_ACHIEVEMENTS - // Calculate rcheevos hash - if (rc_hash_calculate) - { - rc_hash_result = AchievementManager::CalculateHash(input_file_path); - } -+#endif - - // Print the report - if (!algorithm_is_set) diff --git a/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch b/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch deleted file mode 100644 index 0f5c3fd91c41..000000000000 --- a/games-emulation/dolphin/files/dolphin-2412-fix-libfmt-11.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://github.com/dolphin-emu/dolphin/commit/22dc21cca42b2eaf373ac9e1b5128c566615aa71 -https://github.com/dolphin-emu/dolphin/pull/13262 - -From 825092ad33a2e7466e79520c1338d0bed56ca299 Mon Sep 17 00:00:00 2001 -From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at> -Date: Sat, 4 Jan 2025 18:45:32 +0100 -Subject: [PATCH 1/2] BBA/HLE: Fix incorrect fmt format string - ---- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp -+++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp -@@ -686,7 +686,7 @@ bool CEXIETHERNET::BuiltInBBAInterface::SendFrame(const u8* frame, u32 size) - } - - default: -- ERROR_LOG_FMT(SP1, "Unsupported EtherType {#06x}", *ethertype); -+ ERROR_LOG_FMT(SP1, "Unsupported EtherType {:#06x}", *ethertype); - return false; - } - - -From b79bdb13c05b4fcef23cd30b210d40662d28373b Mon Sep 17 00:00:00 2001 -From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at> -Date: Sat, 4 Jan 2025 18:46:04 +0100 -Subject: [PATCH 2/2] Common: Fix compile failure with fmt>=11 - ---- a/Source/Core/Common/Logging/Log.h -+++ b/Source/Core/Common/Logging/Log.h -@@ -99,7 +99,13 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con - static_assert(NumFields == sizeof...(args), - "Unexpected number of replacement fields in format string; did you pass too few or " - "too many arguments?"); -- GenericLogFmtImpl(level, type, file, line, format, fmt::make_format_args(args...)); -+ -+#if FMT_VERSION >= 110000 -+ auto&& format_str = fmt::format_string<Args...>(format); -+#else -+ auto&& format_str = format; -+#endif -+ GenericLogFmtImpl(level, type, file, line, format_str, fmt::make_format_args(args...)); - } - } // namespace Common::Log - ---- a/Source/Core/Common/MsgHandler.h -+++ b/Source/Core/Common/MsgHandler.h -@@ -41,12 +41,17 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons - static_assert(NumFields == sizeof...(args), - "Unexpected number of replacement fields in format string; did you pass too few or " - "too many arguments?"); --#if FMT_VERSION >= 90000 -+#if FMT_VERSION >= 110000 -+ static_assert(std::is_base_of_v<fmt::detail::compile_string, S>); -+ auto&& format_str = fmt::format_string<Args...>(format); -+#elif FMT_VERSION >= 90000 - static_assert(fmt::detail::is_compile_string<S>::value); -+ auto&& format_str = format; - #else - static_assert(fmt::is_compile_string<S>::value); -+ auto&& format_str = format; - #endif -- return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, -+ return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format_str, - fmt::make_format_args(args...)); - } - -@@ -60,7 +65,9 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con - static_assert(NumFields == sizeof...(args), - "Unexpected number of replacement fields in format string; did you pass too few or " - "too many arguments?"); --#if FMT_VERSION >= 90000 -+#if FMT_VERSION >= 110000 -+ static_assert(std::is_base_of_v<fmt::detail::compile_string, S>); -+#elif FMT_VERSION >= 90000 - static_assert(fmt::detail::is_compile_string<S>::value); - #else - static_assert(fmt::is_compile_string<S>::value); diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest index 2e44ce3b6c23..ee8bd9e988a5 100644 --- a/games-emulation/openmsx/Manifest +++ b/games-emulation/openmsx/Manifest @@ -1,3 +1,5 @@ DIST openmsx-19.1.tar.gz 4216833 BLAKE2B 7d1ed4dfb76d0d9d3eecf1447395b4bec775f6c92edf8164583de3b0fe9fc98bce00c47206340e2cde417ba5580785ec92be04ec7a6c5cf2f1a03cd5769ce746 SHA512 107208f7a9324beb348e8dd7f9ad878ee04ee3948159448065ff2a8c78a9c890e38cb2cbcada754bfc3698a6ba53b0ad1a9ac837d6071eb330b18ea2bdb0fbc7 +DIST openmsx-20.0.tar.gz 5947913 BLAKE2B f5fddf81dc5641cc14f29a0dda9a82778c39e5b48347682af3d304f7ae095fb31e9ce86a9e834d05e88e9cfe901e5ce32f0fdea31b4f634041b3b36567820791 SHA512 b4095ac786eab0d0e2a73d8a9088d246c6281ffb0a801ce6497fba23933f361a5280b62473555476dbbe74039357ac6c930f628c0b7f0eeda884f341b47bad9a EBUILD openmsx-19.1.ebuild 2944 BLAKE2B 0e34a08709358189a0dd05c61b78f51cffc1b7d383bc30351769d5f3296755351685e07892d55de7316684bf9875da5f3f7496bcaad41a51a403c32114c1b927 SHA512 d53ee61795bd8d7efeab997158ee954f92a64c745b688e537145528d1053ca4aedcdf5e146425c6177409d691696e131ef866ef4d18062790364740340f0b0a9 +EBUILD openmsx-20.0.ebuild 2745 BLAKE2B 7b35ce967a29ef37489a0fd72cebdd866ca1c04d54415703ee45f0d9055bd372e97dd954652d45dbe854c635c0613a99cdfdd328df3d6638e973b1c1e565bce5 SHA512 a8afdaddccf2ff1deef0b90a2843a67b35bdc32f52a731fb5c890651cf5ac548b0b51a9af01d3081500b678ae2f23809a8a491ad2893e4ab8e22300f0a2aa928 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f diff --git a/games-emulation/openmsx/openmsx-20.0.ebuild b/games-emulation/openmsx/openmsx-20.0.ebuild new file mode 100644 index 000000000000..8440bdb995b9 --- /dev/null +++ b/games-emulation/openmsx/openmsx-20.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} python3_13t ) + +inherit desktop python-any-r1 readme.gentoo-r1 toolchain-funcs xdg + +DESCRIPTION="MSX emulator that aims for perfection" +HOMEPAGE="https://openmsx.org/" +SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+joystick" + +RDEPEND="dev-lang/tcl:0= + media-libs/alsa-lib + media-libs/freetype:2 + media-libs/libogg + media-libs/libpng:0= + media-libs/libsdl2[joystick=,sound,video] + media-libs/libtheora + media-libs/libvorbis + media-libs/sdl2-ttf + >=media-libs/glew-1.3.2:0= + sys-libs/zlib + virtual/opengl" +DEPEND="${RDEPEND}" +BDEPEND="${PYTHON_DEPS}" + +DOC_CONTENTS="If you want to if you want to emulate real MSX systems and not only the free C-BIOS machines, put the system ROMs in one of the following directories: ${EPREFIX}/usr/share/${PN}/systemroms or ~/.openMSX/share/systemroms" + +src_prepare() { + default + sed -i -e 's/-fsanitize=address//' build/flavour-unittest.mk || die + sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die # Can't be overridden + sed -i -e 's/GPL\.txt//' doc/node.mk || die + + # Build system only configured to use bundled version - but not from the + # directory it's distributed in + cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die +} + +my_emake() { + emake \ + V=1 \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LINK_FLAGS_PREFIX= \ + OPENMSX_STRIP=false \ + "${@}" +} + +src_compile() { + my_emake \ + INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" +} + +src_test() { + # To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the + # build is stored in a directory of the pattern + # ${WORKDIR}/derived/*-unittest/. This is separate from the actual build, + # stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir + # binary are in each of these directories under their `bin` directories. + my_emake \ + OPENMSX_FLAVOUR=unittest + + # There will only ever be one *-unittest directory + "${S}"/derived/*-unittest/bin/openmsx || die +} + +src_install() { + # To guarantee installing the proper binary in case tests were built, + # specify the default OPENMSX_FLAVOUR + my_emake \ + INSTALL_BINARY_DIR="${ED}/usr/bin" \ + INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \ + INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \ + OPENMSX_FLAVOUR=opt \ + install + + einstalldocs + readme.gentoo_create_doc + + local i + for i in 16 32 48 64 128 256 ; do + newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "openMSX" +} + +pkg_postinst() { + readme.gentoo_print_elog + xdg_pkg_postinst +} |