Update cargo build steps

Add Cargo.lock file for --locked cargo build option.
Add pkgver().
Add post install message.
Change description.
Install logo.
Patch build error and warning.

4 files changed, 121 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 357378bf3a88..6135afbb9490 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
 pkgbase = ncmpvc-git
-	pkgdesc = A ncurses client for mpv which connects to existing mpv instances through sockets, written in Rust. WARNING: Early development stage, for bug-hunters only!
-	pkgver = 0.0.1
-	pkgrel = 5
+	pkgdesc = Ncurses IPC client for mpv written in Rust
+	pkgver = 0.0.1.r6.5346112
+	pkgrel = 1
 	url = https://gitlab.com/mpv-ipc/ncmpvc
+	install = ncmpvc-git.install
 	arch = x86_64
 	license = MIT
 	makedepends = cargo
 	depends = mpv
 	depends = ncurses
+	provides = ncmpvc
+	conflicts = ncmpvc
 	source = ncmpvc-git::git+https://gitlab.com/mpv-ipc/ncmpvc.git
-	sha512sums = SKIP
+	source = Cargo.lock
+	sha256sums = SKIP
+	sha256sums = 70fd6e887c4c311a85ae9a4d2c5f55ed85701dde1b14ba5309507752463cca65
 
 pkgname = ncmpvc-git
-
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 000000000000..bfccb3c01b0f
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,79 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "cc"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+
+[[package]]
+name = "itoa"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+
+[[package]]
+name = "libc"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
+
+[[package]]
+name = "mpvipc"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22240aebfee19eefb443877e176c94fa6a146032c7c0a38b74293c4095ff2272"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ncmpvc"
+version = "0.0.1"
+dependencies = [
+ "mpvipc",
+ "ncurses",
+]
+
+[[package]]
+name = "ncurses"
+version = "5.101.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5d34d72657dc4b638a1c25d40aae81e4f1c699062f72f467237920752032"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "serde"
+version = "1.0.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+
+[[package]]
+name = "serde_json"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
diff --git a/PKGBUILD b/PKGBUILD
index d1017b5d0c47..b190d74b68d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,42 @@
-# Maintainer: Jonas Frei <freijon@gmail.com>
+# Maintainer: willemw <willemw12@gmail.com>
+# Contributor: Jonas Frei <freijon@gmail.com>
 
 pkgname=ncmpvc-git
-pkgver=0.0.1
-pkgrel=5
-pkgdesc="A ncurses client for mpv which connects to existing mpv instances through sockets, written in Rust. WARNING: Early development stage, for bug-hunters only!"
+pkgver=0.0.1.r6.5346112
+pkgrel=1
+pkgdesc="Ncurses IPC client for mpv written in Rust"
 arch=('x86_64')
 url="https://gitlab.com/mpv-ipc/ncmpvc"
 license=('MIT')
 depends=('mpv' 'ncurses')
 makedepends=('cargo')
-source=("${pkgname}::git+https://gitlab.com/mpv-ipc/ncmpvc.git")
-sha512sums=('SKIP')
+provides=("${pkgname%-git}")                                                                                                                                                                                         
+conflicts=("${pkgname%-git}")
+install=$pkgname.install
+source=("$pkgname::git+$url.git" Cargo.lock)
+sha256sums=('SKIP'
+            '70fd6e887c4c311a85ae9a4d2c5f55ed85701dde1b14ba5309507752463cca65')
+
+pkgver() {
+  printf "%s.r%s.%s" "$(sed -n 's/^version = "\(.*\)"/\1/p' $pkgname/Cargo.toml)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  sed -i 's/fn error(&self, &str);/fn error(\&self, msg: \&str);/' $pkgname/src/main.rs
+  sed -i 's/macro_rules! println_stderr(/#[allow(unused_macros)]\n&/' $pkgname/src/macros.rs
+  cp -a Cargo.lock $pkgname
+}
 
 build() {
-	cd "$srcdir/$pkgname"
-	cargo build --release
+  RUSTUP_TOOLCHAIN=stable cargo build --release --locked --all-features --manifest-path=$pkgname/Cargo.toml --target-dir=target
+}
+
+check() {
+  RUSTUP_TOOLCHAIN=stable cargo test --release --locked --manifest-path=$pkgname/Cargo.toml --target-dir=target
 }
 
 package() {
-	install -Dv $srcdir/$pkgname/target/release/ncmpvc $pkgdir/usr/bin/ncmpvc
+  install -Dm755 "target/release/${pkgname%-git}" -t "$pkgdir/usr/bin"
+  install -Dm644 $pkgname/res/logo.png "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
 }
+
diff --git a/ncmpvc-git.install b/ncmpvc-git.install
new file mode 100644
index 000000000000..d043244b8d43
--- /dev/null
+++ b/ncmpvc-git.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "==> Before running ncmpvc, run: mpv --input-ipc-server=/tmp/mpvsocket --idle"
+}
+