From 41940d0e0c408733da175b993e2d706f2e31301f Mon Sep 17 00:00:00 2001
From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com>
Date: Thu, 22 Jun 2023 01:33:59 -0400
Subject: [PATCH] [DiscordCoreAPI] Update to version 2023-06-15 (#32043)

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.

* Updating the necessary files.
---
 .../0001-Add-extern-C-to-avcodec.patch        | 26 -------------------
 ports/discordcoreapi/portfile.cmake           |  5 ++--
 ports/discordcoreapi/vcpkg.json               |  6 ++---
 versions/baseline.json                        |  4 +--
 versions/d-/discordcoreapi.json               |  5 ++++
 5 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch

diff --git a/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch b/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch
deleted file mode 100644
index 53814980b2..0000000000
--- a/ports/discordcoreapi/0001-Add-extern-C-to-avcodec.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Source/AudioDecoder.cpp b/Source/AudioDecoder.cpp
-index 42bd4543..ff210878 100644
---- a/Source/AudioDecoder.cpp
-+++ b/Source/AudioDecoder.cpp
-@@ -25,7 +25,9 @@
- 
- #include <discordcoreapi/Utilities.hpp>
- #include <discordcoreapi/AudioDecoder.hpp>
-+extern "C" {
- #include <libavcodec/avcodec.h>
-+}
- 
- namespace DiscordCoreInternal {
- 
-diff --git a/Include/discordcoreapi/AudioDecoder.hpp b/Include/discordcoreapi/AudioDecoder.hpp
---- a/Include/discordcoreapi/AudioDecoder.hpp	(revision 1ecbbc1b3a7f6bd3ff5e6ca0be8606ec50f17ec1)
-+++ b/Include/discordcoreapi/AudioDecoder.hpp	(revision 3c80cf0c54719008610fc96bb457345bf0170701)
-@@ -29,6 +29,7 @@
- #include <opus/opus.h>
-
- extern "C" {
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswresample/swresample.h>
- }
- 
\ No newline at end of file
diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake
index 61231c3b92..be7f9186bb 100644
--- a/ports/discordcoreapi/portfile.cmake
+++ b/ports/discordcoreapi/portfile.cmake
@@ -5,9 +5,8 @@ endif()
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO RealTimeChris/DiscordCoreAPI
-	REF 8b54cf9
-	SHA512 1ee042939f09b58d20f0a432ae83c696847cdf30922bc6345d76634f32c78706f3fa38a64eae259b592312f4af25af26883c76d5eb3866b08ff7f0dd42dd0ff9
-	HEAD_REF main
+	REF "v${VERSION}"
+    SHA512 62fe2e3bc61cfc18c253a5d23faba95c0550e0e60b1bfbd55627afaee7ca441aeb44358a3f52c97255bd0afacb79855839af238caeff28b555f4682dc6cc2674
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json
index 8b6be19596..999196cb93 100644
--- a/ports/discordcoreapi/vcpkg.json
+++ b/ports/discordcoreapi/vcpkg.json
@@ -1,13 +1,11 @@
 {
   "name": "discordcoreapi",
-  "version-date": "2023-05-30",
-  "port-version": 1,
+  "version": "1.40",
   "description": "A Discord bot library written in C++ using custom asynchronous coroutines.",
   "homepage": "https://discordcoreapi.com",
   "license": "LGPL-2.1-or-later",
-  "supports": "(windows & x64 & !static & !xbox) | (linux & x64)",
+  "supports": "(windows & x64 & !xbox) | (linux & x64)",
   "dependencies": [
-    "ffmpeg",
     "jsonifier",
     "libsodium",
     "openssl",
diff --git a/versions/baseline.json b/versions/baseline.json
index 091c239c64..36a4f4d803 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2121,8 +2121,8 @@
       "port-version": 3
     },
     "discordcoreapi": {
-      "baseline": "2023-05-30",
-      "port-version": 1
+      "baseline": "1.40",
+      "port-version": 0
     },
     "discount": {
       "baseline": "2.2.6",
diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json
index b8015de514..a911eb4f93 100644
--- a/versions/d-/discordcoreapi.json
+++ b/versions/d-/discordcoreapi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "67dcb76ec4a6669264f61e9718533d9fd253a066",
+      "version": "1.40",
+      "port-version": 0
+    },
     {
       "git-tree": "c9c84716a494279e16d9f85834ecb7e130dfa561",
       "version-date": "2023-05-30",