Skip to content

Commit c34fdc2

Browse files
committed
build: install latest meson's git by pip
1 parent ec7ba55 commit c34fdc2

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

.github/workflows/mpv.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
sudo echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
125125
sudo pacman -Syu --noconfirm
126126
sudo pacman -S --noconfirm --needed git gyp mercurial subversion ninja cmake ragel yasm nasm asciidoc enca gperf unzip p7zip gcc-multilib clang python-pip curl lib32-glib2 wget
127-
pip3 install rst2pdf mako
127+
pip3 install rst2pdf mako https://github.com/mesonbuild/meson/archive/refs/heads/master.zip
128128
git config --global user.name "github-actions[bot]"
129129
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
130130
git config --global pull.rebase true

build.sh

-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ main() {
88
userCommand=$2
99

1010
prepare
11-
build_latest_meson
1211
if [ "$1" == "32" ]; then
1312
package "32" "i686"
1413
elif [ "$1" == "64" ]; then
@@ -54,15 +53,6 @@ build() {
5453
fi
5554
}
5655

57-
build_latest_meson() {
58-
if [[ ! -f "$srcdir/meson.pyz" ]]; then
59-
git clone --depth 1 https://github.com/mesonbuild/meson.git /usr/local/src/meson
60-
/usr/local/src/meson/packaging/create_zipapp.py --outfile $srcdir/meson.pyz --interpreter '/usr/bin/env python3' /usr/local/src/meson
61-
rm -rf /usr/local/src/meson
62-
fi
63-
ln -sf $srcdir/meson.pyz /usr/local/bin/meson
64-
}
65-
6656
zip() {
6757
local bit=$1
6858
local arch=$2

0 commit comments

Comments
 (0)