From 08a8f39456f769c50e112a7bfde581fe78e59316 Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Fri, 18 Dec 2020 23:11:13 +0100 Subject: [PATCH] Cleanup PKGBUILD, remove ftl plugin, switch to newer cef --- .SRCINFO | 20 ++++++-------- PKGBUILD | 84 +++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 62 insertions(+), 42 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5cadfec..cdc5471 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,24 +6,24 @@ pkgbase = obs-studio-browser arch = i686 arch = x86_64 license = GPL2 + makedepends = cef-minimal makedepends = cmake makedepends = git + makedepends = jack makedepends = libfdk-aac makedepends = libxcomposite - makedepends = x264 - makedepends = jack - makedepends = vlc - makedepends = swig makedepends = luajit makedepends = python - makedepends = cef-minimal-3770 + makedepends = swig + makedepends = vlc + makedepends = x264 + depends = curl depends = ffmpeg + depends = gtk-update-icon-cache depends = jansson depends = libxinerama depends = libxkbcommon-x11 depends = qt5-x11extras - depends = curl - depends = gtk-update-icon-cache optdepends = libfdk-aac: FDK AAC codec support optdepends = libxcomposite: XComposite capture support optdepends = jack: JACK Support @@ -35,11 +35,9 @@ pkgbase = obs-studio-browser provides = obs-studio=26.1.0 conflicts = obs-studio 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 - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP + sha256sums = SKIP + sha256sums = SKIP pkgname = obs-studio-browser diff --git a/PKGBUILD b/PKGBUILD index 516e12e..7424258 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,6 +3,7 @@ # Contributor: Jonathan Steel # Contributor: ArcticVanguard # Contributor: ledti + pkgname=obs-studio-browser pkgver=26.1.0 pkgrel=1 @@ -10,51 +11,72 @@ pkgdesc="Free and open source software for video recording and live streaming. B arch=("i686" "x86_64") url="https://github.com/obsproject/obs-studio" license=("GPL2") -depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" - "qt5-x11extras" "curl" "gtk-update-icon-cache") -makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack" - "vlc" "swig" "luajit" "python" "cef-minimal-3770") -optdepends=("libfdk-aac: FDK AAC codec support" - "libxcomposite: XComposite capture support" - "jack: JACK Support" - "vlc: VLC Media Source" - "swig: Scripting" - "luajit: Lua scripting" - "python: Python scripting" - "v4l2loopback-dkms: Virtual camera output") +depends=( + "curl" + "ffmpeg" + "gtk-update-icon-cache" + "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" + "jack: JACK Support" + "vlc: VLC Media Source" + "swig: Scripting" + "luajit: Lua scripting" + "python: Python scripting" + "v4l2loopback-dkms: Virtual camera output" +) provides=("obs-studio=$pkgver") conflicts=("obs-studio") -source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver" - "git+https://github.com/Mixer/ftl-sdk.git" - "git+https://github.com/obsproject/obs-browser.git") -md5sums=("SKIP" "SKIP" "SKIP") +source=( + "$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver" + "git+https://github.com/obsproject/obs-browser.git" +) +sha256sums=('SKIP' 'SKIP') prepare() { - 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 submodule update + cd $pkgname + git config submodule.plugins/obs-browser.url $srcdir/obs-browser + git submodule update } build() { - cd $pkgname + cd $pkgname - mkdir -p build; cd build + mkdir -p build + cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_BROWSER=ON \ - -DCEF_ROOT_DIR="/opt/cef" \ - -DOBS_VERSION_OVERRIDE=$pkgver .. + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_BROWSER=ON \ + -DCEF_ROOT_DIR="/opt/cef" \ + -DOBS_VERSION_OVERRIDE=$pkgver .. - make + make } package() { - cd $pkgname/build + cd $pkgname/build - make install DESTDIR="$pkgdir" + make install DESTDIR="$pkgdir" } # vim: ts=2:sw=2:expandtab