Skip to content

Commit bf95558

Browse files
dpinophiln
dpino
authored and
philn
committed
[JHBuild] [GStreamer] Update GStreamer jhbuild modules
1 parent 55c709a commit bf95558

2 files changed

Lines changed: 92 additions & 75 deletions

File tree

‎Tools/gstreamer/jhbuild.modules‎

Lines changed: 78 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
<metamodule id="webkit-gstreamer-testing-dependencies">
77
<dependencies>
88
<dep package="gstreamer"/>
9-
<dep package="gst-plugins-base"/>
10-
<dep package="gst-plugins-good"/>
11-
<dep package="gst-plugins-bad"/>
12-
<dep package="gst-libav"/>
9+
<dep package="sparkle-cdm"/>
1310
<if condition-set="Thunder">
1411
<dep package="thunder"/>
1512
<dep package="widevine"/>
@@ -21,102 +18,101 @@
2118

2219
<!-- Please use http/https to access repositories to be friendly to users stuck behind firewalls. -->
2320
<repository type="tarball" name="gstreamer"
24-
href="http://gstreamer.freedesktop.org/src/"/>
21+
href="https://github.com/GStreamer/" />
2522
<repository type="tarball" name="github-tarball"
2623
href="https://github.com/"/>
2724
<repository type="git" name="github-ssh"
28-
href="git@github.com:"/>
25+
href="git@github.com"/>
26+
<repository type="git" name="github.com"
27+
href="https://github.com"/>
2928
<repository type="git" name="chromium.googlesource.com"
3029
href="https://chromium.googlesource.com/webm/"/>
31-
<repository type="git" name="aomedia.googlesource.com"
32-
href="https://aomedia.googlesource.com/"/>
30+
<repository type="tarball" name="aom-releases"
31+
href="https://storage.googleapis.com/aom-releases/"/>
3332
<repository type="tarball" name="ffmpeg" href="https://ffmpeg.org/releases/"/>
3433

35-
<meson id="orc" mesonargs="-Dgtk_doc=disabled">
36-
<branch module="orc/orc-${version}.tar.xz" version="0.4.30"
37-
repo="gstreamer"
38-
hash="sha256:ba41b92146a5691cd102eb79c026757d39e9d3b81a65810d2946a1786a1c4972">
39-
<patch file="orc-satisfy-fno-common-under-gcc10.patch" strip="1"/>
34+
<meson id="orc" mesonargs="-Dgtk_doc=disabled -Dexamples=disabled">
35+
<branch repo="gstreamer"
36+
module="orc/archive/refs/tags/${version}.tar.gz"
37+
rename-tarball="orc-${version}.tar.gz"
38+
checkoutdir="orc-${version}"
39+
version="0.4.34"
40+
hash="sha256:e751284f6d063c49ce81a2b45efdbbd8b84141f69da029b5189448b9fb3f25aa">
4041
</branch>
4142
</meson>
4243

43-
<autotools id="openh264" supports-non-srcdir-builds="no" autogen-sh="pseudo-configure">
44-
<branch module="cisco/openh264/archive/v${version}.tar.gz" version="1.5.0"
45-
checkoutdir="openh264-${version}" repo="github-tarball">
46-
<patch file="openh264-configure.patch" strip="0"/>
44+
<meson id="openh264" mesonargs="-Dtests=disabled">
45+
<branch repo="github.com"
46+
module="cisco/openh264.git"
47+
tag="v2.3.0" >
4748
</branch>
48-
</autotools>
49+
</meson>
4950

5051
<cmake id="aom" cmakeargs="-DBUILD_SHARED_LIBS=1">
51-
<branch repo="aomedia.googlesource.com" module="aom" checkoutdir="aom" branch="master"
52-
revision="master" tag="cdb083e84a71d6d31163a4f64f18dc1328fd782c" />
52+
<branch repo="aom-releases"
53+
module="libaom-${version}.tar.gz"
54+
checkoutdir="libaom-${version}"
55+
version="3.8.0"
56+
hash="sha256:a768d3e54c7f00cd38b01208d1ae52d671be410cfc387ff7881ea71c855f3600">
57+
<patch file="fix-aom-build-arm32.patch" strip="1"/>
58+
</branch>
5359
</cmake>
5460

5561
<autotools id="libsrtp">
56-
<branch repo="github-tarball" module="cisco/libsrtp/archive/v${version}.tar.gz" version="2.2.0"
57-
checkoutdir="libsrtp-${version}">
62+
<branch repo="github-tarball"
63+
module="cisco/libsrtp/archive/v${version}.tar.gz"
64+
checkoutdir="libsrtp-${version}"
65+
version="2.2.0">
5866
<patch file="libsrtp-Fix-building-with-gcc-10.patch" strip="1"/>
5967
</branch>
6068
</autotools>
6169

