Skip to content

Commit

Permalink
build: Add webrtc again but with fixed rpath version
Browse files Browse the repository at this point in the history
  • Loading branch information
krille-chan committed Aug 9, 2023
1 parent 3aaf21f commit cb9d731
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
4 changes: 4 additions & 0 deletions linux/flutter/generated_plugin_registrant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <emoji_picker_flutter/emoji_picker_flutter_plugin.h>
#include <file_selector_linux/file_selector_plugin.h>
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
#include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
#include <handy_window/handy_window_plugin.h>
#include <pasteboard/pasteboard_plugin.h>
#include <record_linux/record_linux_plugin.h>
Expand All @@ -37,6 +38,9 @@ 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);
Expand Down
1 change: 1 addition & 0 deletions linux/flutter/generated_plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
emoji_picker_flutter
file_selector_linux
flutter_secure_storage_linux
flutter_webrtc
handy_window
pasteboard
record_linux
Expand Down
19 changes: 9 additions & 10 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ packages:
dependency: transitive
description:
name: dart_webrtc
sha256: a34e59ac1559cac954e48c9fe156164992163d2f4b7e75d5b0e927ee2f1e4922
sha256: "3f581ea799829fabd6e0b99bd2210146e4d107c7b3ac8495af3510737a5c5c1a"
url: "https://pub.dev"
source: hosted
version: "1.0.16"
version: "1.1.1"
dbus:
dependency: transitive
description:
Expand Down Expand Up @@ -757,12 +757,11 @@ packages:
flutter_webrtc:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: "2c041f15b729157bc9ffcea9cd57cdcc7ba9e951"
url: "https://github.com/krille-chan/flutter-webrtc.git"
source: git
version: "0.9.31"
name: flutter_webrtc
sha256: "6a26a2ca8e1759fe60705d745444184e384508b82feb68547d66d411dbc4ad2d"
url: "https://pub.dev"
source: hosted
version: "0.9.37"
fuchsia_remote_debug_protocol:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -2192,10 +2191,10 @@ packages:
dependency: "direct main"
description:
name: webrtc_interface
sha256: "0ac4693f921c81005edefd2f43b9fe84b0ed54481474fe1ee16b789b0c84a77c"
sha256: "0dd96f4d7fb6ba9895930644cebd3f1adb5179caa83cb1760061b2fe9cba5aad"
url: "https://pub.dev"
source: hosted
version: "1.0.13"
version: "1.1.0"
win32:
dependency: transitive
description:
Expand Down
4 changes: 1 addition & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies:
flutter_secure_storage: ^8.0.0
flutter_typeahead: ^4.3.2
flutter_web_auth_2: ^2.1.1
flutter_webrtc: ^0.9.35
flutter_webrtc: ^0.9.37
future_loading_dialog: ^0.2.3
geolocator: ^7.6.2
handy_window: ^0.3.1
Expand Down Expand Up @@ -149,8 +149,6 @@ msix_config:
install_certificate: false

dependency_overrides:
flutter_webrtc:
git: https://github.com/krille-chan/flutter-webrtc.git
geolocator_android:
hosted:
name: geolocator_android
Expand Down
7 changes: 7 additions & 0 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,10 @@ 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"

0 comments on commit cb9d731

Please sign in to comment.