Skip to content

Commit 14e462a

Browse files
committed
Update modulesets.
1 parent b9aeb15 commit 14e462a

File tree

141 files changed

+492
-17511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+492
-17511
lines changed

modulesets/bootstrap.modules

+46-24
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<repository name="ftp.gnu.org"
1111
href="https://ftp.gnu.org/gnu/"
1212
type="tarball" />
13-
<repository name="pkgconfig"
14-
href="http://pkgconfig.freedesktop.org/releases/"
13+
<repository name="pkgconf"
14+
href="https://distfiles.ariadne.space/pkgconf/"
1515
type="tarball" />
1616
<repository name="sourceforge"
1717
href="http://downloads.sourceforge.net/sourceforge/"
@@ -35,9 +35,9 @@
3535
<autotools id="xz"
3636
autogen-sh="configure"
3737
bootstrap="true">
38-
<branch module="xz/xz-5.4.3.tar.bz2"
39-
version="5.4.3"
40-
hash="sha256:9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90"
38+
<branch module="xz/xz-5.6.2.tar.bz2"
39+
version="5.6.2"
40+
hash="sha256:e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171"
4141
repo="tukaani.org" />
4242
</autotools>
4343
<!--
@@ -53,14 +53,34 @@
5353
repo="ftp.gnu.org" />
5454
</autotools>
5555
<!---->
56+
<autotools id="libiconv"
57+
autogen-sh="configure"
58+
autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings">
59+
60+
<branch module="libiconv/libiconv-1.17.tar.gz"
61+
version="1.17"
62+
hash="sha256:8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
63+
repo="ftp.gnu.org" />
64+
<!---->
65+
</autotools>
66+
<autotools id="libunistring" autogen-sh="configure">
67+
<branch repo="ftp.gnu.org" module="libunistring/libunistring-1.2.tar.gz"
68+
version="1.2">
69+
</branch>
70+
</autotools>
71+
<!---->
5672
<autotools id="gettext"
5773
autogen-sh="configure"
5874
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
5975

