Skip to content

Commit 44f0eb6

Browse files
authored
Merge pull request #1580 from wingtk/weekly-2025.4.29
Update GStreamer to 1.26.1 and other updates
2 parents c86efa4 + caa0121 commit 44f0eb6

File tree

6 files changed

+42
-24
lines changed

6 files changed

+42
-24
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Subject: [PATCH] Fix CMake build
2+
---
3+
Index: CMakeLists.txt
4+
IDEA additional info:
5+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
6+
<+>UTF-8
7+
===================================================================
8+
diff --git a/CMakeLists.txt b/CMakeLists.txt
9+
--- a/CMakeLists.txt (revision e1774cd77f471443541596e09078e78fdc342e4f)
10+
+++ b/CMakeLists.txt (date 1745978460868)
11+
@@ -1,4 +1,4 @@
12+
-cmake_minimum_required(VERSION 2.8.12)
13+
+cmake_minimum_required(VERSION 3.6)
14+
project(libogg)
15+
16+
# Required modules

gvsbuild/projects/gstreamer.py

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ def __init__(self):
4040
self,
4141
"gstreamer",
4242
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
43-
version="1.26.0",
43+
version="1.26.1",
4444
lastversion_even=True,
4545
archive_url="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-{version}.tar.xz",
46-
hash="1b2ee4028010c25b776effa7c396c7e3e1861b60b9417e416f4914abcdff279f",
46+
hash="30a4c4a5e48345583eb596aa265d0f53c0feb93011d93a6aaa70dd6e3c519dc4",
4747
dependencies=["meson", "ninja", "glib", "orc"],
4848
patches=[],
4949
)
@@ -91,10 +91,10 @@ def __init__(self):
9191
self,
9292
"gst-plugins-base",
9393
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
94-
version="1.26.0",
94+
version="1.26.1",
9595
lastversion_even=True,
9696
archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-{version}.tar.xz",
97-
hash="e23189fbed2ec486690382d1055c19eeaf5aae3e95e2576fc4c884d96a90e69e",
97+
hash="659553636f84dcf388cad5cf6530e02b0b2d3dc450e76199287ba9db6a6c5226",
9898
dependencies=[
9999
"meson",
100100
"ninja",
@@ -130,10 +130,10 @@ def __init__(self):
130130
self,
131131
"gst-plugins-good",
132132
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
133-
version="1.26.0",
133+
version="1.26.1",
134134
lastversion_even=True,
135135
archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-{version}.tar.xz",
136-
hash="9e18f139ef69ad0867c2dfbb8fe1d1736d76df11aac83f60e8d3adb1e2eaf03b",
136+
hash="fcdcb2f77620a599557b2843d1c6c55c2b660f5fc28222b542847d11d9ca982f",
137137
dependencies=[
138138
"meson",
139139
"ninja",
@@ -154,10 +154,10 @@ def __init__(self):
154154
self,
155155
"gst-plugins-bad",
156156
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
157-
version="1.26.0",
157+
version="1.26.1",
158158
lastversion_even=True,
159159
archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-{version}.tar.xz",
160-
hash="f8287a84c5f66368a5a50da5f969994a02c47f20220ffe1ca3154193e65af216",
160+
hash="9b8415b1bb3726a499578fb39907952981716643f660215fe68628fbd8629197",
161161
dependencies=[
162162
"meson",
163163
"ninja",
@@ -197,10 +197,10 @@ def __init__(self):
197197
self,
198198
"gst-plugins-ugly",
199199
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
200-
version="1.26.0",
200+
version="1.26.1",
201201
lastversion_even=True,
202202
archive_url="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-{version}.tar.xz",
203-
hash="a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde",
203+
hash="34d9bcec8e88b008839d8de33fb043ae75eb04e466df74066fd66ee487a8ec4f",
204204
dependencies=["meson", "ninja", "gst-plugins-base"],
205205
)
206206

@@ -216,10 +216,10 @@ def __init__(self):
216216
self,
217217
"gst-devtools",
218218
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
219-
version="1.26.0",
219+
version="1.26.1",
220220
lastversion_even=True,
221221
archive_url="https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-{version}.tar.xz",
222-
hash="eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648",
222+
hash="32e15cb9d2dd6a07532f92745b62f1c72c8038b1a10d34b64e91c4557f689632",
223223
dependencies=[
224224
"meson",
225225
"ninja",
@@ -250,16 +250,17 @@ def __init__(self):
250250
self,
251251
"gst-python",
252252
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
253-
version="1.26.0",
253+
version="1.26.1",
254254
lastversion_even=True,
255255
archive_url="https://gstreamer.freedesktop.org/src/gst-python/gst-python-{version}.tar.xz",
256-
hash="e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db",
256+
hash="2dce1ecc8a80ce8e0b6f0e0cb3fad3bcd5d65ebe0622ed28eaae97b4559a6a85",
257257
dependencies=[
258258
"meson",
259259
"ninja",
260260
"pygobject",
261261
"gst-plugins-base",
262262
"gst-plugins-bad",
263+
"gst-rtsp-server",
263264
],
264265
)
265266

@@ -275,10 +276,10 @@ def __init__(self):
275276
self,
276277
"gst-libav",
277278
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
278-
version="1.26.0",
279+
version="1.26.1",
279280
lastversion_even=True,
280281
archive_url="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-{version}.tar.xz",
281-
hash="707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf",
282+
hash="350a20b45b6655b6e10265430bdfbb3c436a96e9611b79caabef8f10abe570ea",
282283
# TODO try remove gst-plugins-base
283284
dependencies=["meson", "ninja", "pygobject", "ffmpeg", "gst-plugins-base"],
284285
)
@@ -295,10 +296,10 @@ def __init__(self):
295296
self,
296297
"gst-rtsp-server",
297298
repository="https://gitlab.freedesktop.org/gstreamer/gstreamer",
298-
version="1.26.0",
299+
version="1.26.1",
299300
lastversion_even=True,
300301
archive_url="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-{version}.tar.xz",
301-
hash="e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc",
302+
hash="253fdfec78320c2f67486cd3797a0253c06982c3a8d5160f795b4257fadab301",
302303
dependencies=["meson", "ninja", "gstreamer"],
303304
)
304305

