From 7013e17db8d7acbcd58765a72b4f63dabcc6e930 Mon Sep 17 00:00:00 2001
From: David Barbion <davidb@230ruedubac.fr>
Date: Sat, 14 Aug 2021 00:18:49 +0200
Subject: [PATCH] fix: use buildroot fmt library

related to #1833
---
 CHANGELOG.md                                           |  1 +
 TESTING.md                                             |  1 +
 package/simcoupe/Config.in                             |  1 +
 .../simcoupe-0004-drop-external-fmt-build.patch        | 10 ++++++++++
 package/simcoupe/simcoupe.mk                           |  3 +--
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 package/simcoupe/simcoupe-0004-drop-external-fmt-build.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b40b8ae6d1..164f8b837a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@ All notable changes to this project will be documented in this file.
 - Bump production nvidia drivers to 460.84 (#1815)
 - Disable Kodi 19 on rpi1, rpi2 and rpi3 due to compatibility issue (#1815)
 - Rework bluetooth scripts (#1482)
+- Fix simcoupe compilation issue (#1833)
 
 ## [7.2.2-Reloaded]
 - Fix controler #2 in swanstation (#1730)
diff --git a/TESTING.md b/TESTING.md
index ec9999224a..e6d778d3bd 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -52,6 +52,7 @@ Pour les pending features, elles ne seront activées que si les beta testeurs le
   - [ ] Check standalone emulators starts on odroidxu4 (#1815)
 - [ ] Check that ES starts on rpi fresh installation (#1815)
   - [ ] /dev/dri/ should exists on rpi4
+- [ ] Test simcoupé emulator (#1833)
 
 ## [7.2.2]
 - [X] Test ppsspp saves are copied in share on upgrade (#1773)
diff --git a/package/simcoupe/Config.in b/package/simcoupe/Config.in
index f5ad47cb16..a88ef11d7c 100644
--- a/package/simcoupe/Config.in
+++ b/package/simcoupe/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_SIMCOUPE
 	bool "simcoupe"
 	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_FMT
 	help
 	  Portable MGT SAM Coupe emulator
 
diff --git a/package/simcoupe/simcoupe-0004-drop-external-fmt-build.patch b/package/simcoupe/simcoupe-0004-drop-external-fmt-build.patch
new file mode 100644
index 0000000000..b8bde7814b
--- /dev/null
+++ b/package/simcoupe/simcoupe-0004-drop-external-fmt-build.patch
@@ -0,0 +1,10 @@
+--- simcoupe-f401f47fb6d6af5dbe7b1d83a520e82cbe9d7ff2/CMakeLists.txt.orig	2021-08-14 00:11:10.065366876 +0200
++++ simcoupe-f401f47fb6d6af5dbe7b1d83a520e82cbe9d7ff2/CMakeLists.txt	2021-08-14 00:11:41.851995815 +0200
+@@ -264,7 +264,6 @@
+   endif()
+ endif()
+ 
+-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Extern/fmt)
+ target_link_libraries(${PROJECT_NAME} fmt)
+ 
+ ########
diff --git a/package/simcoupe/simcoupe.mk b/package/simcoupe/simcoupe.mk
index 58a40bc375..b5b94441f9 100644
--- a/package/simcoupe/simcoupe.mk
+++ b/package/simcoupe/simcoupe.mk
@@ -9,7 +9,7 @@ SIMCOUPE_SITE = https://gitlab.com/recalbox/packages/standalone/simcoupe.git
 SIMCOUPE_LICENSE = GPL-2.0
 SIMCOUPE_LICENSE_FILES = License.txt
 SIMCOUPE_SITE_METHOD = git
-SIMCOUPE_DEPENDENCIES = sdl2
+SIMCOUPE_DEPENDENCIES = sdl2 fmt
 
 SIMCOUPE_BIOS_AND_RESOURCES = /usr/share/simcoupe
 
@@ -17,7 +17,6 @@ define SIMCOUPE_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/simcoupe $(TARGET_DIR)/usr/bin/simcoupe
 	$(INSTALL) -D $(@D)/Extern/saasound/libSAASound* $(TARGET_DIR)/usr/lib/
 	$(INSTALL) -D $(@D)/Extern/resid/libresid* $(TARGET_DIR)/usr/lib/
-	$(INSTALL) -D $(@D)/Extern/fmt/libfmt* $(TARGET_DIR)/usr/lib/
 	mkdir -p $(TARGET_DIR)$(SIMCOUPE_BIOS_AND_RESOURCES)
 	cp -R $(@D)/Resource/** $(TARGET_DIR)$(SIMCOUPE_BIOS_AND_RESOURCES)
 endef
-- 
GitLab