Skip to content

Commit 7b85c6b

Browse files
MassOS 2022.07 release
1 parent 8093420 commit 7b85c6b

7 files changed

Lines changed: 113 additions & 31 deletions

File tree

build-system.sh

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -859,16 +859,16 @@ install -t /usr/share/licenses/mpdecimal -Dm644 LICENSE.txt
859859
cd ..
860860
rm -rf mpdecimal-2.5.1
861861
# kmod.
862-
tar -xf kmod-29.tar.xz
863-
cd kmod-29
862+
tar -xf kmod-30.tar.xz
863+
cd kmod-30
864864
./configure --prefix=/usr --sysconfdir=/etc --with-xz --with-zstd --with-zlib --with-openssl
865865
make
866866
make install
867867
for target in depmod insmod modinfo modprobe rmmod; do ln -sf ../bin/kmod /usr/sbin/$target; done
868868
ln -sf kmod /usr/bin/lsmod
869869
install -t /usr/share/licenses/kmod -Dm644 COPYING
870870
cd ..
871-
rm -rf kmod-29
871+
rm -rf kmod-30
872872
# Python (initial build; will be rebuilt later to support SQLite and Tk).
873873
tar -xf Python-3.10.5.tar.xz
874874
cd Python-3.10.5
@@ -2924,16 +2924,16 @@ make -C dkms-3.0.3 BASHDIR=/usr/share/bash-completion/completions install
29242924
install -t /usr/share/licenses/dkms -Dm644 dkms-3.0.3/COPYING
29252925
rm -rf dkms-3.0.3
29262926
# GLib.
2927-
tar -xf glib-2.72.2.tar.xz
2928-
cd glib-2.72.2
2927+
tar -xf glib-2.72.3.tar.xz
2928+
cd glib-2.72.3
29292929
patch -Np1 -i ../patches/glib-2.72.0-lessnoisy.patch
29302930
mkdir glib-build; cd glib-build
2931-
meson --prefix=/usr --buildtype=minsize -Dman=true ..
2931+
meson --prefix=/usr --buildtype=minsize -Dman=true -Dtests=false ..
29322932
ninja
29332933
ninja install
29342934
install -t /usr/share/licenses/glib -Dm644 ../COPYING
29352935
cd ../..
2936-
rm -rf glib-2.72.2
2936+
rm -rf glib-2.72.3
29372937
# GTK-Doc.
29382938
tar -xf gtk-doc-1.33.2.tar.xz
29392939
cd gtk-doc-1.33.2
@@ -3959,15 +3959,15 @@ install -t /usr/share/licenses/libglvnd -Dm644 ../COPYING
39593959
cd ../..
39603960
rm -rf libglvnd-v1.4.0
39613961
# Mesa.
3962-
tar -xf mesa-22.1.2.tar.xz
3963-
cd mesa-22.1.2
3962+
tar -xf mesa-22.1.3.tar.xz
3963+
cd mesa-22.1.3
39643964
mkdir mesa-build; cd mesa-build
39653965
meson --prefix=/usr --buildtype=minsize -Dgallium-drivers=crocus,d3d12,i915,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink -Dvulkan-drivers=amd,intel,swrast -Dvulkan-layers=device-select,intel-nullhw,overlay -Dglx=dri -Dglvnd=true -Dosmesa=true -Dvalgrind=disabled ..
39663966
ninja
39673967
ninja install
39683968
install -t /usr/share/licenses/mesa -Dm644 ../docs/license.rst
39693969
cd ../..
3970-
rm -rf mesa-22.1.2
3970+
rm -rf mesa-22.1.3
39713971
# libva (rebuild to support Mesa).
39723972
tar -xf libva-2.15.0.tar.gz
39733973
cd libva-2.15.0
@@ -5853,15 +5853,15 @@ install -t /usr/share/licenses/gsettings-desktop-schemas -Dm644 ../COPYING
58535853
cd ../..
58545854
rm -rf gsettings-desktop-schemas-42.0
58555855
# glib-networking.
5856-
tar -xf glib-networking-2.72.0.tar.xz
5857-
cd glib-networking-2.72.0
5856+
tar -xf glib-networking-2.72.1.tar.xz
5857+
cd glib-networking-2.72.1
58585858
mkdir glibnet-build; cd glibnet-build
58595859
meson --prefix=/usr --buildtype=minsize ..
58605860
ninja
58615861
ninja install
58625862
install -t /usr/share/licenses/glib-networking -Dm644 ../COPYING
58635863
cd ../..
5864-
rm -rf glib-networking-2.72.0
5864+
rm -rf glib-networking-2.72.1
58655865
# libsoup.
58665866
tar -xf libsoup-2.74.2.tar.xz
58675867
cd libsoup-2.74.2
@@ -5873,15 +5873,15 @@ install -t /usr/share/licenses/libsoup -Dm644 ../COPYING
58735873
cd ../..
58745874
rm -rf libsoup-2.74.2
58755875
# libsoup3.
5876-
tar -xf libsoup-3.0.6.tar.xz
5877-
cd libsoup-3.0.6
5876+
tar -xf libsoup-3.0.7.tar.xz
5877+
cd libsoup-3.0.7
58785878
mkdir soup3-build; cd soup3-build
58795879
meson --prefix=/usr --buildtype=minsize -Dpkcs11_tests=disabled -Dtests=false ..
58805880
ninja
58815881
ninja install
58825882
install -t /usr/share/licenses/libsoup3 -Dm644 ../COPYING
58835883
cd ../..
5884-
rm -rf libsoup-3.0.6
5884+
rm -rf libsoup-3.0.7
58855885
# libostree.
58865886
tar -xf libostree-2022.4.tar.xz
58875887
cd libostree-2022.4
@@ -6369,6 +6369,7 @@ rm -rf gstreamer-vaapi-1.20.3
63696369
# PipeWire + WirePlumber.
63706370
tar -xf pipewire-0.3.53.tar.gz
63716371
cd pipewire-0.3.53
6372+
patch -Np1 -i ../patches/pipewire-0.3.53-upstreamfix.patch
63726373
mkdir -p subprojects/wireplumber
63736374
tar -xf ../wireplumber-0.4.10.tar.gz -C subprojects/wireplumber --strip-components=1
63746375
mkdir pipewire-build; cd pipewire-build

