[vlc-commits] contrib: chromaprint: update to 1.0

[Konstantin Pavlov]

vlc/vlc-2.2 | branch: master | Konstantin Pavlov <thresh at nginx.com> | Mon Jun 30 15:04:30 2014 -0400| [85bd95eae36f48068dd899d9fb328b999e445736] | committer: Felix Paul Kühne

contrib: chromaprint: update to 1.0

Patch to build on OSX 10.9 with clang and to install pkg-config file.

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>>
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit 4546118c287be5013255ad87327f946712cf186b)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=85bd95eae36f48068dd899d9fb328b999e445736
---

 contrib/src/chromaprint/SHA512SUMS         |    2 +-
 contrib/src/chromaprint/mavericks.patch    |   24 ++++++++++++++++++++++++
 contrib/src/chromaprint/osxpkgconfig.patch |   12 ++++++++++++
 contrib/src/chromaprint/rules.mak          |    4 +++-
 4 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/contrib/src/chromaprint/SHA512SUMS b/contrib/src/chromaprint/SHA512SUMS
index 1899478..dd13648 100644
--- a/contrib/src/chromaprint/SHA512SUMS
+++ b/contrib/src/chromaprint/SHA512SUMS
@@ -1 +1 @@
-2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38  chromaprint-0.7.tar.gz
+a6820f5ca6fbbcc2417e4619c825efef27c187fef48098c05425d4e53900f931d71d5648d7e6f3d28816692f9fab068440dcecc46294a277afca26f4d0262623  chromaprint-1.0.tar.gz
diff --git a/contrib/src/chromaprint/mavericks.patch b/contrib/src/chromaprint/mavericks.patch
new file mode 100644
index 0000000..ba8ca87
--- /dev/null
+++ b/contrib/src/chromaprint/mavericks.patch
@@ -0,0 +1,24 @@
+From d0a8d8bc7c1ad5bda3294836f49184fe34a92454 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lukas at oxygene.sk>
+Date: Fri, 25 Oct 2013 14:08:46 +0200
+Subject: [PATCH] Iinclude <algorithm> in utils.h (fixes #7)
+
+---
+ src/utils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils.h b/src/utils.h
+index 47c6b98..76fb240 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -28,6 +28,7 @@
+ #include <math.h>
+ #include <stddef.h>
+ #include <stdint.h>
++#include <algorithm>
+ #include <limits>
+ #include <iterator>
+ 
+-- 
+1.8.4.2
+
diff --git a/contrib/src/chromaprint/osxpkgconfig.patch b/contrib/src/chromaprint/osxpkgconfig.patch
new file mode 100644
index 0000000..3e838cf
--- /dev/null
+++ b/contrib/src/chromaprint/osxpkgconfig.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt.orig	2014-06-30 14:47:35.000000000 -0400
++++ b/CMakeLists.txt	2014-06-30 14:47:38.000000000 -0400
+@@ -119,7 +119,7 @@
+ 	message(STATUS "Using FFTW3 for FFT calculations")
+ endif(WITH_FFTW3)
+ 
+-if(NOT APPLE AND NOT BUILD_FRAMEWORK)
++if(NOT BUILD_FRAMEWORK)
+ 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ endif()
+
diff --git a/contrib/src/chromaprint/rules.mak b/contrib/src/chromaprint/rules.mak
index 547a7bf..dcccd28 100644
--- a/contrib/src/chromaprint/rules.mak
+++ b/contrib/src/chromaprint/rules.mak
@@ -1,6 +1,6 @@
 # chromaprint
 
-CHROMAPRINT_VERSION := 0.7
+CHROMAPRINT_VERSION := 1.0
 CHROMAPRINT_URL := http://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-$(CHROMAPRINT_VERSION).tar.gz
 
 PKGS += chromaprint
@@ -16,6 +16,8 @@ $(TARBALLS)/chromaprint-$(CHROMAPRINT_VERSION).tar.gz:
 chromaprint: chromaprint-$(CHROMAPRINT_VERSION).tar.gz .sum-chromaprint
 	$(UNPACK)
 	$(APPLY) $(SRC)/chromaprint/avutil.patch
+	$(APPLY) $(SRC)/chromaprint/mavericks.patch
+	$(APPLY) $(SRC)/chromaprint/osxpkgconfig.patch
 	$(MOVE)
 
 DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg)