From bae36f30bd7d961681afcd7d3c3c3076709e8208 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 11 Aug 2023 10:10:27 +0200 Subject: [PATCH] cava: update to 0.9.0 --- srcpkgs/cava/patches/fix-pipewire-cross.patch | 30 +++++++++++++++++++ srcpkgs/cava/template | 17 +++++------ 2 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/cava/patches/fix-pipewire-cross.patch diff --git a/srcpkgs/cava/patches/fix-pipewire-cross.patch b/srcpkgs/cava/patches/fix-pipewire-cross.patch new file mode 100644 index 0000000000000..c5b6ac157e5b5 --- /dev/null +++ b/srcpkgs/cava/patches/fix-pipewire-cross.patch @@ -0,0 +1,30 @@ +diff --git a/Makefile.am b/Makefile.am +index a6a2740..d3755db 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -29,6 +29,8 @@ endif + + if PIPEWIRE + cava_SOURCES += input/pipewire.c ++ cava_CFLAGS += ${PIPEWIRE_CFLAGS} ++ cava_LDADD += ${PIPEWIRE_LIBS} + endif + + if PULSE +diff --git a/configure.ac b/configure.ac +index ca608b9..751e3b8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -105,10 +105,9 @@ AC_ARG_ENABLE([input_pipewire], + ) + + AS_IF([test "x$enable_input_pipewire" != "xno"], [ +- AC_CHECK_LIB(pipewire-0.3, pw_stream_connect, have_pipewire=yes, have_pipewire=no) ++ PKG_CHECK_MODULES([PIPEWIRE], [libpipewire-0.3], [have_pipewire=yes], [have_pipewire=no]) + if [[ $have_pipewire = "yes" ]] ; then +- LIBS="$LIBS -lpipewire-0.3" +- CPPFLAGS="$CPPFLAGS -DPIPEWIRE -D_REENTRANT -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2" ++ CPPFLAGS="$CPPFLAGS -DPIPEWIRE -D_REENTRANT" + fi + + if [[ $have_pipewire = "no" ]] ; then diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template index d4a6106a88caf..6790591dbae61 100644 --- a/srcpkgs/cava/template +++ b/srcpkgs/cava/template @@ -1,20 +1,20 @@ # Template file for 'cava' pkgname=cava -version=0.8.3 +version=0.9.0 revision=1 build_style=gnu-configure -hostmakedepends="automake libtool" +hostmakedepends="automake libtool pkg-config" makedepends="fftw-devel iniparser-devel ncurses-devel - $(vopt_if alsa 'alsa-lib-devel') $(vopt_if pulseaudio 'pulseaudio-devel') - $(vopt_if sndio 'sndio-devel')" + $(vopt_if alsa 'alsa-lib-devel') $(vopt_if pipewire 'pipewire-devel') + $(vopt_if pulseaudio 'pulseaudio-devel') $(vopt_if sndio 'sndio-devel')" short_desc="Console-based Audio Visualizer for ALSA" maintainer="skmpz " license="MIT" homepage="https://github.com/karlstav/cava" distfiles="https://github.com/karlstav/cava/archive/refs/tags/${version}.tar.gz" -checksum=ce7378ababada5a20fa8250c6b3fe6412bc1a7dd31301a52b8b4a71d362875b9 -build_options="alsa pulseaudio sndio" -build_options_default="alsa pulseaudio sndio" +checksum=3e79367169791fb11236dce6da7b38f46cdd859304710391785c4df7f364fd23 +build_options="alsa pipewire pulseaudio sndio" +build_options_default="alsa pipewire pulseaudio sndio" pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -22,6 +22,5 @@ pre_configure() { post_install() { vlicense LICENSE - vmkdir usr/share/examples - vcopy example_files usr/share/examples/cava + vsconf example_files/config }