From 9ea7f96140166f15b94944a7c2495351dd9eba86 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sun, 20 Jan 2019 19:20:21 -0200
Subject: [PATCH] cli-visualizer: update to 1.8.

---
 ...01-Checking-for-ltinfo-is-deprecated.patch | 24 -------------------
 ...oper-install-and-dont-clash-with-vis.patch | 11 ---------
 srcpkgs/cli-visualizer/template               | 21 +++++++---------
 3 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 srcpkgs/cli-visualizer/patches/0001-Checking-for-ltinfo-is-deprecated.patch
 delete mode 100644 srcpkgs/cli-visualizer/patches/0002-use-proper-install-and-dont-clash-with-vis.patch

diff --git a/srcpkgs/cli-visualizer/patches/0001-Checking-for-ltinfo-is-deprecated.patch b/srcpkgs/cli-visualizer/patches/0001-Checking-for-ltinfo-is-deprecated.patch
deleted file mode 100644
index 64fccd157ec..00000000000
--- a/srcpkgs/cli-visualizer/patches/0001-Checking-for-ltinfo-is-deprecated.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 02fe362807c3b8743ec6696476bfe51ab590ff39 Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Thu, 6 Sep 2018 21:47:43 -0700
-Subject: [PATCH] Checking for -ltinfo is deprecated
-
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git Makefile Makefile
-index 8626dd2..5653c67 100644
---- Makefile
-+++ Makefile
-@@ -55,7 +55,6 @@ CXX_FLAGS += -dynamic -D_OS_OSX
- # Linux
- else
- CXX_FLAGS += -D_LINUX
--LIBS += -ltinfo
- ifndef ENABLE_PULSE
- CHECK_PULSE=$(shell ldconfig -p | grep libpulse-simple)
- ifeq ($(strip $(CHECK_PULSE)),)
--- 
-2.18.0
-
diff --git a/srcpkgs/cli-visualizer/patches/0002-use-proper-install-and-dont-clash-with-vis.patch b/srcpkgs/cli-visualizer/patches/0002-use-proper-install-and-dont-clash-with-vis.patch
deleted file mode 100644
index ae97a39e6c4..00000000000
--- a/srcpkgs/cli-visualizer/patches/0002-use-proper-install-and-dont-clash-with-vis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -234,7 +234,7 @@ uninstall:
- 	@rm -f $(PREFIX)/safe_fifo
- 
- install:
--	cp $(BUILD_DIR)/$(TARGET) $(PREFIX)
-+	install $(BUILD_DIR)/$(TARGET) -Dm0755 $(PREFIX)/cli-visualizer
- #	cp bin/safe_fifo $(PREFIX)
- 
- ###############################################################################
diff --git a/srcpkgs/cli-visualizer/template b/srcpkgs/cli-visualizer/template
index 2cc72fc2fe4..a3fb7ad20ac 100644
--- a/srcpkgs/cli-visualizer/template
+++ b/srcpkgs/cli-visualizer/template
@@ -1,31 +1,28 @@
 # Template file for 'cli-visualizer'
 pkgname=cli-visualizer
-version=1.7
+version=1.8
 revision=1
-build_style=gnu-configure
-make_install_args="PREFIX=${DESTDIR}/usr/bin/"
+build_style=cmake
 makedepends="fftw-devel ncurses-devel $(vopt_if pulseaudio 'pulseaudio-devel')"
 short_desc="CLI based audio visualizer"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="MIT"
 homepage="https://github.com/dpayne/cli-visualizer"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=0445fbfad9707668a70ff146f3f24308f28fa0ae67a7010bfdea0dacba75b75b
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=927e4c18403c7a40397e8698ffefd1b37250be20fa0ec55fda9a82cf9cc8ba51
 build_options="pulseaudio"
 
 # Some targets don't have libpulse-simple, can't compile with pulseaudio support
 case "$XBPS_TARGET_MACHINE" in
-	armv*) make_build_args+=" VIS_COMPILER_ARCH=armv6";;
-	aarch64*) make_build_args+=" VIS_COMPILER_ARCH=armv8-a";;
+	armv*) configure_args+=" -DVIS_COMPILER_ARCH=armv6";;
+	aarch64*) configure_args+=" -DVIS_COMPILER_ARCH=armv8-a";;
 	x86_64-musl) ;;
 	*) build_options_default+=" pulseaudio";;
 esac
 
 post_install() {
-	# Files listed in install.sh
-	for f in examples/*; do
-		vsconf ${f}
-	done
-
 	vlicense LICENSE
+
+	# package 'vis' has rights to /usr/bin/vis
+	mv ${DESTDIR}/usr/bin/vis ${DESTDIR}/usr/bin/cli-visualizer
 }