[arch-commits] Commit in libretro-dolphin/trunk (2 files)

[Maxime Gauduin]

    Date: Friday, June 25, 2021 @ 07:29:01
  Author: alucryd
Revision: 967406

libretro-dolphin 32990-1: fmt rebuild

Added:
  libretro-dolphin/trunk/libretro-dolphin-missing-headers.patch
Modified:
  libretro-dolphin/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   25 +++++++++++++++++++------
 libretro-dolphin-missing-headers.patch |   22 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-25 07:03:14 UTC (rev 967405)
+++ PKGBUILD	2021-06-25 07:29:01 UTC (rev 967406)
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=libretro-dolphin
-pkgver=32989
+pkgver=32990
 pkgrel=1
 pkgdesc='Nintendo GC/Wii core'
 arch=(x86_64)
@@ -36,15 +36,26 @@
   zstd
 )
 makedepends=(
+  clang
   cmake
   git
   mesa
+  ninja
   python
 )
-_commit=d86c545a40a3065d2a7920f48d045b3435dd1a8d
-source=(libretro-dolphin::git+https://github.com/libretro/dolphin.git#commit=${_commit})
-sha256sums=(SKIP)
+_commit=13ad7dd33b2d9ac442de890f0caafbd1a8d46c5d
+source=(
+  libretro-dolphin::git+https://github.com/libretro/dolphin.git#commit=${_commit}
+  libretro-dolphin-missing-headers.patch
+)
+b2sums=('SKIP'
+        '5b4ca6d1dc6af7a3afd014700305616d9e3e0f139f128cfa2af6cff3194a36ef9a591faaefbb8491d71f646187ee79e6fb5f29e9f57eeaf4e82768e814516f1a')
 
+prepare() {
+  cd libretro-dolphin
+  patch -Np1 -i ../libretro-dolphin-missing-headers.patch
+}
+
 pkgver() {
   cd libretro-dolphin
 
@@ -52,7 +63,9 @@
 }
 
 build() {
-  cmake -S libretro-dolphin -B build \
+  export CC=clang
+  export CXX=clang++
+  cmake -S libretro-dolphin -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_LTO=ON \
@@ -62,7 +75,7 @@
     -DLIBRETRO=ON \
     -DUSE_SHARED_ENET=ON \
     -Wno-dev
-  make -C build
+  cmake --build build
 }
 
 package() {

Added: libretro-dolphin-missing-headers.patch
===================================================================
--- libretro-dolphin-missing-headers.patch	                        (rev 0)
+++ libretro-dolphin-missing-headers.patch	2021-06-25 07:29:01 UTC (rev 967406)
@@ -0,0 +1,22 @@
+diff '--color=auto' -rupN libretro-dolphin.orig/Source/Core/Common/Config/Config.h libretro-dolphin/Source/Core/Common/Config/Config.h
+--- libretro-dolphin.orig/Source/Core/Common/Config/Config.h	2021-06-25 09:05:07.385701274 +0200
++++ libretro-dolphin/Source/Core/Common/Config/Config.h	2021-06-25 09:05:38.975393901 +0200
+@@ -7,6 +7,7 @@
+ #include <functional>
+ #include <map>
+ #include <memory>
++#include <mutex>
+ #include <optional>
+ #include <string>
+ 
+diff '--color=auto' -rupN libretro-dolphin.orig/Source/Core/DiscIO/WIACompression.h libretro-dolphin/Source/Core/DiscIO/WIACompression.h
+--- libretro-dolphin.orig/Source/Core/DiscIO/WIACompression.h	2021-06-25 09:05:07.432372415 +0200
++++ libretro-dolphin/Source/Core/DiscIO/WIACompression.h	2021-06-25 09:06:17.509080013 +0200
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <cstddef>
++#include <limits>
+ #include <memory>
+ #include <optional>
+ #include <vector>