From afaec64e4a8c456340946f056a989f7a0c9e318c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 3 Jul 2021 12:04:04 +0200 Subject: [PATCH] ripright: build with imagemagick7 --- srcpkgs/ripright/patches/imagemagick7.patch | 22 +++++++++++++++++++++ srcpkgs/ripright/template | 14 ++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/ripright/patches/imagemagick7.patch diff --git a/srcpkgs/ripright/patches/imagemagick7.patch b/srcpkgs/ripright/patches/imagemagick7.patch new file mode 100644 index 0000000000..756744d1a9 --- /dev/null +++ b/srcpkgs/ripright/patches/imagemagick7.patch @@ -0,0 +1,22 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,7 @@ PKG_PROG_PKG_CONFIG + + # Checks for libraries. + PKG_CHECK_MODULES([flac], [flac >= 1.1.4]) +-PKG_CHECK_MODULES([MagickWand], [Wand]) ++PKG_CHECK_MODULES([MagickWand], [MagickWand]) + PKG_CHECK_MODULES([libcurl], [libcurl]) + PKG_CHECK_MODULES([libdiscid], [libdiscid]) + AC_CHECK_LIB([cdda_paranoia], [paranoia_init]) +--- a/src/art.c ++++ b/src/art.c +@@ -24,7 +24,7 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +-#include ++#include + #include + #include + #include diff --git a/srcpkgs/ripright/template b/srcpkgs/ripright/template index d44f96166e..fcdec80435 100644 --- a/srcpkgs/ripright/template +++ b/srcpkgs/ripright/template @@ -1,13 +1,17 @@ # Template file for 'ripright' pkgname=ripright version=0.11 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libflac-devel libmagick6-devel libcurl-devel libdiscid-devel libcdparanoia-devel" +hostmakedepends="pkg-config autoconf automake" +makedepends="libflac-devel libmagick-devel libcurl-devel libdiscid-devel libcdparanoia-devel" short_desc="Minimal automatic CD ripper" maintainer="Jan Christian Gruenhage " license="GPL-2.0-only" -homepage="http://www.mcternan.me.uk/ripright/" -distfiles="http://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz" +homepage="https://www.mcternan.me.uk/ripright/" +distfiles="https://www.mcternan.me.uk/ripright/software/ripright-${version}.tar.gz" checksum=15869b7030b869c1e34baf7954b10a080afb07deeb315c3560af5ca7e57b76b7 + +pre_configure() { + autoreconf -fi +}