diff options
| author | Paulo Matias | 2021-02-05 10:47:05 -0300 |
|---|---|---|
| committer | Paulo Matias | 2021-02-05 10:47:05 -0300 |
| commit | 91f23bc14b77c96d0d423e995165ea2f42853c3a (patch) | |
| tree | 4df2abe49c9fe497d25a99bcf986a35c2e1c143a | |
| parent | 4d702ce5975cdbaa3dcf6396dffaa97842c3e0c4 (diff) | |
| download | aur-91f23bc14b77c96d0d423e995165ea2f42853c3a.tar.gz | |
make PR merge hack more resilient
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = obs-studio-wayland-git pkgdesc = Free, open source software for live streaming and recording (with wayland patches) - pkgver = 26.1.2.r34.gfb347c3c6 + pkgver = 26.1.2.r149.g951acf2df pkgrel = 1 url = https://github.com/obsproject/obs-studio arch = i686 @@ -38,9 +38,9 @@ pkgbase = obs-studio-wayland-git optdepends = python: Python scripting optdepends = v4l2loopback-dkms: virtual webcam optdepends = wlrobs: screen capture on wlroots compositors - provides = obs-studio=26.1.2.r34.gfb347c3c6 + provides = obs-studio=26.1.2.r149.g951acf2df provides = obs-studio-git - provides = obs-studio-wayland=26.1.2.r34.gfb347c3c6 + provides = obs-studio-wayland=26.1.2.r149.g951acf2df conflicts = obs-studio source = obs-studio-wayland-git::git+https://github.com/obsproject/obs-studio.git#branch=master source = git+https://github.com/Mixer/ftl-sdk.git @@ -5,7 +5,7 @@ # Contributor: ArcticVanguard <LideEmily at gmail dot com> # Contributor: ledti <antergist at gmail dot com> pkgname=obs-studio-wayland-git -pkgver=26.1.2.r34.gfb347c3c6 +pkgver=26.1.2.r149.g951acf2df pkgrel=1 pkgdesc="Free, open source software for live streaming and recording (with wayland patches)" arch=("i686" "x86_64") @@ -56,9 +56,9 @@ prepare() { git config user.name "Placeholder" git fetch origin pull/3338/head git checkout -b wayland FETCH_HEAD - git merge master || true + git merge --no-edit master || true [[ -z "$(git rerere status)" ]] || exit 1 - git commit --all --no-edit + git commit --all --no-edit --allow-empty --allow-empty-message # from official arch package patch -Np1 < "$srcdir"/fix_python_binary_loading.patch |