From d461ff94106cf37822313d53f68eac428486fe36 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 26 May 2024 23:42:47 +0200 Subject: [PATCH] cava: rebuild for iniparser --- .../cava/patches/iniparser-pkgconfig.patch | 24 +++++++++++++++++++ srcpkgs/cava/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cava/patches/iniparser-pkgconfig.patch diff --git a/srcpkgs/cava/patches/iniparser-pkgconfig.patch b/srcpkgs/cava/patches/iniparser-pkgconfig.patch new file mode 100644 index 00000000000..4b88fb701af --- /dev/null +++ b/srcpkgs/cava/patches/iniparser-pkgconfig.patch @@ -0,0 +1,24 @@ +diff --git a/configure.ac b/configure.ac +index 5aeda60..6913062 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,16 +423,10 @@ dnl checking for iniparser + dnl ###################### + + AC_CHECK_LIB(iniparser,iniparser_load, have_iniparser=yes, have_iniparser=no) ++ PKG_CHECK_MODULES(INIPARSER, iniparser, have_iniparser=yes, have_iniparser=no) + if [[ $have_iniparser = "yes" ]] ; then +- LIBS="$LIBS -liniparser" +- CPPFLAGS="$CPPFLAGS -I/usr/include/iniparser" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[dictionary* ini; +- const char *keys[3]; +- iniparser_getseckeys(ini, "eq", keys);]])], +- [AC_MSG_RESULT(iniparser > 3.2 test OK)], +- [AC_MSG_RESULT(iniparser > 3.2 test failed falling back to legacy iniparser mode) +- CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER"]) ++ LIBS="$LIBS $INIPARSER_LIBS" ++ CPPFLAGS="$CPPFLAGS $INIPARSER_CFLAGS" + fi + if [[ $have_iniparser = "no" ]] ; then + AC_MSG_ERROR([iniparser library is required!]) diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template index 102607733ab..6c9a016da12 100644 --- a/srcpkgs/cava/template +++ b/srcpkgs/cava/template @@ -1,7 +1,7 @@ # Template file for 'cava' pkgname=cava version=0.10.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf-archive automake libtool pkg-config" makedepends="fftw-devel iniparser-devel ncurses-devel SDL2-devel