Cleanup PKGBUILD, remove ftl plugin, switch to newer cef

This commit is contained in:
Knut Ahlers 2020-12-18 23:11:13 +01:00
parent 136b2f1b40
commit 08a8f39456
Signed by: luzifer
GPG key ID: 0066F03ED215AD7D
2 changed files with 62 additions and 42 deletions

View file

@ -6,24 +6,24 @@ pkgbase = obs-studio-browser
arch = i686 arch = i686
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = cef-minimal
makedepends = cmake makedepends = cmake
makedepends = git makedepends = git
makedepends = jack
makedepends = libfdk-aac makedepends = libfdk-aac
makedepends = libxcomposite makedepends = libxcomposite
makedepends = x264
makedepends = jack
makedepends = vlc
makedepends = swig
makedepends = luajit makedepends = luajit
makedepends = python makedepends = python
makedepends = cef-minimal-3770 makedepends = swig
makedepends = vlc
makedepends = x264
depends = curl
depends = ffmpeg depends = ffmpeg
depends = gtk-update-icon-cache
depends = jansson depends = jansson
depends = libxinerama depends = libxinerama
depends = libxkbcommon-x11 depends = libxkbcommon-x11
depends = qt5-x11extras depends = qt5-x11extras
depends = curl
depends = gtk-update-icon-cache
optdepends = libfdk-aac: FDK AAC codec support optdepends = libfdk-aac: FDK AAC codec support
optdepends = libxcomposite: XComposite capture support optdepends = libxcomposite: XComposite capture support
optdepends = jack: JACK Support optdepends = jack: JACK Support
@ -35,11 +35,9 @@ pkgbase = obs-studio-browser
provides = obs-studio=26.1.0 provides = obs-studio=26.1.0
conflicts = obs-studio conflicts = obs-studio
source = obs-studio-browser::git+https://github.com/obsproject/obs-studio.git#tag=26.1.0 source = obs-studio-browser::git+https://github.com/obsproject/obs-studio.git#tag=26.1.0
source = git+https://github.com/Mixer/ftl-sdk.git
source = git+https://github.com/obsproject/obs-browser.git source = git+https://github.com/obsproject/obs-browser.git
md5sums = SKIP sha256sums = SKIP
md5sums = SKIP sha256sums = SKIP
md5sums = SKIP
pkgname = obs-studio-browser pkgname = obs-studio-browser

View file

@ -3,6 +3,7 @@
# Contributor: Jonathan Steel <jsteel at archlinux.org> # Contributor: Jonathan Steel <jsteel at archlinux.org>
# Contributor: ArcticVanguard <LideEmily at gmail dot com> # Contributor: ArcticVanguard <LideEmily at gmail dot com>
# Contributor: ledti <antergist at gmail dot com> # Contributor: ledti <antergist at gmail dot com>
pkgname=obs-studio-browser pkgname=obs-studio-browser
pkgver=26.1.0 pkgver=26.1.0
pkgrel=1 pkgrel=1
@ -10,28 +11,48 @@ pkgdesc="Free and open source software for video recording and live streaming. B
arch=("i686" "x86_64") arch=("i686" "x86_64")
url="https://github.com/obsproject/obs-studio" url="https://github.com/obsproject/obs-studio"
license=("GPL2") license=("GPL2")
depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" depends=(
"qt5-x11extras" "curl" "gtk-update-icon-cache") "curl"
makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack" "ffmpeg"
"vlc" "swig" "luajit" "python" "cef-minimal-3770") "gtk-update-icon-cache"
optdepends=("libfdk-aac: FDK AAC codec support" "jansson"
"libxinerama"
"libxkbcommon-x11"
"qt5-x11extras"
)
makedepends=(
"cef-minimal"
"cmake"
"git"
"jack"
"libfdk-aac"
"libxcomposite"
"luajit"
"python"
"swig"
"vlc"
"x264"
)
optdepends=(
"libfdk-aac: FDK AAC codec support"
"libxcomposite: XComposite capture support" "libxcomposite: XComposite capture support"
"jack: JACK Support" "jack: JACK Support"
"vlc: VLC Media Source" "vlc: VLC Media Source"
"swig: Scripting" "swig: Scripting"
"luajit: Lua scripting" "luajit: Lua scripting"
"python: Python scripting" "python: Python scripting"
"v4l2loopback-dkms: Virtual camera output") "v4l2loopback-dkms: Virtual camera output"
)
provides=("obs-studio=$pkgver") provides=("obs-studio=$pkgver")
conflicts=("obs-studio") conflicts=("obs-studio")
source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver" source=(
"git+https://github.com/Mixer/ftl-sdk.git" "$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver"
"git+https://github.com/obsproject/obs-browser.git") "git+https://github.com/obsproject/obs-browser.git"
md5sums=("SKIP" "SKIP" "SKIP") )
sha256sums=('SKIP' 'SKIP')
prepare() { prepare() {
cd $pkgname cd $pkgname
git config submodule.plugins/obs-outputs/ftl-sdk.url $srcdir/ftl-sdk
git config submodule.plugins/obs-browser.url $srcdir/obs-browser git config submodule.plugins/obs-browser.url $srcdir/obs-browser
git submodule update git submodule update
} }
@ -39,7 +60,8 @@ prepare() {
build() { build() {
cd $pkgname cd $pkgname
mkdir -p build; cd build mkdir -p build
cd build
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \