diff --git a/media-libs/chromaprint/chromaprint-1.4.2.recipe b/media-libs/chromaprint/chromaprint-1.4.2.recipe deleted file mode 100644 index f0b1d8544..000000000 --- a/media-libs/chromaprint/chromaprint-1.4.2.recipe +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY="Audio fingerprint library" -DESCRIPTION="chromaprint is a client-side library that implements a custom \ -algorithm for extracting fingerprints from any audio source." -HOMEPAGE="https://acoustid.org/" -COPYRIGHT="2010-2012, 2015 Lukas Lalinsky" -LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-$portVersion.tar.gz" -CHECKSUM_SHA256="989609a7e841dd75b34ee793bd1d049ce99a8f0d444b3cea39d57c3e5d26b4d4" -PATCHES="chromaprint-$portVersion.patchset" - -ARCHITECTURES="?x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" - -PROVIDES=" - chromaprint$secondaryArchSuffix = $portVersion compat >= 1 - lib:libchromaprint$secondaryArchSuffix = $portVersion compat >= 1 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libfftw3$secondaryArchSuffix - " - -PROVIDES_devel=" - chromaprint${secondaryArchSuffix}_devel = $portVersion compat >= 1 - devel:libchromaprint$secondaryArchSuffix = $portVersion compat >= 1 - " -REQUIRES_devel=" - chromaprint$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libfftw3$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release . - make $jobArgs -} - -INSTALL() -{ - make install - - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rmdir $prefix/include - - prepareInstalledDevelLibs libchromaprint - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} diff --git a/media-libs/chromaprint/chromaprint-1.4.3.recipe b/media-libs/chromaprint/chromaprint-1.5.0.recipe similarity index 95% rename from media-libs/chromaprint/chromaprint-1.4.3.recipe rename to media-libs/chromaprint/chromaprint-1.5.0.recipe index 6cd5df9da..900b39f77 100644 --- a/media-libs/chromaprint/chromaprint-1.4.3.recipe +++ b/media-libs/chromaprint/chromaprint-1.5.0.recipe @@ -4,9 +4,9 @@ algorithm for extracting fingerprints from any audio source." HOMEPAGE="https://acoustid.org/chromaprint" COPYRIGHT="2010-2012, 2015 Lukas Lalinsky" LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/acoustid/chromaprint/releases/download/v$portVersion/chromaprint-$portVersion.tar.gz" -CHECKSUM_SHA256="ea18608b76fb88e0203b7d3e1833fb125ce9bb61efe22c6e169a50c52c457f82" +CHECKSUM_SHA256="573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a" SOURCE_DIR="chromaprint-v$portVersion" PATCHES="chromaprint-$portVersion.patchset" diff --git a/media-libs/chromaprint/patches/chromaprint-1.4.2.patchset b/media-libs/chromaprint/patches/chromaprint-1.4.2.patchset deleted file mode 100644 index 05dbd2b5f..000000000 --- a/media-libs/chromaprint/patches/chromaprint-1.4.2.patchset +++ /dev/null @@ -1,24 +0,0 @@ -From ffc9161c9731fe8b9b0696cf0caa724a198aa57d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 13 Apr 2016 23:38:21 +0000 -Subject: Haiku patch - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f097cd..bff6414 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,9 @@ if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS) - endif() - - cmake_push_check_state(RESET) --set(CMAKE_REQUIRED_LIBRARIES -lm) -+if(NOT HAIKU) -+ set(CMAKE_REQUIRED_LIBRARIES -lm) -+endif() - check_function_exists(lrintf HAVE_LRINTF) - check_function_exists(round HAVE_ROUND) - cmake_pop_check_state() --- -2.10.2 - diff --git a/media-libs/chromaprint/patches/chromaprint-1.4.3.patchset b/media-libs/chromaprint/patches/chromaprint-1.5.0.patchset similarity index 100% rename from media-libs/chromaprint/patches/chromaprint-1.4.3.patchset rename to media-libs/chromaprint/patches/chromaprint-1.5.0.patchset