Arch Linux User Repository

Yeah, you're right about make and I understood it even at initial package submission.

I like how current package() is explicit though, I think I've seen some official packages sticking to such way of things instead of relying on make. I'll leave it as it is so far, will update the PKGBUILD if needed.

Better than what it was, would still prefer using cmake in package() instead of manually specifying everything, this will be a problem if the project ever adds or removes files.

Thanks a lot for the feedback and referencing wiki!

I don't agree with everything, but most of it was addressed and PKGBUILD definitely got better. I've mentioned your contribution in it.

edit: I thought provides would automatically handle conflicts but that wasn't the case, right?

Took the liberty of cleaning this PKGBUILD up.

• No useless custom variables
• Fixed dependencies (failed to build otherwise)
• Added conflicts
• Fixed sources https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git_submodules
• Less DIY and more proper cmake'y

diff --git a/PKGBUILD b/PKGBUILD
index 086f3a1..5af3757 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,52 @@
 # Maintainer: Sergey A. <murlakatamenka@disroot.org>

-_pkgname=replay-sorcery
-pkgname=$_pkgname-git
-pkgver=r80.b70061f
-pkgrel=3
+pkgname=replay-sorcery-git
+pkgver=0.2.6.r1.ge56857a
+pkgrel=1
 pkgdesc="Open-source, instant-replay solution for Linux"
 url="https://github.com/matanui159/ReplaySorcery"
 arch=("i686" "x86_64")
 license=(GPL3)
+depends=(gcc-libs libxext)
 makedepends=(git cmake nasm)
-provides=("$_pkgname")
-source=("$_pkgname::git+${url}.git"
-        "replay-sorcery.conf")
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("${pkgname%-git}::git+${url}.git"
+        "git+https://github.com/libjpeg-turbo/libjpeg-turbo.git"
+        "git+https://github.com/ianlancetaylor/libbacktrace.git"
+        "git+https://code.videolan.org/videolan/x264.git"
+        "git+https://github.com/lieff/minimp4.git"
+        "${pkgname%-git}.conf")
 sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             '47eda70a2347fcc0c020c27392e88bda93a1a6ab269ec8101bc68283105de2ba')

 pkgver() {
-    cd "$srcdir/$_pkgname"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd ${pkgname%-git}
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }

 prepare() {
-  cd "$srcdir/$_pkgname"
-  git submodule update --init --recursive --depth=1
+  cd ${pkgname%-git}
+  git submodule init
+  git config submodule."dep/libjpeg-turbo".url ../libjpeg-turbo
+  git config submodule."dep/libbacktrace".url ../libbacktrace
+  git config submodule."dep/x264".url ../x264
+  git config submodule."dep/minimp4".url ../minimp4
+  git submodule update
 }

 build() {
-  cd "$srcdir/$_pkgname"
-  cmake -B build \
+  cmake -B build -S ${pkgname%-git} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DRS_SYSTEMD_DIR=/usr/lib/systemd/user
-  make -C build
+  cmake --build build
 }

 package() {
-  cd  "$srcdir/$_pkgname/build"
-
-  install -Dm 755 $_pkgname "$pkgdir/usr/bin/$_pkgname"
-
-  install -Dm 644 $_pkgname.service -t "$pkgdir/usr/lib/systemd/user/"
-
-  install -Dm 644 "$srcdir/$_pkgname.conf" -t "$pkgdir/etc/xdg/"
+  DESTDIR="${pkgdir}" cmake --install build
 }