changelog.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Full Changelog History
22
This document contains the full changelog for every previous versions of MassOS, as well as the changes currently in development for the next upcoming version of MassOS (which may be subject to change before the version is finally released).
33

4-
# Current Development
4+
# MassOS 2022.07
55
Changes:
66

77
- Fixed very long startup times in Firefox and Evince (https://github.com/MassOS-Linux/MassOS/issues/29).
@@ -26,6 +26,8 @@ Upgraded software:
2626
- File: `5.41 --> 5.42`
2727
- Firefox: `101.0 --> 102.0`
2828
- Git: `2.36.1 --> 2.37.0`
29+
- GLib: `2.72.2 --> 2.72.3`
30+
- glib-networking: `2.72.0 --> 2.72.1`
2931
- glslang: `11.9.0 --> 11.10.0`
3032
- Graphviz: `3.0.0 --> 4.0.0`
3133
- HarfBuzz: `4.3.0 --> 4.4.1`
@@ -37,20 +39,22 @@ Upgraded software:
3739
- JS91: `91.10.0 --> 91.11.0`
3840
- JSON: `4.06 --> 4.07`
3941
- kbd: `2.4.0 --> 2.5.1`
42+
- kmod: `29 --> 30`
4043
- libdrm: `2.4.110 --> 2.4.111`
4144
- libinput: `1.20.1 --> 1.21.0`
4245
- libnghttp2: `1.47.0 --> 1.48.0`
4346
- libnma: `1.8.38 --> 1.8.40`
4447
- libostree: `2022.3 --> 2022.4`
4548
- libqmi: `1.30.6 --> 1.30.8`
4649
- librsvg: `2.54.3 --> 2.54.4`
50+
- libsoup3: `3.0.6 --> 3.0.7`
4751
- libva: `2.14.0 --> 2.15.0`
4852
- libvpx: `1.11.0 --> 1.12.0`
4953
- libX11: `1.8 --> 1.8.1`
5054
- Linux Kernel: `5.18.1 --> 5.18.8`
5155
- LLVM/Clang/LLD: `14.0.4 --> 14.0.6`
5256
- lxml: `4.8.0 --> 4.9.0`
53-
- Mesa: `22.1.0 --> 22.1.2`
57+
- Mesa: `22.1.0 --> 22.1.3`
5458
- Meson: `0.62.1 --> 0.62.2`
5559
- mpg123: `1.29.3 --> 1.30.0`
5660
- mtools: `4.0.39 --> 4.0.40`
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
From 9af94508886b19bb398f4e2a777447ca42907c2f Mon Sep 17 00:00:00 2001
2+
From: Wim Taymans <wtaymans@redhat.com>
3+
Date: Fri, 1 Jul 2022 15:25:37 +0200
4+
Subject: [PATCH] audioconvert: ensure temp buffers are large enough
5+
6+
Ensure that our temporary buffers can hold at least quantum_limit
7+
samples. When no output or input is connected, we can generate up
8+
to a quantum_limit of silence, which requires all the buffers to
9+
be scaled correctly.
10+
11+
Fixes a segfault in mpv.
12+
---
13+
spa/plugins/audioconvert/audioconvert.c | 21 ++++++++++-----------
14+
1 file changed, 10 insertions(+), 11 deletions(-)
15+
16+
diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c
17+
index ae3e4d7c3..21a7ffea1 100644
18+
--- a/spa/plugins/audioconvert/audioconvert.c
19+
+++ b/spa/plugins/audioconvert/audioconvert.c
20+
@@ -221,9 +221,7 @@ struct impl {
21+
uint32_t empty_size;
22+
float *empty;
23+
float *scratch;
24+
- float *tmp;
25+
- float *tmp2;
26+
-
27+
+ float *tmp[2];
28+
float *tmp_datas[2][MAX_PORTS];
29+
};
30+
31+
@@ -1489,9 +1487,9 @@ static int setup_convert(struct impl *this)
32+
return res;
33+
34+
for (i = 0; i < MAX_PORTS; i++) {
35+
- this->tmp_datas[0][i] = SPA_PTROFF(this->tmp, this->empty_size * i, void);
36+
+ this->tmp_datas[0][i] = SPA_PTROFF(this->tmp[0], this->empty_size * i, void);
37+
this->tmp_datas[0][i] = SPA_PTR_ALIGN(this->tmp_datas[0][i], MAX_ALIGN, void);
38+
- this->tmp_datas[1][i] = SPA_PTROFF(this->tmp2, this->empty_size * i, void);
39+
+ this->tmp_datas[1][i] = SPA_PTROFF(this->tmp[1], this->empty_size * i, void);
40+
this->tmp_datas[1][i] = SPA_PTR_ALIGN(this->tmp_datas[1][i], MAX_ALIGN, void);
41+
}
42+
43+
@@ -2007,7 +2005,8 @@ impl_node_port_use_buffers(void *object,
44+
45+
clear_buffers(this, port);
46+
47+
- maxsize = 0;
48+
+ maxsize = this->quantum_limit * sizeof(float);
49+
+
50+
for (i = 0; i < n_buffers; i++) {
51+
struct buffer *b;
52+
uint32_t n_datas = buffers[i]->n_datas;
53+
@@ -2048,10 +2047,10 @@ impl_node_port_use_buffers(void *object,
54+
if (maxsize > this->empty_size) {
55+
this->empty = realloc(this->empty, maxsize + MAX_ALIGN);
56+
this->scratch = realloc(this->scratch, maxsize + MAX_ALIGN);
57+
- this->tmp = realloc(this->tmp, (4 * maxsize + MAX_ALIGN) * MAX_PORTS);
58+
- this->tmp2 = realloc(this->tmp2, (4 * maxsize + MAX_ALIGN) * MAX_PORTS);
59+
+ this->tmp[0] = realloc(this->tmp[0], (maxsize + MAX_ALIGN) * MAX_PORTS);
60+
+ this->tmp[1] = realloc(this->tmp[1], (maxsize + MAX_ALIGN) * MAX_PORTS);
61+
if (this->empty == NULL || this->scratch == NULL ||
62+
- this->tmp == NULL || this->tmp2 == NULL)
63+
+ this->tmp[0] == NULL || this->tmp[1] == NULL)
64+
return -errno;
65+
memset(this->empty, 0, maxsize + MAX_ALIGN);
66+
this->empty_size = maxsize;
67+
@@ -2639,8 +2638,8 @@ static int impl_clear(struct spa_handle *handle)
68+
free(this->dir[SPA_DIRECTION_OUTPUT].ports[i]);
69+
free(this->empty);
70+
free(this->scratch);
71+
- free(this->tmp);
72+
- free(this->tmp2);
73+
+ free(this->tmp[0]);
74+
+ free(this->tmp[1]);
75+
76+
if (this->resample.free)
77+
resample_free(&this->resample);

source-urls

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ https://archive.massos.org/sources/ghostscript-fonts-std-8.11.tar.gz
143143
https://ftp.acc.umu.se/pub/gnome/sources/gi-docgen/2022/gi-docgen-2022.1.tar.xz
144144
https://archive.massos.org/sources/giflib-5.2.1.tar.gz
145145
https://cdn.kernel.org/pub/software/scm/git/git-2.37.0.tar.xz
146-
https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.2.tar.xz
147-
https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz
146+
https://ftp.acc.umu.se/pub/gnome/sources/glib/2.72/glib-2.72.3.tar.xz
147+
https://ftp.acc.umu.se/pub/gnome/sources/glib-networking/2.72/glib-networking-2.72.1.tar.xz
148148
https://mirror.lyrahosting.com/gnu/glibc/glibc-2.35.tar.xz
149149
https://ftp.acc.umu.se/pub/gnome/sources/glibmm/2.66/glibmm-2.66.4.tar.xz
150150
https://github.com/KhronosGroup/glslang/archive/11.10.0/glslang-11.10.0.tar.gz
@@ -217,7 +217,7 @@ https://ftp.acc.umu.se/pub/gnome/sources/json-glib/1.6/json-glib-1.6.6.tar.xz
217217
https://github.com/open-source-parsers/jsoncpp/archive/1.9.5/jsoncpp-1.9.5.tar.gz
218218
https://cdn.kernel.org/pub/linux/utils/kbd/kbd-2.5.1.tar.xz
219219
https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v0.3.2/keybinder-3.0-0.3.2.tar.gz
220-
https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz
220+
https://cdn.kernel.org/pub/linux/utils/kernel/kmod/kmod-30.tar.xz
221221
https://kerberos.org/dist/krb5/1.20/krb5-1.20.tar.gz
222222
https://github.com/despoa/LAME/archive/refs/tags/lame3_100.tar.gz
223223
https://deb.debian.org/debian/pool/main/l/laptop-detect/laptop-detect_0.16.tar.xz
@@ -313,7 +313,7 @@ https://mirror.lyrahosting.com/gnu/libsigsegv/libsigsegv-2.14.tar.gz
313313
https://www.x.org/archive/individual/lib/libSM-1.2.3.tar.bz2
314314
https://github.com/libsndfile/libsndfile/releases/download/1.1.0/libsndfile-1.1.0.tar.xz
315315
https://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.74/libsoup-2.74.2.tar.xz
316-
https://ftp.acc.umu.se/pub/gnome/sources/libsoup/3.0/libsoup-3.0.6.tar.xz
316+
https://ftp.acc.umu.se/pub/gnome/sources/libsoup/3.0/libsoup-3.0.7.tar.xz
317317
https://www.libssh2.org/download/libssh2-1.10.0.tar.gz
318318
https://mirror.lyrahosting.com/gnu/libtasn1/libtasn1-4.18.0.tar.gz
319319
https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz
@@ -406,7 +406,7 @@ https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.3.6.tar.gz
406406
https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-2.1.1.tar.gz
407407
https://github.com/MassOS-Linux/massos-welcome/archive/cc649f83e04f0daa880edf1df8e4d5165b79787c/massos-welcome-cc649f83e04f0daa880edf1df8e4d5165b79787c.tar.gz
408408
https://cdn.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2.tar.xz
409-
https://archive.mesa3d.org/mesa-22.1.2.tar.xz
409+
https://archive.mesa3d.org/mesa-22.1.3.tar.xz
410410
https://github.com/mesonbuild/meson/releases/download/0.62.2/meson-0.62.2.tar.gz
411411
https://www.x.org/archive/individual/app/mkfontscale-1.2.2.tar.xz
412412
https://github.com/videolabs/libmicrodns/releases/download/0.2.0/microdns-0.2.0.tar.xz

utils/etc/lsb-release

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
DISTRIB_ID="MassOS"
2-
DISTRIB_RELEASE="development"
3-
DISTRIB_CODENAME="development"
2+
DISTRIB_RELEASE="2022.07"
3+
DISTRIB_CODENAME="2022.07"
44
DISTRIB_DESCRIPTION="MassOS"

utils/etc/os-release

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
NAME="MassOS"
2-
VERSION="development"
3-
VERSION_ID="development"
2+
VERSION="2022.07"
3+
VERSION_ID="2022.07"
44
ID="massos"
5-
PRETTY_NAME="MassOS development"
6-
BUILD_ID="development"
7-
VERSION_CODENAME="development"
5+
PRETTY_NAME="MassOS 2022.07"
6+
BUILD_ID="2022.07"
7+
VERSION_CODENAME="2022.07"
88
LOGO="massos-logo"
99
HOME_URL="https://massos.org"
1010
DOCUMENTATION_URL="https://github.com/MassOS-Linux/MassOS/wiki"

utils/massos-release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
development
1+
2022.07

0 commit comments

Comments
 (0)