fix discord for flatpak

- don't require discord to run
- fix some bad things with the prepackaged libraries of the discord sdk: it has no SONAME set, so linking add the absolut path instead of teh SONAME name, this causes the installed game to not work correctly, this is fixed by patching the .so and that requires some workarounds, since "patchelf" is not available in the sdk we use to build the flatpak app

Author: Totto16

com.github.mgerhold.OOPetris.yml

@@ -4,6 +4,18 @@ runtime-version: "23.08"
 sdk: org.freedesktop.Sdk
 command: oopetris
 modules:
+  #TODO: remove after discord sets SONAME 
+  - name: patchelf
+    buildsystem: simple
+    sources:
+        - type: archive
+          url: https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz
+          sha256: 64de10e4c6b8b8379db7e87f58030f336ea747c0515f381132e810dbf84a86e7
+    build-commands: 
+        - ./configure --prefix=/app
+        - make
+        - make install
+
   - name: OOPetris
     buildsystem: meson
     config-opts:
@@ -28,6 +40,13 @@ cleanup:
   - /include
   - /lib/pkgconfig
   - /share/pkgconfig
+## all for the patchelf executable
+#TODO: remove after removing patchelf build
+  - /bin/patchelf
+  - /lib/debug
+  - /share/doc
+  - /share/man
+  - /share/zsh
 
 finish-args:
   - --socket=x11
@@ -36,3 +55,4 @@ finish-args:
   - --device=dri
   - --socket=pulseaudio
   - --share=network
+  - --filesystem=xdg-run/discord-ipc-0:rw

src/discord/core.cpp