gvsbuild/projects/harfbuzz.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def __init__(self):
2424
Project.__init__(
2525
self,
2626
"harfbuzz",
27-
version="11.1.0",
27+
version="11.2.0",
2828
archive_url="https://github.com/harfbuzz/harfbuzz/releases/download/{version}/harfbuzz-{version}.tar.xz",
29-
hash="477f0d48c34dc32093b45304178eb9733361ca1832b5159879c99e6d40227969",
29+
hash="50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45",
3030
dependencies=["meson", "cmake", "freetype", "cairo", "pkgconf", "glib"],
3131
)
3232

gvsbuild/projects/libuv.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ def __init__(self):
2424
Project.__init__(
2525
self,
2626
"libuv",
27-
version="1.50.0",
27+
version="1.51.0",
2828
archive_filename="libuv-v{version}.tar.gz",
2929
archive_url="https://github.com/libuv/libuv/archive/v{version}.tar.gz",
30-
hash="b1ec56444ee3f1e10c8bd3eed16ba47016ed0b94fe42137435aaf2e0bd574579",
30+
hash="27e55cf7083913bfb6826ca78cde9de7647cded648d35f24163f2d31bb9f51cd",
3131
dependencies=[
3232
"cmake",
3333
"ninja",

gvsbuild/projects/ogg.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def __init__(self):
2929
archive_url="https://github.com/xiph/ogg/releases/download/v{version}/libogg-{version}.tar.xz",
3030
hash="c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705",
3131
dependencies=["cmake", "ninja"],
32+
patches=["001-fix-cmake-min-version.patch"],
3233
)
3334

3435
def build(self):

gvsbuild/tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def __init__(self):
9393
Tool.__init__(
9494
self,
9595
"meson",
96-
version="1.7.2",
96+
version="1.8.0",
9797
archive_url="https://github.com/mesonbuild/meson/archive/refs/tags/{version}.tar.gz",
9898
archive_filename="meson-{version}.tar.gz",
99-
hash="3640ef596523393100df31ba790bc5fe732215e9711a66b673a21c4eb39bc8f1",
99+
hash="eea5274173e00b4b8144b754df5c6e9ccf9ea5acd4e9768efe5d591db2aa3f45",
100100
dir_part="meson-{version}",
101101
exe_name="meson.py",
102102
)

0 commit comments

Comments
 (0)