62-
<meson id="gstreamer" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled -Dtests=disabled">
70+
<!-- GStreamer plugins have been moved with the base code to a monorepo.
71+
Is not longer needed to fetch different tarballs when using the main repository.
72+
See: https://gstreamer.freedesktop.org/documentation/frequently-asked-questions/mono-repository.html -->
73+
<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">
6374
<dependencies>
75+
<dep package="libva"/>
6476
<dep package="orc"/>
65-
</dependencies>
66-
<branch hash="sha256:de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.20.1">
67-
<path file="gstreamer-0001-typefind-Skip-parsing-of-data-URIs.patch" strip="1" />
68-
<path file="gstreamer-0002-uri-Build-doubly-linked-list-by-prepending-items.patch" strip="1" />
69-
</branch>
70-
</meson>
71-
72-
<meson id="gst-plugins-base" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled">
73-
<if condition-set="wpe">
74-
<autogenargs value="-Dpango=disabled"/>
75-
</if>
76-
<dependencies>
77-
<dep package="gstreamer"/>
78-
</dependencies>
79-
<branch hash="sha256:96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.20.1">
80-
</branch>
81-
</meson>
82-
83-
<meson id="gst-plugins-good" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled -Dgtk3=disabled">
84-
<dependencies>
85-
<dep package="gst-plugins-base"/>
86-
</dependencies>
87-
<branch hash="sha256:3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.20.1">
88-
</branch>
89-
</meson>
90-
91-
<meson id="gst-plugins-bad" mesonargs="-Dgtk_doc=disabled -Dintrospection=disabled -Dexamples=disabled -Dopenexr=disabled -Dopencv=disabled">
92-
<dependencies>
9377
<dep package="graphene"/>
94-
<dep package="gst-plugins-base"/>
9578
<dep package="openh264"/>
9679
<dep package="aom"/>
9780
<dep package="libsrtp"/>
81+
<dep package="ffmpeg"/>
82+
</dependencies>
83+
<branch repo="gstreamer"
84+
checkoutdir="gstreamer-${version}"
85+
rename-tarball="gstreamer-${version}.tar.gz"
86+
module="gstreamer/tarball/${version}"
87+
version="1.22.7"
88+
hash="sha256:5d38ad36449e755a11f8235eb80d68360c0ad4e8b422aebecad0e895d24f3834" />
89+
<dependencies>
90+
<dep package="openh264"/>
9891
</dependencies>
99-
<branch hash="sha256:09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.20.1">
100-
</branch>
10192
</meson>
10293

10394
<autotools id="ffmpeg" autogen-template="%(srcdir)s/configure --prefix=%(prefix)s --enable-static --enable-pic --disable-avdevice --disable-postproc --disable-swscale --disable-programs --disable-ffplay --disable-ffprobe --disable-ffmpeg --disable-encoder=flac --disable-protocols --disable-devices --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau --disable-filters --enable-filter=yadif --disable-doc --disable-d3d11va --disable-dxva2 --disable-audiotoolbox --disable-videotoolbox --disable-vaapi --disable-crystalhd --disable-mediacodec --disable-nvenc --disable-mmal --disable-omx --disable-omx-rpi --disable-cuda --disable-cuvid --disable-libmfx --disable-libnpp --disable-iconv --disable-jni --disable-v4l2_m2m --enable-optimizations">
104-
<branch repo="ffmpeg" version="4.0.4" module="ffmpeg-${version}.tar.gz" hash="sha256:80bb685abfcdda7c9b6c9c5caf1d8dbb927858050d7377c2b8f3488c7e8a9b7f"/>
95+
<branch repo="ffmpeg"
96+
module="ffmpeg-${version}.tar.xz"
97+
version="6.1"
98+
hash="sha256:488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270"/>
10599
</autotools>
106100

107-
<meson id="gst-libav" mesonargs="-Dgtk_doc=disabled">
108-
<dependencies>
109-
<dep package="gst-plugins-base"/>
110-
<dep package="ffmpeg"/>
111-
</dependencies>
112-
<branch hash="sha256:91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.20.1">
113-
</branch>
114-
</meson>
115101

116102
<meson id="libva" mesonargs="-Denable_va_messaging=false">
117-
<branch module="intel/libva/archive/${version}.tar.gz" version="2.4.1"
118-
hash="sha256:68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f"
119-
checkoutdir="libva-${version}" repo="github-tarball"/>
103+
<branch repo="github-tarball"
104+
module="intel/libva/archive/${version}.tar.gz"
105+
checkoutdir="libva-${version}"
106+
version="2.4.1"
107+
hash="sha256:68ca8d071dcb84ac82e3c6d7f02a55937d9f690fcb215853f4aa1de8d459812f" />
108+
</meson>
109+
110+
<meson id="sparkle-cdm" mesonargs="-Dsample-player=disabled">
111+
<branch repo="github-tarball"
112+
module="Sparkle-CDM/sparkle-cdm/tarball/3e1e0dcb221d044213f8c6e32b0b06102e7fb224"
113+
checkoutdir="sparkle-cdm"
114+
version="20231106"
115+
hash="sha256:2f3d1e8bafbb60fb3500491975ed6528fb0bf068122bacbda768c098ccf0ebfc" />
120116
</meson>
121117

