commit ce5e004
hovercats
·
2024-10-03 06:57:46 +0000 UTC
parent e63ff78
repo/: be consistent with builddir used by meson/muon
21 files changed,
+77,
-61
+3,
-3
1@@ -10,7 +10,7 @@ meson setup \
2 -Dmandir=/usr/share/man \
3 -Ddocs=false \
4 -Dintrospection=false \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -11,7 +11,7 @@ meson setup \
2 -Dxlib=enabled \
3 -Dxlib-xcb=enabled \
4 -Dtests=disabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+4,
-4
1@@ -13,7 +13,7 @@ build_freetype() (
2 -Dbzip2=disabled \
3 -Dzlib=disabled \
4 "$@" \
5- output
6+ build
7
8 samu -C output
9 samu -C output install
10@@ -40,10 +40,10 @@ kiss list icu >/dev/null 2>&1 || icu_enabled=disabled
11 -Dicu="${icu_enabled:-enabled}" \
12 -Dtests=disabled \
13 -Dintrospection=disabled \
14- output
15+ build
16
17- samu -C output
18- samu -C output install
19+ samu -C build
20+ samu -C build install
21 )
22
23 # Point Freetype to the Harfbuzz files.
+3,
-3
1@@ -17,7 +17,7 @@ meson setup \
2 -Dinstalled_tests=false \
3 -Dbuiltin_loaders=all \
4 -Dwrap_mode=nofallback \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -14,7 +14,7 @@ meson setup \
2 -Dopenssl=disabled \
3 -Dgnutls=enabled \
4 -Dgnome_proxy=disabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -8,7 +8,7 @@ meson setup \
2 -Ddoc=disabled \
3 -Dtests=disabled \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -8,7 +8,7 @@ meson setup \
2 -Ddoc=disabled \
3 -Dtests=disabled \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -14,10 +14,10 @@ meson setup \
2 -Ddoc=disabled \
3 -Dalsa=enabled \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
12
13 # Compress manpages
14 find "$1/usr/share/man" -type f -exec gzip -n -9 {} +
+3,
-3
1@@ -8,7 +8,7 @@ meson setup \
2 -Ddoc=disabled \
3 -Dtests=disabled \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -8,7 +8,7 @@ meson setup \
2 -Ddoc=disabled \
3 -Dtests=disabled \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -14,10 +14,10 @@ meson setup \
2 -Ddoc=disabled \
3 -Db_colorout=never \
4 -Dtests=disabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
12
13 # Compress manpages
14 find "$1/usr/share/man" -type f -exec gzip -n -9 {} +
+3,
-3
1@@ -28,10 +28,10 @@ meson setup \
2 -Ddemos=false \
3 -Dexamples=false \
4 -Dtests=false \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
12
13 # We don't compile with librsvg which leads to this utility solely causing
14 # compiler errors for some packages. It has no use at all.
+3,
-3
1@@ -7,7 +7,7 @@ patch -p1 < 0001-remove-fribidi-dependency.patch
2 meson setup \
3 -Dprefix=/usr \
4 -Dfontconfig=enabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -11,7 +11,7 @@ meson setup \
2 -Dmandir=/usr/share/man \
3 -Dpkg_config_path=/usr/lib/pkgconfig \
4 -Dx11=true \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+16,
-0
1@@ -4,6 +4,7 @@ export DESTDIR="$1"
2
3 patch -p1 < 0001-remove-the-need-for-vulkan-headers.patch
4
5+<<<<<<< HEAD
6 meson setup \
7 -Dprefix=/usr \
8 -Dbuildtype=release \
9@@ -11,6 +12,21 @@ meson setup \
10 -Ddemos=false \
11 -Dopengl=disabled \
12 output
13+=======
14+mk() (
15+ muon setup \
16+ -Dprefix=/usr \
17+ -Dbuildtype=release \
18+ -Dvulkan=disabled \
19+ -Ddemos=false \
20+ -Dopengl=disabled \
21+ "$@" \
22+ build
23+
24+ samu -C build
25+ muon -C build install
26+)
27+>>>>>>> 5e23bc7 (repo/: be consistent with builddir used by meson/muon)
28
29 samu -C output
30 samu -C output install
+3,
-3
1@@ -26,7 +26,7 @@ meson setup \
2 -Dsysprof=disabled \
3 -Dpkcs11_tests=disabled \
4 -Dintrospection=disabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -14,10 +14,10 @@ meson setup \
2 -Denable-wayland=false \
3 -Denable-xkbregistry=false \
4 -Dpkg_config_path=/usr/lib/pkgconfig \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
12
13 # Compress manpages
14 find "$1/usr/share/man" -type f -exec gzip -n -9 {} +
+3,
-3
1@@ -34,7 +34,7 @@ meson setup \
2 -Dvulkan-drivers='' \
3 -Dglvnd="${glvnd_enabled:-false}" \
4 -Db_colorout=never \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -17,7 +17,7 @@ meson setup \
2 -Dlibdir=/usr/lib \
3 -Dgtk_doc=false \
4 -Dintrospection=disabled \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -6,7 +6,7 @@ meson setup \
2 -Dprefix=/usr \
3 -Dgtk=disabled \
4 -Ddefault_library=static \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install
+3,
-3
1@@ -6,7 +6,7 @@ meson setup \
2 -Dprefix=/usr \
3 -Dbuildtype=release \
4 -Dtests=false \
5- output
6+ build
7
8-samu -C output
9-samu -C output install
10+samu -C build
11+samu -C build install