@@ -22,7 +22,7 @@ DiscordInstance::DiscordInstance(discord::Core* core) : m_core{ core }, m_curren
 [[nodiscard]] helper::expected<DiscordInstance, std::string> DiscordInstance::initialize() {
 
     discord::Core* core{};
-    auto result = discord::Core::Create(constants::discord::client_id, DiscordCreateFlags_Default, &core);
+    auto result = discord::Core::Create(constants::discord::client_id, DiscordCreateFlags_NoRequireDiscord, &core);
     if (core == nullptr) {
         return helper::unexpected<std::string>{
             fmt::format("Failed to instantiate discord core: {}", magic_enum::enum_name(result))

src/discord/core.hpp

@@ -13,15 +13,15 @@ namespace constants::discord {
 
     //TODO: this isn't correct for all platforms and needs to be tested
 #if defined(__ANDROID__)
-    constexpr const char* platform_dependent_launch_arguments = ""
+    constexpr const char* platform_dependent_launch_arguments = "";
 #elif defined(__SWITCH__)
 #error "Not supported"
 #elif defined(FLATPAK_BUILD)
-    constexpr const char* platform_dependent_launch_arguments = "flatpak run com.github.mgerhold.OOPetris --discord"
+    constexpr const char* platform_dependent_launch_arguments = "flatpak run com.github.mgerhold.OOPetris --discord";
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    constexpr const char* platform_dependent_launch_arguments = "oopetris.exe --discord"
+    constexpr const char* platform_dependent_launch_arguments = "oopetris.exe --discord";
 #elif defined(__APPLE__)
-    constexpr const char* platform_dependent_launch_arguments = "TODO"
+    constexpr const char* platform_dependent_launch_arguments = "TODO";
 #elif defined(__linux__)
     constexpr const char* platform_dependent_launch_arguments = "oopetris --discord";
 #else

src/helper/utils.hpp

@@ -10,6 +10,7 @@
 #include <filesystem>
 #include <string>
 #include <type_traits>
+#include <vector>
 
 namespace helper {
 

subprojects/discord-game-sdk.wrap

@@ -1,5 +1,5 @@
 [wrap-file]
-directory = discord_game_sdk
+directory = discord_game_sdk-3.2.1
 lead_directory_missing = true
 source_url = https://dl-game-sdk.discordapp.net/3.2.1/discord_game_sdk.zip
 source_filename = discord_game_sdk.zip

subprojects/packagefiles/discord_game_sdk/cpp/meson.build

@@ -1,43 +1,50 @@
 
 inc_dirs = include_directories('.')
 
-src_files = files(
-    'achievement_manager.cpp',
+header_files = files(
     'achievement_manager.h',
-    'activity_manager.cpp',
     'activity_manager.h',
-    'application_manager.cpp',
     'application_manager.h',
-    'core.cpp',
     'core.h',
     'discord.h',
     'event.h',
     'ffi.h',
-    'image_manager.cpp',
     'image_manager.h',
-    'lobby_manager.cpp',
     'lobby_manager.h',
-    'network_manager.cpp',
     'network_manager.h',
-    'overlay_manager.cpp',
     'overlay_manager.h',
-    'relationship_manager.cpp',
     'relationship_manager.h',
-    'storage_manager.cpp',
     'storage_manager.h',
-    'store_manager.cpp',
     'store_manager.h',
-    'types.cpp',
     'types.h',
-    'user_manager.cpp',
     'user_manager.h',
-    'voice_manager.cpp',
     'voice_manager.h',
 )
 
+install_headers(header_files, subdir: 'discord')
+
+src_files = files(
+    'achievement_manager.cpp',
+    'activity_manager.cpp',
+    'application_manager.cpp',
+    'core.cpp',
+    'image_manager.cpp',
+    'lobby_manager.cpp',
+    'network_manager.cpp',
+    'overlay_manager.cpp',
+    'relationship_manager.cpp',
+    'storage_manager.cpp',
+    'store_manager.cpp',
+    'types.cpp',
+    'user_manager.cpp',
+    'voice_manager.cpp',
+)
+
 lib_dir = ''
+dynamic_lib = ''
 
 if host_machine.system() == 'darwin'
+    dynamic_lib = 'discord_game_sdk.dylib'
     if host_machine.cpu_family() == 'aarch64'
         lib_dir = 'lib' / 'aarch64'
     elif host_machine.cpu_family() == 'x86_64'
@@ -47,12 +54,14 @@ if host_machine.system() == 'darwin'
     endif
 
 elif host_machine.system() == 'linux'
+    dynamic_lib = 'discord_game_sdk.so'
     if host_machine.cpu_family() == 'x86_64'
         lib_dir = 'lib' / 'x86_64'
     else
         error('unsuported architectue for linux: ' + host_machine.cpu_family())
     endif
 elif host_machine.system() == 'windows'
+    dynamic_lib = 'discord_game_sdk.dll'
     if host_machine.cpu_family() == 'x86'
         lib_dir = 'lib' / 'x86'
     elif host_machine.cpu_family() == 'x86_64'
@@ -66,13 +75,82 @@ endif
 
 c = meson.get_compiler('c')
 
-discord_lib_c = c.find_library('discord_game_sdk', dirs: [meson.project_source_root() / lib_dir])
+lib_deps = []
+
+## prefrerring the static vartiant, if not found we need to copy the danmic lib to the libdir on installation!
+
+discord_lib_c = c.find_library(
+    'discord_game_sdk',
+    dirs: [meson.project_source_root() / lib_dir],
+    static: true,
+    required: false,
+)
+
+if discord_lib_c.found()
+    lib_deps += discord_lib_c
+else
+    lib_deps += c.find_library(
+        'discord_game_sdk',
+        dirs: [meson.project_source_root() / lib_dir],
+    )
+
+    dynamic_lib_rename = dynamic_lib
+
+    if host_machine.system() == 'linux'
+        dynamic_lib_rename = 'libdiscord_game_sdk_c.so'
+
+        objdump = find_program('objdump')
+
+        objdump_result = run_command(
+            objdump,
+            '-p',
+            meson.project_source_root() / lib_dir / dynamic_lib,
+            check: true,
+        ).stdout().strip()
+
+        if objdump_result.contains('SONAME')
+            message('discord game sdk has a SONAME')
+
+        else
+            message('discord game sdk has no SONAME')
+    
+            patchelf = find_program('patchelf')
+
+            #TODO: file issue to discord, to set SONAME 
+            run_command(
+                patchelf,
+                '--set-soname',
+                dynamic_lib_rename,
+                meson.project_source_root() / lib_dir / dynamic_lib,
+                check: true,
+            )
+
+            run_command(
+                find_program('cp'),
+                meson.project_source_root() / lib_dir / dynamic_lib,
+                meson.project_source_root() / lib_dir / dynamic_lib_rename,
+                check: true,
+            )
+
+        endif
+    endif
+
+    install_data(
+        meson.project_source_root() / lib_dir / dynamic_lib,
+        install_dir: get_option('libdir'),
+        rename: [dynamic_lib_rename],
+    )
+
+endif
+
 
 discord_lib = library(
     'discord-game-sdk',
     src_files,
+    header_files,
     include_directories: inc_dirs,
-    dependencies: discord_lib_c,
+    dependencies: lib_deps,
+    install: true,
 )
 
 discord_dep = declare_dependency(