Date: Tuesday, February 21, 2023 @ 14:22:15 Author: alucryd Revision: 1403248
upgpkg: dolphin-emu 1:5.0.r18498.46b99671d9-1 Modified: dolphin-emu/trunk/PKGBUILD Deleted: dolphin-emu/trunk/dolphin-emu-system-libmgba.patch ----------------------------------+ PKGBUILD | 14 ++++----- dolphin-emu-system-libmgba.patch | 52 ------------------------------------- 2 files changed, 7 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-21 13:59:15 UTC (rev 1403247) +++ PKGBUILD 2023-02-21 14:22:15 UTC (rev 1403248) @@ -3,8 +3,8 @@ # Contributor: Jeremy Newton (Mystro256) <[email protected]> pkgname=dolphin-emu -pkgver=5.0.r17995.8bad821019 -pkgrel=2 +pkgver=5.0.r18498.46b99671d9 +pkgrel=1 epoch=1 pkgdesc='A Gamecube / Wii / Triforce emulator' arch=(x86_64) @@ -49,16 +49,16 @@ ) optdepends=('pulseaudio: PulseAudio backend') options=(!emptydirs) -_commit=8bad821019721b9b72701b495da95656ace5fea5 +_commit=46b99671d9158e0ca840c1d8ef249db0f321ced7 source=( dolphin-emu::git+https://github.com/dolphin-emu/dolphin.git#commit=${_commit} git+https://github.com/mozilla/cubeb.git + git+https://github.com/epezent/implot.git git+https://github.com/randy408/libspng.git git+https://github.com/arsenm/sanitizers-cmake.git git+https://github.com/KhronosGroup/SPIRV-Cross.git git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git git+https://github.com/zlib-ng/zlib-ng.git - dolphin-emu-system-libmgba.patch ) b2sums=('SKIP' 'SKIP' @@ -67,12 +67,11 @@ 'SKIP' 'SKIP' 'SKIP' - '36ecc3a37832a219da20fda2310bdb45c206a1582639c21ec6c1225ddf2d929ad3fcc6f6cbba75eebf106237c33fb4ae20f3592444d33b68164b2239d63fb94d') + 'SKIP') prepare() { cd dolphin-emu - patch -Np1 -i "${srcdir}"/dolphin-emu-system-libmgba.patch - for submodule in Externals/{cubeb/cubeb,libspng/libspng,spirv_cross/SPIRV-Cross,VulkanMemoryAllocator,zlib-ng/zlib-ng}; do + for submodule in Externals/{cubeb/cubeb,implot/implot,libspng/libspng,spirv_cross/SPIRV-Cross,VulkanMemoryAllocator,zlib-ng/zlib-ng}; do git submodule init ${submodule} git config submodule.${submodule}.url ../${submodule##*/} git -c protocol.file.allow=always submodule update ${submodule} @@ -93,6 +92,7 @@ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDISTRIBUTOR=archlinux.org \ + -DENABLE_TESTS=OFF \ -DUSE_MGBA=ON \ -DUSE_SHARED_ENET=ON \ -Wno-dev Deleted: dolphin-emu-system-libmgba.patch =================================================================== --- dolphin-emu-system-libmgba.patch 2023-02-21 13:59:15 UTC (rev 1403247) +++ dolphin-emu-system-libmgba.patch 2023-02-21 14:22:15 UTC (rev 1403248) @@ -1,52 +0,0 @@ -From 2fbc31e8691ee3404764df7506a79baee4858ad9 Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin <[email protected]> -Date: Thu, 22 Dec 2022 15:38:28 +0100 -Subject: [PATCH] use external libmgba first - ---- - CMake/FindLIBMGBA.cmake | 15 +++++++++++++++ - CMakeLists.txt | 7 +++++-- - 2 files changed, 20 insertions(+), 2 deletions(-) - create mode 100644 CMake/FindLIBMGBA.cmake - -diff --git a/CMake/FindLIBMGBA.cmake b/CMake/FindLIBMGBA.cmake -new file mode 100644 -index 0000000000..21e2c84445 ---- /dev/null -+++ b/CMake/FindLIBMGBA.cmake -@@ -0,0 +1,15 @@ -+find_path(LIBMGBA_INCLUDE_DIR flags.h PATH_SUFFIXES mgba) -+find_library(LIBMGBA_LIBRARY mgba) -+mark_as_advanced(LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(LIBMGBA DEFAULT_MSG -+ LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY) -+ -+if(LIBMGBA_FOUND AND NOT mGBA::mgba) -+ add_library(mGBA::mgba UNKNOWN IMPORTED) -+ set_target_properties(mGBA::mgba PROPERTIES -+ IMPORTED_LOCATION "${LIBMGBA_LIBRARY}" -+ INTERFACE_INCLUDE_DIRECTORIES "${LIBMGBA_INCLUDE_DIR}" -+ ) -+endif() -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 799ddcb238..bf3a50789f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -944,8 +944,11 @@ if(NOT ENABLE_QT) - set(USE_MGBA 0) - endif() - if(USE_MGBA) -- message(STATUS "Using static libmgba from Externals") -- add_subdirectory(Externals/mGBA) -+ find_package(LIBMGBA) -+ if(NOT LIBMGBA_FOUND) -+ message(STATUS "Using static libmgba from Externals") -+ add_subdirectory(Externals/mGBA) -+ endif() - endif() - - find_package(SYSTEMD) --- -2.39.0
