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 | |
| parent | 9a4fe59b422d5569b00616711c6b9a8793425a5a (diff) | |
| download | aur-4d702ce5975cdbaa3dcf6396dffaa97842c3e0c4.tar.gz | |
Import PR #3338 from upstream instead of PR #2484
As suggested by @Snoop05
| -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.r3.g410c60e79 + pkgver = 26.1.2.r34.gfb347c3c6 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.r3.g410c60e79 + provides = obs-studio=26.1.2.r34.gfb347c3c6 provides = obs-studio-git - provides = obs-studio-wayland=26.1.2.r3.g410c60e79 + provides = obs-studio-wayland=26.1.2.r34.gfb347c3c6 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.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 |