update toxcore

Zoxcore · Mar 23, 2024 · 9d96a88 · 9d96a88
1 parent 596974c
commit 9d96a88
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.localrun/docker_it_nixos.sh b/.localrun/docker_it_nixos.sh
@@ -42,9 +42,9 @@ let
           src = fetchFromGitHub {
             owner = "zoff99";
             repo = "c-toxcore";
-            rev = "18c170b5210c50f402525c56fa02ad17ba04e399";
+            rev = "580fb5369ddf32e0302b4eba1344a72ddc13bfa4";
             fetchSubmodules = true;
-            sha256 = "sha256-gBQyCRUTPoT6cJgx6TWUUjxpGQ5wGK+dvljZIGR0zp4=";
+            sha256 = "sha256-xKG0F6LlCjCWt1YrAMGdqI9WV5NBEjs6+FbApEa1w8I=";
           };
           patches = [
             /workspace/build/buildscripts/patches/tc___ftv2_capabilities.patch

diff --git a/buildscripts/download/download_toxcore.sh b/buildscripts/download/download_toxcore.sh
@@ -18,8 +18,8 @@
 set -euo pipefail
 
 # use toxcore with enhanced ToxAV
-TOXCORE_VERSION="18c170b5210c50f402525c56fa02ad17ba04e399" # 0.2.18 enhanced
-TOXCORE_HASH="ef37b174c1b92b57e9aef5e7ad725405d5c16370af69c61cac1911f36ceefb86"
+TOXCORE_VERSION="580fb5369ddf32e0302b4eba1344a72ddc13bfa4" # 0.2.18 enhanced
+TOXCORE_HASH="d12e4100220ddcf877508b7643fd125f8c0b879dd5dd4f984570466464705cc2"
 
 source "$(dirname "$(realpath "$0")")/common.sh"
 

diff --git a/buildscripts/nixos_qtox.nix b/buildscripts/nixos_qtox.nix
@@ -11,9 +11,9 @@ let
           src = fetchFromGitHub {
             owner = "zoff99";
             repo = "c-toxcore";
-            rev = "18c170b5210c50f402525c56fa02ad17ba04e399";
+            rev = "580fb5369ddf32e0302b4eba1344a72ddc13bfa4";
             fetchSubmodules = true;
-            sha256 = "sha256-gBQyCRUTPoT6cJgx6TWUUjxpGQ5wGK+dvljZIGR0zp4=";
+            sha256 = "sha256-xKG0F6LlCjCWt1YrAMGdqI9WV5NBEjs6+FbApEa1w8I=";
           };
           patches = [
             (fetchpatch {

diff --git a/buildscripts/patches/tc___ftv2_capabilities.patch b/buildscripts/patches/tc___ftv2_capabilities.patch
@@ -1,13 +1,13 @@
 diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
-index 3125a6244..1427cc790 100644
+index 9d0e2195f..e86eb584d 100644
 --- a/toxcore/Messenger.h
 +++ b/toxcore/Messenger.h
-@@ -103,7 +103,7 @@ typedef struct Messenger_Options {
+@@ -104,7 +104,7 @@ typedef struct Messenger_Options {
  #ifdef TOX_CAPABILITIES_ACTIVE
- #define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_MSGV2 | TOX_CAPABILITY_MSGV3 | TOX_CAPABILITY_TOXAV_H264 | TOX_CAPABILITY_FTV2)
+ #define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_MSGV2 | TOX_CAPABILITY_MSGV3 | TOX_CAPABILITY_TOXAV_H264 | TOX_CAPABILITY_TOXAV_H265 | TOX_CAPABILITY_FTV2)
  #else
--#define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_TOXAV_H264)
-+#define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_TOXAV_H264 | TOX_CAPABILITY_FTV2)
+-#define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_TOXAV_H264 | TOX_CAPABILITY_TOXAV_H265)
++#define TOX_CAPABILITIES_CURRENT (uint64_t)(TOX_CAPABILITY_CAPABILITIES | TOX_CAPABILITY_TOXAV_H264 | TOX_CAPABILITY_TOXAV_H265 | TOX_CAPABILITY_FTV2)
  #endif
  /* size of the FLAGS in bytes */
  #define TOX_CAPABILITIES_SIZE sizeof(uint64_t)