diff --git a/media-libs/chromaprint/chromaprint-1.5.1.recipe b/media-libs/chromaprint/chromaprint-1.6.0.recipe similarity index 83% rename from media-libs/chromaprint/chromaprint-1.5.1.recipe rename to media-libs/chromaprint/chromaprint-1.6.0.recipe index e50cf1918..3d667ee45 100644 --- a/media-libs/chromaprint/chromaprint-1.5.1.recipe +++ b/media-libs/chromaprint/chromaprint-1.6.0.recipe @@ -2,13 +2,12 @@ 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/chromaprint" -COPYRIGHT="2010-2012, 2015 Lukas Lalinsky" +COPYRIGHT="2010-2016 Lukas Lalinsky" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/acoustid/chromaprint/releases/download/v$portVersion/chromaprint-$portVersion.tar.gz" -CHECKSUM_SHA256="a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c" +CHECKSUM_SHA256="9d33482e56a1389a37a0d6742c376139fa43e3b8a63d29003222b93db2cb40da" SOURCE_DIR="chromaprint-$portVersion" -PATCHES="chromaprint-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -38,10 +37,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - ffmpeg${secondaryArchSuffix}_devel -# devel:libavcodec$secondaryArchSuffix -# devel:libavformat$secondaryArchSuffix -# devel:libavutil$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix >= 60 + devel:libavformat$secondaryArchSuffix + devel:libavutil$secondaryArchSuffix >= 58 " BUILD_PREREQUIRES=" cmd:cmake diff --git a/media-libs/chromaprint/patches/chromaprint-1.5.1.patchset b/media-libs/chromaprint/patches/chromaprint-1.5.1.patchset deleted file mode 100644 index 0d9ee645e..000000000 --- a/media-libs/chromaprint/patches/chromaprint-1.5.1.patchset +++ /dev/null @@ -1,40 +0,0 @@ -From f526e3bcd90c9cc2c824f1097aa3f7d30893e10d Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sun, 17 Jun 2018 14:51:06 +0200 -Subject: fix pkg-config paths - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3991219..1271a68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,8 +62,8 @@ add_definitions( - set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") - set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) - set(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) --set(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) --set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) -+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) -+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation prefix for C header files" FORCE) - - if(APPLE) - option(BUILD_FRAMEWORK "Build an OS X framework" OFF) -diff --git a/libchromaprint.pc.cmake b/libchromaprint.pc.cmake -index 3799329..4e23d91 100644 ---- a/libchromaprint.pc.cmake -+++ b/libchromaprint.pc.cmake -@@ -1,7 +1,7 @@ --prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${EXEC_INSTALL_PREFIX} --libdir=${LIB_INSTALL_DIR} --includedir=${INCLUDE_INSTALL_DIR} -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: ${PROJECT_NAME} - Description: Audio fingerprint library --- -2.16.4 -