Skip to content

Commit

Permalink
remove libwebrtc
Browse files Browse the repository at this point in the history
-libwebrtc is only supported on scarthgap

Signed-off-by: Joel Winarske <[email protected]>
  • Loading branch information
jwinarske committed Nov 15, 2024
1 parent 927572b commit 32f6117
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 201 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/qemuarm-linux-dummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,6 @@ jobs:
bitbake dart-sdk -c do_cleansstate
bitbake dart-sdk
- name: Build libwebrtc
shell: bash
working-directory: ../kirkstone-linux-dummy
run: |
. ./poky/oe-init-build-env
bitbake libwebrtc -c do_cleansstate
bitbake libwebrtc
- name: Build flutter-engine
shell: bash
working-directory: ../kirkstone-linux-dummy
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/qemuarm64-linux-dummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,6 @@ jobs:
bitbake dart-sdk -c do_cleansstate
bitbake dart-sdk
- name: Build libwebrtc
shell: bash
working-directory: ../kirkstone-linux-dummy
run: |
. ./poky/oe-init-build-env
bitbake libwebrtc -c do_cleansstate
bitbake libwebrtc
- name: Build flutter-engine
shell: bash
working-directory: ../kirkstone-linux-dummy
Expand Down
53 changes: 53 additions & 0 deletions q
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/.github/workflows/qemuarm-linux-dummy.yml b/.github/workflows/qemuarm-linux-dummy.yml
index c4d6980..4b17341 100644
--- a/.github/workflows/qemuarm-linux-dummy.yml
+++ b/.github/workflows/qemuarm-linux-dummy.yml
@@ -71,7 +71,7 @@ jobs:
echo 'INIT_MANAGER = "systemd"' >> ./conf/local.conf
echo '***************************************'
echo 'DISTRO_FEATURES:remove = "sysvinit ptest"' >> ./conf/local.conf
- echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit"' >> ./conf/local.conf
+ echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit pulseaudio"' >> ./conf/local.conf
echo 'DISTRO_FEATURES_BACKFILL_CONSIDERED = ""' >> ./conf/local.conf
echo 'PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"' >> ./conf/local.conf
echo 'LICENSE_FLAGS_ACCEPTED += "commercial"' >> ./conf/local.conf
diff --git a/.github/workflows/qemuarm64-linux-dummy.yml b/.github/workflows/qemuarm64-linux-dummy.yml
index 918ed6c..df3e5c6 100644
--- a/.github/workflows/qemuarm64-linux-dummy.yml
+++ b/.github/workflows/qemuarm64-linux-dummy.yml
@@ -71,7 +71,7 @@ jobs:
echo 'INIT_MANAGER = "systemd"' >> ./conf/local.conf
echo '***************************************'
echo 'DISTRO_FEATURES:remove = "sysvinit ptest"' >> ./conf/local.conf
- echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit"' >> ./conf/local.conf
+ echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit pulseaudio"' >> ./conf/local.conf
echo 'DISTRO_FEATURES_BACKFILL_CONSIDERED = ""' >> ./conf/local.conf
echo 'PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"' >> ./conf/local.conf
echo 'LICENSE_FLAGS_ACCEPTED += "commercial"' >> ./conf/local.conf
diff --git a/.github/workflows/qemux86-64-linux-dummy.yml b/.github/workflows/qemux86-64-linux-dummy.yml
index 8662d76..74b14d8 100644
--- a/.github/workflows/qemux86-64-linux-dummy.yml
+++ b/.github/workflows/qemux86-64-linux-dummy.yml
@@ -71,7 +71,7 @@ jobs:
echo 'INIT_MANAGER = "systemd"' >> ./conf/local.conf
echo '***************************************'
echo 'DISTRO_FEATURES:remove = "sysvinit ptest"' >> ./conf/local.conf
- echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit"' >> ./conf/local.conf
+ echo 'DISTRO_FEATURES:append = " systemd x11 wayland opengl polkit pulseaudio"' >> ./conf/local.conf
echo 'DISTRO_FEATURES_BACKFILL_CONSIDERED = ""' >> ./conf/local.conf
echo 'PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"' >> ./conf/local.conf
echo 'LICENSE_FLAGS_ACCEPTED += "commercial"' >> ./conf/local.conf
diff --git a/recipes-graphics/libwebrtc/libwebrtc_125.6422.06.bb b/recipes-graphics/libwebrtc/libwebrtc_125.6422.06.bb
index 3a44042..0f8c2c9 100644
--- a/recipes-graphics/libwebrtc/libwebrtc_125.6422.06.bb
+++ b/recipes-graphics/libwebrtc/libwebrtc_125.6422.06.bb
@@ -18,7 +18,8 @@ LIC_FILES_CHKSUM = "\
DEPENDS += "\
glib-2.0 \
gtk+3 \
- pipewire \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire', '', d)} \
"

SRCREV = "543121ba1cd47780e92d48546b880333265b37b5"
26 changes: 0 additions & 26 deletions recipes-graphics/libwebrtc/files/add-libwebrtc-target.patch

This file was deleted.

54 changes: 0 additions & 54 deletions recipes-graphics/libwebrtc/files/toolchain.gn.in

This file was deleted.

105 changes: 0 additions & 105 deletions recipes-graphics/libwebrtc/libwebrtc_125.6422.06.bb

This file was deleted.

0 comments on commit 32f6117

Please sign in to comment.