[arch-commits] Commit in dolphin-emu/trunk (PKGBUILD dolphin-emu-system-libmgba.patch)

[Maxime Gauduin]

    Date: Tuesday, August 17, 2021 @ 13:31:42
  Author: alucryd
Revision: 1001563

upgpkg: dolphin-emu 1:5.0.r14790.3cc274880f-1

Added:
  dolphin-emu/trunk/dolphin-emu-system-libmgba.patch
Modified:
  dolphin-emu/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   33 ++++++++++++++++++++++-----------
 dolphin-emu-system-libmgba.patch |   24 ++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-17 13:31:38 UTC (rev 1001562)
+++ PKGBUILD	2021-08-17 13:31:42 UTC (rev 1001563)
@@ -3,8 +3,8 @@
 # Contributor: Jeremy Newton (Mystro256) <alexjnewt at gmail.com>
 
 pkgname=dolphin-emu
-pkgver=5.0.r14344.acc7d3710d
-pkgrel=2
+pkgver=5.0.r14790.3cc274880f
+pkgrel=1
 epoch=1
 pkgdesc='A Gamecube / Wii / Triforce emulator'
 arch=(x86_64)
@@ -23,6 +23,7 @@
   libcurl.so
   libevdev
   libgl
+  #libmgba
   libminiupnpc.so
   libpng
   libpulse
@@ -42,31 +43,41 @@
 makedepends=(
   cmake
   git
+  ninja
   python
 )
 optdepends=('pulseaudio: PulseAudio backend')
 options=(!emptydirs)
-_commit=acc7d3710d60552769f61f4b44bc8533a940df36
-source=(dolphin-emu::git+https://github.com/dolphin-emu/dolphin.git#commit=${_commit})
-sha256sums=(SKIP)
+_commit=3cc274880f47d340bd508dba91aaf37c48acd367
+source=(
+  dolphin-emu::git+https://github.com/dolphin-emu/dolphin.git#commit=${_commit}
+  dolphin-emu-system-libmgba.patch
+)
+b2sums=('SKIP'
+        '004692abcfa3a0a10996afba3a8fe71627300224a6f96cc5b6c6183c32d5f7bd1ece36775cd2642a0c4d7fc9225f72da39063cc68ff089e8d01685a2fbbd6957')
 
+prepare() {
+  cd dolphin-emu
+  #patch -Np1 -i ../dolphin-emu-system-libmgba.patch
+}
+
 pkgver() {
   cd dolphin-emu
-
   git describe | sed 's/-/.r/; s/-g/./'
 }
 
 build() {
-  cmake -S dolphin-emu -B build \
+  cmake -S dolphin-emu -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_SHARED_ENET=ON \
-    -DDISTRIBUTOR=archlinux.org
-  make -C build
+    -DDISTRIBUTOR=archlinux.org \
+    -DUSE_MGBA=OFF \
+    -DUSE_SHARED_ENET=ON
+  cmake --build build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" -C build install
+  DESTDIR="${pkgdir}" cmake --install build
   install -Dm 644 dolphin-emu/Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
   rm -rf "${pkgdir}"/usr/{include,lib/libdiscord-rpc.a}
 }

Added: dolphin-emu-system-libmgba.patch
===================================================================
--- dolphin-emu-system-libmgba.patch	                        (rev 0)
+++ dolphin-emu-system-libmgba.patch	2021-08-17 13:31:42 UTC (rev 1001563)
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d446e0b465..07fd13db85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -831,8 +831,17 @@ if(NOT ENABLE_QT)
+   set(USE_MGBA 0)
+ endif()
+ if(USE_MGBA)
+-  message(STATUS "Using static libmgba from Externals")
+-  add_subdirectory(Externals/mGBA)
++  if (SYSTEM_LIBMGBA)
++    find_library(MGBA_LIBRARY mgba)
++    add_library(mgba ${MGBA_LIBRARY})
++    add_library(mGBA::mgba ALIAS mgba)
++    set_target_properties(mgba PROPERTIES LINKER_LANGUAGE C)
++    message(STATUS "Found libmgba: ${MGBA_LIBRARY}")
++    message(STATUS "Using shared libmgba")
++  else()
++    message(STATUS "Using static libmgba from Externals")
++    add_subdirectory(Externals/mGBA)
++  endif()
+ endif()
+
+ find_package(SYSTEMD)