diff options
| author | Paulo Matias | 2021-01-17 00:10:55 -0300 |
|---|---|---|
| committer | Paulo Matias | 2021-01-17 00:10:55 -0300 |
| commit | 4d702ce5975cdbaa3dcf6396dffaa97842c3e0c4 (patch) | |
| tree | 4ab83c9d957c2511ad0f96b27c12d2a8e33695ee /PKGBUILD | |
| parent | 9a4fe59b422d5569b00616711c6b9a8793425a5a (diff) | |
| download | aur-4d702ce5975cdbaa3dcf6396dffaa97842c3e0c4.tar.gz | |
Import PR #3338 from upstream instead of PR #2484
As suggested by @Snoop05
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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.r3.g410c60e79 +pkgver=26.1.2.r34.gfb347c3c6 pkgrel=1 pkgdesc="Free, open source software for live streaming and recording (with wayland patches)" arch=("i686" "x86_64") @@ -49,12 +49,12 @@ prepare() { git config submodule.plugins/obs-browser.url $srcdir/obs-browser git submodule update - # from https://github.com/obsproject/obs-studio/pull/2484 + # from https://github.com/obsproject/obs-studio/pull/3338 cp -a "$srcdir"/.git/rr-cache .git/ git config rerere.enabled true git config user.email "placeholder@example.com" git config user.name "Placeholder" - git fetch origin pull/2484/head + git fetch origin pull/3338/head git checkout -b wayland FETCH_HEAD git merge master || true [[ -z "$(git rerere status)" ]] || exit 1 |