122118
<cmake id="thunder"
@@ -136,7 +132,10 @@
136132
-DSECURITYAGENT=OFF -DCOMPOSITORSERVERPLUGIN=OFF
137133
-DPLUGIN_WEBKITBROWSER=OFF -DPLUGIN_WEBSERVER=OFF
138134
-DPLUGIN_ESPIAL=OFF -DNETWORKCONTROL=OFF">
139-
<branch repo="github-tarball" module="rdkcentral/Thunder/tarball/${version}" version="6adeee006fecdd1b2bc49bd360d49fc5718deb61" checkoutdir="thunder"/>
135+
<branch repo="github-tarball"
136+
module="rdkcentral/Thunder/tarball/${version}"
137+
checkoutdir="thunder"
138+
version="6adeee006fecdd1b2bc49bd360d49fc5718deb61" />
140139
</cmake>
141140

142141
<autotools id="widevine" supports-non-srcdir-builds="no"
@@ -146,17 +145,21 @@
146145
<dependencies>
147146
<dep package="thunder"/>
148147
</dependencies>
149-
<branch repo="github-ssh" module="Metrological/widevine.git" checkoutdir="widevine" tag="264c137501b289e356b11dacc329b05636ea9396"/>
148+
<branch repo="github-ssh"
149+
module="Metrological/widevine.git"
150+
checkoutdir="widevine"
151+
tag="264c137501b289e356b11dacc329b05636ea9396" />
150152
</autotools>
151153

152154
<cmake id="thunder-cdmi-widevine" cmakeargs="-DCMAKE_BUILD_TYPE=RelWithDebInfo">
153-
<branch repo="github-tarball"
154-
module="WebPlatformForEmbedded/OCDM-Widevine/tarball/${version}"
155-
version="9dc3964b0339abb70d66e4f931632324a075d6d4" checkoutdir="thunder-cdmi-widevine"/>
156155
<dependencies>
157156
<dep package="thunder"/>
158157
<dep package="widevine"/>
159158
</dependencies>
159+
<branch repo="github-tarball"
160+
module="WebPlatformForEmbedded/OCDM-Widevine/tarball/${version}"
161+
checkoutdir="thunder-cdmi-widevine"
162+
version="9dc3964b0339abb70d66e4f931632324a075d6d4" />
160163
</cmake>
161164

162165
<cmake id="thunder-nanoservices"
@@ -194,14 +197,14 @@
194197
-DPLUGIN_SPARK=OFF -DPLATFORM_LINUX=ON
195198
-DPLUGIN_MESSENGER=OFF -DPLUGIN_SECURITYAGENT=OFF
196199
-DPLUGIN_RPCLINK=OFF -DPLUGIN_COMPOSITOR=OFF">
197-
<branch repo="github-tarball"
198-
module="rdkcentral/ThunderNanoServices/tarball/${version}"
199-
version="de9f3d40d8408ee811c48f486c9b14f752c97345"
200-
checkoutdir="thunder-nanoservices"/>
201200
<dependencies>
202201
<dep package="thunder"/>
203202
<dep package="thunder-cdmi-widevine"/>
204203
</dependencies>
204+
<branch repo="github-tarball"
205+
module="rdkcentral/ThunderNanoServices/tarball/${version}"
206+
checkoutdir="thunder-nanoservices"
207+
version="de9f3d40d8408ee811c48f486c9b14f752c97345" />
205208
</cmake>
206209

207210
</moduleset>

‎Tools/gstreamer/patches/fix-aom-build-arm32.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
2+
index 6c932e8..0352b6c 100644
3+
--- a/build/cmake/aom_configure.cmake
4+
+++ b/build/cmake/aom_configure.cmake
5+
@@ -71,6 +71,9 @@ if(NOT AOM_TARGET_CPU)
6+
set(AOM_TARGET_CPU "x86")
7+
elseif(cpu_lowercase MATCHES "^arm")
8+
set(AOM_TARGET_CPU "${cpu_lowercase}")
9+
+ if(CMAKE_SIZEOF_VOID_P EQUAL 4)
10+
+ set(AOM_NEON_INTRIN_FLAG "-mfpu=neon")
11+
+ endif()
12+
elseif(cpu_lowercase MATCHES "aarch64")
13+
set(AOM_TARGET_CPU "arm64")
14+
elseif(cpu_lowercase MATCHES "^ppc")

0 commit comments

Comments
 (0)