60-
<branch module="gettext/gettext-0.22.tar.xz"
61-
version="0.22"
62-
hash="sha256:0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93"
76+
<branch module="gettext/gettext-0.22.5.tar.xz"
77+
version="0.22.5"
78+
hash="sha256:fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640"
6379
repo="ftp.gnu.org" />
80+
<dependencies>
81+
<dep package="libiconv" />
82+
<dep package="libunistring" />
83+
</dependencies>
6484
</autotools>
6585
<!--
6686
cmakes ./configure is picky about invalid flags so we manually set it
@@ -69,9 +89,9 @@
6989
autogen-sh="bootstrap"
7090
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s"
7191
bootstrap="true">
72-
<branch module="v3.26/cmake-3.26.4.tar.gz"
73-
version="3.26.4"
74-
hash="sha256:313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208"
92+
<branch module="v3.29/cmake-3.29.3.tar.gz"
93+
version="3.29.3"
94+
hash="sha256:252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb"
7595
repo="cmake" />
7696
</autotools>
7797
<!--
@@ -90,9 +110,9 @@
90110
<autotools id="autoconf"
91111
autogen-sh="configure"
92112
bootstrap="true">
93-
<branch module="autoconf/autoconf-2.71.tar.xz"
94-
version="2.71"
95-
hash="shas56:f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4"
113+
<branch module="autoconf/autoconf-2.72.tar.xz"
114+
version="2.72"
115+
hash="sha256:ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a"
96116
repo="ftp.gnu.org" />
97117
<dependencies>
98118
<dep package="m4" />
@@ -133,15 +153,15 @@
133153
</dependencies>
134154
</autotools>
135155
<!---->
136-
<autotools id="pkg-config"
137-
autogen-sh="configure"
138-
autogenargs="--with-internal-glib"
139-
bootstrap="true">
140-
<branch module="pkg-config-0.29.2.tar.gz"
141-
version="0.29.2"
142-
hash="sha256:6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
143-
repo="pkgconfig" />
144-
</autotools>
156+
<meson id="pkgconf"
157+
mesonargs="-Dwith-system-libdir=/usr/lib -Dwith-system-includedir=/usr/include" >
158+
<branch module="pkgconf-2.2.0.tar.xz"
159+
version="2.2.0"
160+
hash="sha256:b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69"
161+
repo="pkgconf" >
162+
<patch file="pkgconf-link-pkg-config.patch" strip="1" />
163+
</branch>
164+
</meson>
145165
<!--
146166
macOS provides 2.3 (presumably the last GPL2 version, gstreamer
147167
requires 2.4.
@@ -150,6 +170,7 @@
150170
autogen-sh="configure">
151171
<branch module="bison/bison-3.8.2.tar.xz"
152172
version="3.8.2"
173+
hash="sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
153174
repo="ftp.gnu.org" />
154175
<dependencies>
155176
<dep package='flex' />
@@ -193,12 +214,13 @@
193214
<metamodule id="meta-bootstrap">
194215
<dependencies>
195216
<dep package="xz" />
217+
<dep package="libiconv"/>
196218
<dep package="gettext" />
197219
<dep package="cmake" />
198220
<dep package="autoconf-archive" />
199221
<dep package="libtool" />
200222
<dep package="automake" />
201-
<dep package="pkg-config" />
223+
<dep package="pkgconf" />
202224
<dep package="bison" />
203225
<dep package="flex" />
204226
<dep package="gtk-osx-docbook" />

modulesets/gtk-osx-bootstrap.modules

+24-14
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<repository name="sourceforge"
1818
href="http://downloads.sourceforge.net/sourceforge/"
1919
type="tarball" />
20-
<repository name="jpeg"
21-
href="http://www.ijg.org/files/"
22-
type="tarball" />
2320
<repository name="libtiff"
2421
href="http://download.osgeo.org/"
2522
type="tarball" />
@@ -32,33 +29,46 @@
3229
<repository name="github-tarball"
3330
href="https://github.com/"
3431
type="tarball" />
32+
<repository name="nasm"
33+
href="https://www.nasm.us/pub/nasm/releasebuilds/"
34+
type="tarball" />
3535
<!---->
3636
<autotools id="libpng"
3737
autogen-sh="configure"
3838
autogenargs="--enable-shared">
39-
<branch module="libpng/libpng-1.6.40.tar.xz"
40-
version="1.6.40"
41-
hash="sha256:535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"
39+
<branch module="libpng/libpng-1.6.43.tar.xz"
40+
version="1.6.43"
41+
hash="sha256:6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"
4242
repo="sourceforge" />
4343
<dependencies>
4444
<dep package="zlib" />
4545
</dependencies>
4646
</autotools>
4747
<!---->
48-
<autotools id="libjpeg"
48+
<autotools id="nasm"
4949
autogen-sh="configure">
50-
<branch module="jpegsrc.v9e.tar.gz"
51-
version="9e"
52-
checkoutdir="jpeg-9e"
53-
repo="jpeg" />
50+
<branch module="2.16.03/nasm-2.16.03.tar.xz"
51+
version="2.16.03"
52+
hash="sha256:1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148"
53+
repo="nasm">
54+
</branch>
5455
</autotools>
5556
<!---->
57+
<cmake id="libjpeg" cmakeargs="-DCMAKE_MACOSX_RPATH=true -DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_NAME_DIR=${JHBUILD_PREFIX}/lib -DCMAKE_INSTALL_LIBDIR:PATH=lib">
58+
<branch module="libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz" version="3.0.3"
59+
hash="sha256:343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d"
60+
repo="github-tarball" checkoutdir="libjpeg-turbo-3.0.3" />
61+
<dependencies>
62+
<dep package="nasm" />
63+
</dependencies>
64+
</cmake>
65+
<!---->
5666
<autotools id="libtiff"
5767
autogen-sh="configure"
5868
autogenargs="--without-x">
59-
<branch module="libtiff/tiff-4.5.1.tar.xz"
60-
version="4.5.1"
61-
hash="sha256:3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"
69+
<branch module="libtiff/tiff-4.6.0.tar.xz"
70+
version="4.6.0"
71+
hash="sha256:e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"
6272
repo="libtiff">
6373
<patch file="tiff-nohtml.patch"
6474
strip="1" />

modulesets/gtk-osx-gstreamer.modules

+42-44
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,49 @@
1111
default="yes"
1212
href="http://gstreamer.freedesktop.org/src/"
1313
type="tarball" />
14-
<repository name="sourceforge"
15-
href="http://downloads.sourceforge.net/sourceforge/"
14+
<repository name="github.com"
15+
href="https://github.com/"
1616
type="tarball" />
1717
<repository name="ffmpeg"
1818
href="https://ffmpeg.org/releases/"
1919
type="tarball" />
20-
<repository name="nasm"
21-
href="https://www.nasm.us/pub/nasm/releasebuilds/"
22-
type="tarball" />
2320
<!---->
2421
<meson id="liborc"
2522
mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">
2623

27-
<branch module="orc/orc-0.4.34.tar.xz"
28-
version="0.4.34"
29-
hash="sha256:8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f" />
24+
<branch module="orc/orc-0.4.38.tar.xz"
25+
version="0.4.38"
26+
hash="sha256:a55a98d4772567aa3faed8fb84d540c3db77eaba16d3e2e10b044fbc9228668d" />
3027
</meson>
3128
<!---->
3229
<autotools id="faad2"
3330
autogen-sh="autoreconf"
3431
autogenargs="-without-bmp --without-xmms --without-drm --without-mpeg4ip">
3532

36-
<branch module="faac/faad2-src/faad2-2.8.0/faad2-2.8.6.tar.gz"
37-
version="2.8.6"
38-
hash="sha256:654977adbf62eb81f4fca00152aca58ce3b6dd157181b9edd7bed687a7c73f21"
39-
repo="sourceforge" />
40-
</autotools>
41-
<!---->
42-
<autotools id="nasm"
43-
autogen-sh="configure">
44-
<branch module="2.16.01/nasm-2.16.01.tar.xz"
45-
version="2.16.01"
46-
hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558"
47-
repo="nasm">
48-
<patch file="nasm-2.16.01-warnings.c-needs-srcdir-patch"
49-
strip="1" />
50-
</branch>
33+
<branch module="knik0/faad2/archive/refs/tags/2.11.0.tar.gz"
34+
version="2.11.0"
35+
hash="sha256:720c1dc404439e0a9117aa144dc7ead56f1658adf4badbb39f959d6ad8eed489"
36+
repo="github.com" />
5137
</autotools>
5238
<!---->
5339
<autotools id="ffmpeg"
5440
autogen-sh="configure"
5541
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
5642
autogenargs="--enable-gpl --enable-version3 --enable-shared --disable-static --disable-runtime-cpudetect --disable-programs --disable-ffplay --disable-ffprobe --disable-doc">
5743

58-
<branch module="ffmpeg-4.3.2.tar.xz"
59-
version="4.3.2"
60-
hash="sha256:46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
44+
<branch module="ffmpeg-7.0.tar.xz"
45+
version="7.0"
46+
hash="sha256:4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b"
6147
repo="ffmpeg" />
6248
<dependencies>
6349
<dep package="nasm" />
6450
</dependencies>
6551
</autotools>
6652
<!---->
6753
<meson id="gstreamer">
68-
<branch module="gstreamer/gstreamer-1.22.5.tar.xz"
69-
version="1.22.5"
70-
hash="sha256:4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61">
54+
<branch module="gstreamer/gstreamer-1.24.4.tar.xz"
55+
version="1.24.4"
56+
hash="sha256:52c93bc48e03533aa676fd8c15eb6b5fc326c68db311c50bcc0a865f31a6c653">
7157
</branch>
7258
<after>
7359
<dep package="glib" />
@@ -76,19 +62,19 @@
7662
<!---->
7763
<meson id="gst-plugins-base"
7864
mesonargs="-Dexamples=disabled -Ddoc=disabled">
79-
<branch module="gst-plugins-base/gst-plugins-base-1.22.5.tar.xz"
80-
version="1.22.5"
81-
hash="sha256:edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" />
65+
<branch module="gst-plugins-base/gst-plugins-base-1.24.4.tar.xz"
66+
version="1.24.4"
67+
hash="sha256:09f4ddf246eeb819da1494ce336316edbbcb28fdff3ee2f9804891e84df39b2a" />
8268
<dependencies>
8369
<dep package="gstreamer" />
8470
<dep package="liborc" />
8571
</dependencies>
8672
</meson>
8773
<!---->
8874
<meson id="gst-plugins-good">
89-
<branch module="gst-plugins-good/gst-plugins-good-1.22.5.tar.xz"
90-
version="1.22.5"
91-
hash="sha256:b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778">
75+
<branch module="gst-plugins-good/gst-plugins-good-1.24.4.tar.xz"
76+
version="1.24.4"
77+
hash="sha256:023096d661cf58cde3e0dcdbf56897bf588830232358c305f3e15fd63e116626">
9278
</branch>
9379
<dependencies>
9480
<dep package="gstreamer" />
@@ -97,19 +83,19 @@
9783
</meson>
9884
<!---->
9985
<meson id="gst-plugins-ugly" mesonargs="-Dgpl=enabled">
100-
<branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz"
101-
version="1.22.5"
102-
hash="sha256:2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54" />
86+
<branch module="gst-plugins-ugly/gst-plugins-ugly-1.24.4.tar.xz"
87+
version="1.24.4"
88+
hash="sha256:4604f8709c0bc4d6960ef6ae6fd91e0b20af011bfe22e103f5b85377cf3f1ef4" />
10389
<dependencies>
10490
<dep package="gstreamer" />
10591
<dep package="gst-plugins-base" />
10692
</dependencies>
10793
</meson>
10894
<!---->
10995
<meson id="gst-plugins-bad">
110-
<branch module="gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz"
111-
version="1.22.5"
112-
hash="sha256:e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" />
96+
<branch module="gst-plugins-bad/gst-plugins-bad-1.24.4.tar.xz"
97+
version="1.24.4"
98+
hash="sha256:260bd0a463b4faff9a42f41e5e028f787f10a92b779af8959aec64586f546bd3" />
11399
<dependencies>
114100
<dep package="gstreamer" />
115101
<dep package="gst-plugins-base" />
@@ -119,9 +105,9 @@
119105
</meson>
120106
<!---->
121107
<meson id="gst-libav">
122-
<branch module="gst-libav/gst-libav-1.22.5.tar.xz"
123-
version="1.22.5"
124-
hash="sha256:8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a">
108+
<branch module="gst-libav/gst-libav-1.24.4.tar.xz"
109+
version="1.24.4"
110+
hash="sha256:4d3803f36008e847fc4842c8dd366162baf8359526cc46c1851bf68bb638da73">
125111
</branch>
126112
<dependencies>
127113
<dep package="gstreamer" />
@@ -130,6 +116,17 @@
130116
</dependencies>
131117
</meson>
132118
<!---->
119+
<meson id="gst-python">
120+
<branch module="gst-python/gst-python-1.24.4.tar.xz"
121+
version="1.24.4"
122+
hash="sha256:5510358316eb5c965829a393714b4d88306033cd64db3eae8cc62b41ae80a392">
123+
</branch>
124+
<dependencies>
125+
<dep package="gstreamer" />
126+
<dep package="gst-plugins-base" />
127+
</dependencies>
128+
</meson>
129+
<!---->
133130
<metamodule id="meta-gtk-osx-gstreamer">
134131
<dependencies>
135132
<dep package="gstreamer" />
@@ -138,6 +135,7 @@
138135
<dep package="gst-plugins-ugly" />
139136
<dep package="gst-plugins-bad" />
140137
<dep package="gst-libav" />
138+
<dep package="gst-python" />
141139
</dependencies>
142140
</metamodule>
143141
<!---->

0 commit comments

Comments
 (0)