diff options
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 33 |
1 files changed, 22 insertions, 11 deletions
@@ -5,8 +5,8 @@ # Contributor: ArcticVanguard <LideEmily at gmail dot com> # Contributor: ledti <antergist at gmail dot com> pkgname=obs-studio-wayland-git -pkgver=26.0.2.r83.g5f6793676 -pkgrel=2 +pkgver=26.1.2.r27.g79f8b420f +pkgrel=1 pkgdesc="Free, open source software for live streaming and recording (with wayland patches)" arch=("i686" "x86_64") url="https://github.com/obsproject/obs-studio" @@ -14,7 +14,7 @@ license=("GPL2") depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls" "qt5-svg" "qt5-x11extras" "curl" "jack" "gtk-update-icon-cache") makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack" - "vlc" "swig" "luajit" "python" "cef-minimal-3770") + "vlc" "swig" "luajit" "python" "cef-minimal-3770" "wayland") optdepends=("libfdk-aac: FDK AAC codec support" "libxcomposite: XComposite capture support" "libva-intel-driver: hardware encoding" @@ -24,15 +24,19 @@ optdepends=("libfdk-aac: FDK AAC codec support" "luajit: Lua scripting" "python: Python scripting" "v4l2loopback-dkms: virtual webcam" - "qt5-wayland: wayland obs window" - "wlrobs-hg: screen capture on wlroots compositors") + "wlrobs: screen capture on wlroots compositors") provides=("obs-studio=$pkgver" "obs-studio-git" "obs-studio-wayland=$pkgver") conflicts=("obs-studio") source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#branch=master" "git+https://github.com/Mixer/ftl-sdk.git" "git+https://github.com/obsproject/obs-browser.git" - "git+https://aur.archlinux.org/obs-studio-wayland.git") -md5sums=("SKIP" "SKIP" "SKIP" "SKIP") + "fix_python_binary_loading.patch" + "rr-cache.tar.zst") +md5sums=('SKIP' + 'SKIP' + 'SKIP' + '051b90f05e26bff99236b8fb1ad377d1' + 'b2c579e25a7884084701a71579e0b653') pkgver() { cd $pkgname @@ -45,10 +49,17 @@ prepare() { git config submodule.plugins/obs-browser.url $srcdir/obs-browser git submodule update - [ ! -e patched ] && for patch in $srcdir/obs-studio-wayland/*.patch; do - patch -Np1 -i "$patch" - done - touch patched + # from https://github.com/obsproject/obs-studio/pull/2484 + cp -a "$srcdir"/.git/rr-cache .git/ + git config rerere.enabled true + git fetch origin pull/2484/head + git checkout -b wayland FETCH_HEAD + git merge master || true + [[ -z "$(git rerere status)" ]] || exit 1 + git commit --all --no-edit + + # from official arch package + patch -Np1 < "$srcdir"/fix_python_binary_loading.patch } build() { |