From 3aaf21fb8b4df1db57ce85bce33d25853120975b Mon Sep 17 00:00:00 2001 From: krille-chan Date: Tue, 8 Aug 2023 21:57:16 +0200 Subject: [PATCH] build: Disable webrtc on linux again --- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - pubspec.lock | 19 ++++++++++--------- pubspec.yaml | 4 +++- snap/snapcraft.yaml | 7 ------- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 710031b1..a270c0fc 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -38,9 +37,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); - g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); - flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) handy_window_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); handy_window_plugin_register_with_registrar(handy_window_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 88981ef6..488e850e 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST emoji_picker_flutter file_selector_linux flutter_secure_storage_linux - flutter_webrtc handy_window pasteboard record_linux diff --git a/pubspec.lock b/pubspec.lock index 6bcfd12b..9313ccd7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: dart_webrtc - sha256: "3f581ea799829fabd6e0b99bd2210146e4d107c7b3ac8495af3510737a5c5c1a" + sha256: a34e59ac1559cac954e48c9fe156164992163d2f4b7e75d5b0e927ee2f1e4922 url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.0.16" dbus: dependency: transitive description: @@ -757,11 +757,12 @@ packages: flutter_webrtc: dependency: "direct main" description: - name: flutter_webrtc - sha256: "3a07f6840cda81e68014574e65e27880a598c6827b20aeedf74d51cd2db00b36" - url: "https://pub.dev" - source: hosted - version: "0.9.35" + path: "." + ref: HEAD + resolved-ref: "2c041f15b729157bc9ffcea9cd57cdcc7ba9e951" + url: "https://github.com/krille-chan/flutter-webrtc.git" + source: git + version: "0.9.31" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -2191,10 +2192,10 @@ packages: dependency: "direct main" description: name: webrtc_interface - sha256: "0dd96f4d7fb6ba9895930644cebd3f1adb5179caa83cb1760061b2fe9cba5aad" + sha256: "0ac4693f921c81005edefd2f43b9fe84b0ed54481474fe1ee16b789b0c84a77c" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.0.13" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8506b954..fa18df22 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -149,6 +149,8 @@ msix_config: install_certificate: false dependency_overrides: + flutter_webrtc: + git: https://github.com/krille-chan/flutter-webrtc.git geolocator_android: hosted: name: geolocator_android @@ -165,4 +167,4 @@ dependency_overrides: git: url: https://github.com/chandrabezzo/wakelock.git ref: main - path: wakelock_windows/ + path: wakelock_windows/ \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f3f42b95..03043078 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -100,10 +100,3 @@ apps: - password-manager-service slots: - dbus-svc - # Workaround for: - # https://github.com/flutter-webrtc/flutter-webrtc/issues/1212#issuecomment-1611899344 - environment: - XDG_DATA_HOME: $SNAP_USER_DATA - XDG_DATA_DIRS: $SNAP/usr/share - GDK_GL: gles - LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET"