From 275057431b71262aa74da9cdd99daac312da96ad 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 --- .../cava/patches/pipewire-use-pkgconfig.patch | 67 +++++++++++++++++++ srcpkgs/cava/template | 17 +++-- 2 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/cava/patches/pipewire-use-pkgconfig.patch diff --git a/srcpkgs/cava/patches/pipewire-use-pkgconfig.patch b/srcpkgs/cava/patches/pipewire-use-pkgconfig.patch new file mode 100644 index 0000000000000..5368a26a2bcb3 --- /dev/null +++ b/srcpkgs/cava/patches/pipewire-use-pkgconfig.patch @@ -0,0 +1,67 @@ +From 4529de0cc9d5bd5afe3cf383bdee9a9b623c6136 Mon Sep 17 00:00:00 2001 +From: karl +Date: Fri, 11 Aug 2023 19:42:57 +0200 +Subject: [PATCH] use pkgconf to get pipewire c flags #519 + +--- + README.md | 9 +++++---- + configure.ac | 6 +++--- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/README.md b/README.md +index 51c6139..5da7cf6 100644 +--- a/README.md ++++ b/README.md +@@ -60,6 +60,7 @@ Required components: + * libtool + * automake + * autoconf-archive (needed for setting up OpenGL) ++* pkgconf + * build-essentials + * [iniparser](https://github.com/ndevilla/iniparser) + +@@ -86,22 +87,22 @@ All the requirements can be installed easily in all major distros: + + Debian/Ubuntu: + +- sudo apt install build-essential libfftw3-dev libasound2-dev libncursesw5-dev libpulse-dev libtool automake autoconf-archive libiniparser-dev libsdl2-2.0-0 libsdl2-dev libpipewire-0.3-dev ++ sudo apt install build-essential libfftw3-dev libasound2-dev libncursesw5-dev libpulse-dev libtool automake autoconf-archive libiniparser-dev libsdl2-2.0-0 libsdl2-dev libpipewire-0.3-dev pkgconf + + + ArchLinux: + +- pacman -S base-devel fftw ncurses alsa-lib iniparser pulseaudio autoconf-archive ++ pacman -S base-devel fftw ncurses alsa-lib iniparser pulseaudio autoconf-archive pkgconf + + + openSUSE: + +- zypper install alsa-devel ncurses-devel fftw3-devel libpulse-devel libtool autoconf-archive ++ zypper install alsa-devel ncurses-devel fftw3-devel libpulse-devel libtool autoconf-archive pkgconf + + + Fedora: + +- dnf install alsa-lib-devel ncurses-devel fftw3-devel pulseaudio-libs-devel libtool autoconf-archive iniparser-devel ++ dnf install alsa-lib-devel ncurses-devel fftw3-devel pulseaudio-libs-devel libtool autoconf-archive iniparser-devel pkgconf + + + macOS: +diff --git a/configure.ac b/configure.ac +index ca608b9..35b49c5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -105,10 +105,10 @@ 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" ++ LIBS="$LIBS $PIPEWIRE_LIBS" ++ CPPFLAGS="$CPPFLAGS -DPIPEWIRE $PIPEWIRE_CFLAGS" + 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 }