From f2df8d03a479b257a78bd501327af8203958f940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 15 Nov 2022 17:29:49 +0100 Subject: [PATCH 1/3] Update indentation and formatting --- PKGBUILD | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c3db132..0f707a0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,37 +13,37 @@ source=("https://github.com/nowrep/$pkgbase/archive/v$pkgver.tar.gz") sha512sums=('55ba0c449cef9c80db82e98a2f6e282dfbf00a7ef0c180e307bd602ae13aadbb0383a38a56dcf4d67ed7ac1e5dd392be7ef71bb1e6f39278da69ed110c159bb0') build() { - cmake -B build -S "$pkgbase-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_DATADIR=/share \ - -DCMAKE_BUILD_TYPE=Release - make -C build -j $(nproc) + cmake -B build -S "$pkgbase-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_DATADIR=/share \ + -DCMAKE_BUILD_TYPE=Release + make -C build -j $(nproc) - export CFLAGS="-m32 ${CFLAGS}" - export CXXFLAGS="-m32 ${CXXFLAGS}" - export LDFLAGS="-m32 ${LDFLAGS}" + export CFLAGS="-m32 ${CFLAGS}" + export CXXFLAGS="-m32 ${CXXFLAGS}" + export LDFLAGS="-m32 ${LDFLAGS}" - cmake -B build32 -S "$pkgbase-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_INSTALL_DATADIR=/share \ - -DCMAKE_LIBRARY_PATH=/usr/lib32 \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_PLUGIN=OFF - make -C build32 -j $(nproc) + cmake -B build32 -S "$pkgbase-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib32 \ + -DCMAKE_INSTALL_DATADIR=/share \ + -DCMAKE_LIBRARY_PATH=/usr/lib32 \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_PLUGIN=OFF + make -C build32 -j $(nproc) } package_obs-vkcapture() { - pkgdesc='OBS Linux Vulkan/OpenGL game capture' + pkgdesc='OBS Linux Vulkan/OpenGL game capture' - make -C build DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } package_lib32-obs-vkcapture() { - pkgdesc='OBS Linux Vulkan/OpenGL game capture (32-bit)' - depends=('lib32-vulkan-icd-loader' 'lib32-libgl') + pkgdesc='OBS Linux Vulkan/OpenGL game capture (32-bit)' + depends=('lib32-vulkan-icd-loader' 'lib32-libgl') - make -C build32 DESTDIR="$pkgdir" install - rm -r "$pkgdir/usr/bin" + make -C build32 DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/bin" } From dd6f45b146446af53b7e318f5bfe283604b27520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 23 Nov 2022 17:50:04 +0100 Subject: [PATCH 2/3] Revert setting jobs option for make This option should be set in makepkg.conf instead of being passed by the package --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 0f707a0..11661b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_DATADIR=/share \ -DCMAKE_BUILD_TYPE=Release - make -C build -j $(nproc) + make -C build export CFLAGS="-m32 ${CFLAGS}" export CXXFLAGS="-m32 ${CXXFLAGS}" @@ -31,7 +31,7 @@ build() { -DCMAKE_LIBRARY_PATH=/usr/lib32 \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_PLUGIN=OFF - make -C build32 -j $(nproc) + make -C build32 } package_obs-vkcapture() { From 6eceba77fb076118b135ec7fe445cfd348bafb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 29 Nov 2022 19:08:19 +0100 Subject: [PATCH 3/3] upgpkg: obs-vkcapture 1.2.2-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bb4342e..7d690a2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = obs-vkcapture - pkgver = 1.2.1 + pkgver = 1.2.2 pkgrel = 1 url = https://github.com/nowrep/obs-vkcapture arch = x86_64 @@ -13,8 +13,8 @@ pkgbase = obs-vkcapture depends = vulkan-icd-loader depends = libgl depends = obs-studio>=27 - source = https://github.com/nowrep/obs-vkcapture/archive/v1.2.1.tar.gz - sha512sums = 55ba0c449cef9c80db82e98a2f6e282dfbf00a7ef0c180e307bd602ae13aadbb0383a38a56dcf4d67ed7ac1e5dd392be7ef71bb1e6f39278da69ed110c159bb0 + source = https://github.com/nowrep/obs-vkcapture/archive/v1.2.2/obs-vkcapture-1.2.2.tar.gz + sha512sums = 382578afbd9bfacc4e3b2bf16e244ab8318e07c1cfdbe2d887acae6eefea4eba5ccc03e0e96ddd06e1bb65a229c622eb8205a380dace0abb91dce07812419a31 pkgname = obs-vkcapture pkgdesc = OBS Linux Vulkan/OpenGL game capture diff --git a/PKGBUILD b/PKGBUILD index 11661b1..24548ff 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,15 +2,15 @@ pkgbase=obs-vkcapture pkgname=("$pkgbase" "lib32-$pkgbase") -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 url="https://github.com/nowrep/$pkgbase" license=('GPL2') arch=('x86_64') depends=('vulkan-icd-loader' 'libgl' 'obs-studio>=27') makedepends=('gcc' 'cmake' 'vulkan-headers' 'lib32-gcc-libs' 'lib32-vulkan-icd-loader' 'lib32-libgl') -source=("https://github.com/nowrep/$pkgbase/archive/v$pkgver.tar.gz") -sha512sums=('55ba0c449cef9c80db82e98a2f6e282dfbf00a7ef0c180e307bd602ae13aadbb0383a38a56dcf4d67ed7ac1e5dd392be7ef71bb1e6f39278da69ed110c159bb0') +source=("https://github.com/nowrep/$pkgbase/archive/v$pkgver/$pkgbase-$pkgver.tar.gz") +sha512sums=('382578afbd9bfacc4e3b2bf16e244ab8318e07c1cfdbe2d887acae6eefea4eba5ccc03e0e96ddd06e1bb65a229c622eb8205a380dace0abb91dce07812419a31') build() { cmake -B build -S "$pkgbase-$pkgver" \