feat: add newer discord-social-sdk as dependency instead of the older game-sdk

Author: Totto16

src/meson.build

@@ -13,7 +13,7 @@ if build_application
     subdir('ui')
     subdir('lobby')
 
-    if have_discord_sdk
+    if have_discord_social_sdk
         subdir('discord')
     endif
 

subprojects/discord-social-sdk.wrap

@@ -0,0 +1,10 @@
+[wrap-file]
+directory = discord_social_sdk
+source_url = https://oopetris.totto.lt/static/assets/discord/DiscordSocialSdk-1.1.8318.zip
+source_filename = DiscordSocialSdk-1.1.8318.zip
+source_hash = e78ac5c6462d74917b74d2511ed88876f59dbe00d31186590a98ea7953099e31
+patch_directory = discord_social_sdk
+
+[provide]
+discord-social-sdk = discord_social_sdk_dep
+

subprojects/packagefiles/discord_social_sdk/meson.build

@@ -0,0 +1,103 @@
+project(
+    'discord-social-sdk',
+    'cpp',
+    'c',
+    version: '1.1.8318',
+    meson_version: '>=1.4.0',
+    default_options: {
+        'cpp_std': ['c++17'],
+    },
+)
+
+inc_dirs = include_directories('include')
+
+header_files = files('include' / 'cdiscord.h', 'include' / 'discordpp.h')
+
+install_headers(header_files, subdir: 'discord')
+
+lib_base_dir = ''
+
+if host_machine.system() == 'darwin'
+    if host_machine.cpu_family() in ['aarch64', 'x86_64']
+        lib_base_dir = 'lib'
+    else
+        error(
+            'unsupported architecture for macos: ' + host_machine.cpu_family(),
+        )
+    endif
+
+elif host_machine.system() == 'linux'
+    if host_machine.cpu_family() == 'x86_64'
+        lib_base_dir = 'lib'
+
+        cat = find_program('cat')
+
+        os_release_info = run_command(
+            cat,
+            '/etc/os-release',
+            check: true,
+        ).stdout().strip().split('\n')
+
+        linux_distro = ''
+
+        foreach line : os_release_info
+            line_detail = line.split('=')
+
+            if line_detail[0] == 'ID'
+                linux_distro = line_detail[1]
+            endif
+
+        endforeach
+
+        if linux_distro == ''
+            warning('Couldn\'t detect the linux distro')
+        endif
+
+        if linux_distro == 'alpine'
+            error('unsupported libc for linux: musl')
+        endif
+
+    else
+        error(
+            'unsupported architecture for linux: ' + host_machine.cpu_family(),
+        )
+    endif
+elif host_machine.system() == 'windows'
+    if host_machine.cpu_family() == 'x86_64'
+        lib_base_dir = get_option('default_library') == 'static' ? 'bin' : 'lib'
+    else
+        error(
+            'unsupported architecture for windows: ' + host_machine.cpu_family(),
+        )
+    endif
+else
+    error('unsupported system: ' + host_machine.system())
+endif
+
+lib_dir = (
+    lib_base_dir / (get_option('buildtype') == 'release' ? 'release' : 'debug')
+)
+
+c = meson.get_compiler('c')
+
+discord_partner_sdk = c.find_library(
+    'discord_partner_sdk',
+    dirs: [meson.project_source_root() / lib_dir],
+    required: true,
+)
+
+discord_lib = library(
+    'discord_partner_sdk',
+    header_files,
+    include_directories: inc_dirs,
+    dependencies: discord_partner_sdk,
+    install: true,
+)
+
+discord_social_sdk_dep = declare_dependency(
+    include_directories: inc_dirs,
+    version: meson.project_version(),
+    link_with: discord_lib,
+)
+
+meson.override_dependency('discord-social-sdk', discord_social_sdk_dep)

tools/dependencies/meson.build

@@ -67,7 +67,9 @@ if meson.is_cross_build()
         foreach native_dependency_tuple : map_native_dependencies
             native_dep_lib_name = native_dependency_tuple[0]
 
-            native_dep_name = native_dependency_tuple.length() == 2 ? native_dependency_tuple[1] : native_dep_lib_name
+            native_dep_name = (
+                native_dependency_tuple.length() == 2 ? native_dependency_tuple[1] : native_dep_lib_name
+            )
 
             native_dep = cpp.find_library(native_dep_lib_name, required: true)
 
@@ -102,13 +104,12 @@ if meson.is_cross_build()
 
                 native_dep_with_version = declare_dependency(
                     dependencies: native_dep,
-                    version: major_version
-                    + '.'
-                    + minor_version
-                    + '.'
-                    + patch_version,
+                    version: major_version + '.' + minor_version + '.' + patch_version,
+                )
+                meson.override_dependency(
+                    native_dep_name,
+                    native_dep_with_version,
                 )
