From 322b8a4fb8a48b99d11a1af398f9ea3ad7125627 Mon Sep 17 00:00:00 2001 From: benklett Date: Tue, 22 Dec 2015 09:16:32 +0100 Subject: [PATCH] Simplify PKGBUILD according to escondida's instructions --- .SRCINFO | 7 ++++--- PKGBUILD | 17 ++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bfbbde4..cbf32df 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Tue Dec 22 08:16:22 UTC 2015 pkgbase = obs-studio-git pkgdesc = Free and open source software for video recording and live streaming. - pkgver = 0.11.1.r0.g1efb849 - pkgrel = 2 + pkgver = 0.12.4.r7.g2a99e6f + pkgrel = 1 url = https://github.com/jp9000/obs-studio arch = i686 arch = x86_64 @@ -16,7 +18,6 @@ pkgbase = obs-studio-git depends = libxinerama depends = libxkbcommon-x11 depends = qt5-x11extras - depends = curl optdepends = libfdk-aac: FDK AAC codec support optdepends = libxcomposite: XComposite capture support provides = obs-studio diff --git a/PKGBUILD b/PKGBUILD index 2294a10..a9d8506 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,36 +3,35 @@ # Contributor: ledti pkgname=obs-studio-git -_pkgname=obs-studio -pkgver=0.11.1.r0.g1efb849 -pkgrel=2 +pkgver=0.12.4.r7.g2a99e6f +pkgrel=1 pkgdesc="Free and open source software for video recording and live streaming." arch=('i686' 'x86_64') url="https://github.com/jp9000/obs-studio" license=('GPL2') -depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'qt5-x11extras' 'curl') +depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'qt5-x11extras') makedepends=('cmake' 'git' 'libfdk-aac' 'libxcomposite' 'x264') optdepends=('libfdk-aac: FDK AAC codec support' 'libxcomposite: XComposite capture support') provides=('obs-studio') conflicts=('obs-studio') -source=("$_pkgname::git://github.com/jp9000/obs-studio.git#branch=master") +source=("obs-studio::git://github.com/jp9000/obs-studio.git#branch=master") sha256sums=('SKIP') pkgver() { - cd "$srcdir/$_pkgname" + cd "obs-studio" git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g' } build() { - cd "$srcdir/$_pkgname" + cd "obs-studio" mkdir -p "build" cd "build" cmake -DCMAKE_INSTALL_PREFIX="/usr" -DOBS_VERSION_OVERRIDE=$pkgver .. - make -j`nproc` + make } package() { - cd "$srcdir/$_pkgname/build" + cd "obs-studio/build" make DESTDIR="$pkgdir" install }