Update cpu-x to version 4.0.0

2 files changed, 12 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 190778c39eb2..b49b2bb9cf03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = cpu-x-git
 	pkgdesc = A Free software that gathers information on CPU, motherboard and more
-	pkgver = 3.2.4.r250.g9844a05
+	pkgver = 4.0.0.r2.gbfb09b7
 	pkgrel = 1
 	url = http://X0rg.github.io/CPU-X/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = ninja
 	makedepends = nasm
 	depends = gtk3
 	depends = ncurses
@@ -18,7 +19,7 @@ pkgbase = cpu-x-git
 	options = !strip
 	options = debug
 	source = git+https://github.com/X0rg/CPU-X.git
-	md5sums = SKIP
+	sha512sums = SKIP
 
 pkgname = cpu-x-git
 
diff --git a/PKGBUILD b/PKGBUILD
index df2d9a269252..b08649b089c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 
 _realname=CPU-X
 pkgname=cpu-x-git
-pkgver=3.2.4.r250.g9844a05
+pkgver=4.0.0.r2.gbfb09b7
 pkgrel=1
 pkgdesc="A Free software that gathers information on CPU, motherboard and more"
 arch=('i686' 'x86_64')
 url="http://X0rg.github.io/CPU-X/"
 license=('GPL3')
 depends=('gtk3' 'ncurses' 'libcpuid' 'pciutils' 'procps-ng')
-makedepends=('cmake' 'nasm')
+makedepends=('cmake' 'ninja' 'nasm')
 provides=('cpu-x')
 conflicts=('cpu-x')
 source=("git+https://github.com/X0rg/CPU-X.git")
-md5sums=('SKIP')
+sha512sums=('SKIP')
 options=('!strip' 'debug')
 
 pkgver() {
@@ -21,22 +21,16 @@ pkgver() {
 	git describe --long --tags --exclude continuous | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	msg2 "Make 'build' directory..."
-	mkdir -pv "$srcdir/$_realname/build"
-}
-
 build() {
-	cd "$_realname/build"
-	msg2 "Run 'cmake'..."
-	cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBCURL=0 -DWITH_LIBJSONC=0 ..
+	msg2 "Generate build system..."
+	cmake -S "$_realname" -B build -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
 
-	msg2 "Run 'make'..."
-	make
+	msg2 "Build..."
+	cmake --build build
 }
 
 package() {
-	cd "$_realname/build"
 	msg2 "Install..."
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja -C build install
+
 }