Skip to content

Commit

Permalink
jhbuild: Do not build custom gstreamer
Browse files Browse the repository at this point in the history
Ubuntu now has 1.24.X which is newer.

Leave the module in jhbuild so people can easily build it. We could also remove the build dependencies for it at some point.
  • Loading branch information
TingPing committed Jun 24, 2024
1 parent 3217b57 commit d7b4374
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 1 addition & 3 deletions images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<dep package="dicts"/>
<dep package="libwpe"/>
<dep package="wpebackend-fdo"/>
<dep package="gstreamer"/>
<dep package="sparkle-cdm"/>
<dep package="libbacktrace"/>
</dependencies>
Expand Down Expand Up @@ -84,8 +83,7 @@
<meson id="gstreamer" mesonargs="-Dlibnice=enabled -Dpython=enabled -Dintrospection=enabled -Dgst-plugins-bad:microdns=disabled -Dgst-plugins-bad:avtp=disabled -Dexamples=disabled -Dtests=disabled -Ddoc=disabled">
<branch repo="gstreamer.freedesktop.org"
checkoutdir="gstreamer"
module="gstreamer.git"
tag="1.22.6"/>
module="gstreamer.git"/>
<dependencies>
<dep package="openh264"/>
</dependencies>
Expand Down
5 changes: 0 additions & 5 deletions scripts/container-only/wkdev-test-host-integration
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ run() {
run_test "Test PulseAudio: (should work if it works on the host)" \
pactl info

# Our self-compiled GStreamer interferes with the system-provided one, avoid that for testing epiphany.
unset GST_PLUGIN_PATH_1_0
unset GST_PLUGIN_SCANNER
unset LD_LIBRARY_PATH

run_test "Test Epiphany browser: (try youtube.com, CSS 3D demos, WebGL, etc.)" \
epiphany
}
Expand Down

0 comments on commit d7b4374

Please sign in to comment.