[vlc-commits] Contribs: Update Chromaprint

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr  8 11:24:39 2017 +0200| [3b76735de7195c4e32cec7171e23a204c9d64595] | committer: Jean-Baptiste Kempf

Contribs: Update Chromaprint

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b76735de7195c4e32cec7171e23a204c9d64595
---

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

diff --git a/contrib/src/chromaprint/SHA512SUMS b/contrib/src/chromaprint/SHA512SUMS
index dd13648..af9f8fa 100644
--- a/contrib/src/chromaprint/SHA512SUMS
+++ b/contrib/src/chromaprint/SHA512SUMS
@@ -1 +1 @@
-a6820f5ca6fbbcc2417e4619c825efef27c187fef48098c05425d4e53900f931d71d5648d7e6f3d28816692f9fab068440dcecc46294a277afca26f4d0262623  chromaprint-1.0.tar.gz
+69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2  chromaprint-1.4.2.tar.gz
diff --git a/contrib/src/chromaprint/mavericks.patch b/contrib/src/chromaprint/mavericks.patch
deleted file mode 100644
index ba8ca87..0000000
--- a/contrib/src/chromaprint/mavericks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 3e838cf..0000000
--- a/contrib/src/chromaprint/osxpkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 3140dbf..0473504 100644
--- a/contrib/src/chromaprint/rules.mak
+++ b/contrib/src/chromaprint/rules.mak
@@ -1,7 +1,7 @@
 # chromaprint
 
-CHROMAPRINT_VERSION := 1.0
-CHROMAPRINT_URL := http://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-$(CHROMAPRINT_VERSION).tar.gz
+CHROMAPRINT_VERSION := 1.4.2
+CHROMAPRINT_URL := $(GITHUB)/acoustid/chromaprint/releases/download/v$(CHROMAPRINT_VERSION)/chromaprint-$(CHROMAPRINT_VERSION).tar.gz
 
 PKGS += chromaprint
 ifeq ($(call need_pkg,"libchromaprint"),)
@@ -16,8 +16,6 @@ $(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)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 53b1e90..6f822d9 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -25,6 +25,7 @@ GNU ?= http://ftp.gnu.org/gnu
 SF := https://netcologne.dl.sourceforge.net/
 VIDEOLAN := http://downloads.videolan.org/pub/videolan
 CONTRIB_VIDEOLAN := http://downloads.videolan.org/pub/contrib
+GITHUB := https://github.com/
 
 #
 # Machine-dependent variables