-                meson.override_dependency(native_dep_name, native_dep_with_version)
             else
                 meson.override_dependency(native_dep_name, native_dep)
 
@@ -146,7 +147,8 @@ fmt_use_header_only = false
 
 if (
     meson.is_cross_build()
-    and (host_machine.system() == 'switch' or host_machine.system() == '3ds')
+    and (host_machine.system() == 'switch'
+    or host_machine.system() == '3ds')
 )
     fmt_use_header_only = true
 endif
@@ -350,7 +352,10 @@ if build_application
 
     if (meson.is_cross_build() and host_machine.system() == '3ds')
         graphics_lib += {
-            'compile_args': [graphics_lib.get('compile_args'), '-DSPDLOG_NO_TLS'],
+            'compile_args': [
+                graphics_lib.get('compile_args'),
+                '-DSPDLOG_NO_TLS',
+            ],
         }
     endif
 
@@ -407,8 +412,16 @@ if build_application
 
     endif
 
-    if host_machine.system() == 'linux' or (meson.is_cross_build() and host_machine.system() == 'android')
-        keyutils_dep = dependency('keyutils', required: true, allow_fallback: true)
+    if (
+        host_machine.system() == 'linux'
+        or (meson.is_cross_build()
+        and host_machine.system() == 'android')
+    )
+        keyutils_dep = dependency(
+            'keyutils',
+            required: true,
+            allow_fallback: true,
+        )
         graphics_lib += {'deps': [graphics_lib.get('deps'), keyutils_dep]}
     elif host_machine.system() == 'windows'
         c = meson.get_compiler('c')
@@ -425,8 +438,8 @@ if build_application
     if build_installer
         if get_option('buildtype') != 'release'
             error(
-                'buildtype needs to be \'release\', when building the installer, but was: '
-                + get_option('buildtype'),
+                'buildtype needs to be \'release\', when building the installer, but was: ' +
+                get_option('buildtype'),
             )
         endif
 
@@ -435,16 +448,15 @@ if build_application
                 is_flatpak_build = true
             else
                 error(
-                    'only support flatpak builds, when  building the installer for linux',
+                    'only support flatpak builds, when building the installer for linux',
                 )
             endif
         elif host_machine.system() == 'windows'
             message('Adding a windows installer target: \'windows_installer\'')
         else
             # TODO: create a proper installer for macOS : https://mesonbuild.com/Creating-OSX-packages.html
             error(
-                'unsupported system for building the installer: '
-                + host_machine.system(),
+                'unsupported system for building the installer: ' + host_machine.system(),
             )
 
         endif
@@ -466,7 +478,7 @@ if build_application
     endif
 
     have_file_dialogs = false
-    have_discord_sdk = false
+    have_discord_social_sdk = false
 
     nfde_dep = dependency(
         'nativefiledialog-extended',
@@ -489,29 +501,33 @@ if build_application
 
     c = meson.get_compiler('c')
 
-    discord_dep_required = not meson.is_cross_build() and get_option('build_installer')
+    discord_dep_required = (
+        not meson.is_cross_build()
+        and get_option('build_installer')
+    )
 
-    if host_machine.system() == 'linux' and host_machine.cpu_family() == 'aarch64'
+    if (
+        host_machine.system() == 'linux'
+        and host_machine.cpu_family() == 'aarch64'
+    )
         # not supported on aarch64 linux :(
         discord_dep_required = false
     endif
 
-    discord_sdk_dep = dependency(
-        'discord-game-sdk',
+    discord_social_sdk_dep = dependency(
+        'discord-social-sdk',
         allow_fallback: true,
         required: discord_dep_required,
-        # only with msvc we need a static library, all others work without adding __declspec() everywhere
-        static: c.get_id() == 'msvc',
-        default_options: c.get_id() != 'msvc' ? {} : {'default_library': 'static'},
     )
-    if discord_sdk_dep.found()
-        have_discord_sdk = true
+
+    if discord_social_sdk_dep.found()
+        have_discord_social_sdk = true
         graphics_lib += {
             'compile_args': [
                 graphics_lib.get('compile_args'),
-                '-D_HAVE_DISCORD_SDK',
+                '-D_HAVE_DISCORD_SOCIAL_SDK',
             ],
-            'deps': [graphics_lib.get('deps'), discord_sdk_dep],
+            'deps': [graphics_lib.get('deps'), discord_social_sdk_dep],
         }
     endif