Update to version 1.5.0

3 files changed, 73 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09088203abeb..0a509ee8f255 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = lib32-chromaprint
 	pkgdesc = Library that implements a custom algorithm for extracting fingerprints from any audio source (32-bit)
-	pkgver = 1.4.3
-	pkgrel = 3
+	pkgver = 1.5.0
+	pkgrel = 1
 	url = https://acoustid.org/chromaprint
 	arch = x86_64
 	license = LGPL
 	makedepends = cmake
 	depends = lib32-ffmpeg
 	depends = chromaprint
-	source = https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz
-	sha256sums = ea18608b76fb88e0203b7d3e1833fb125ce9bb61efe22c6e169a50c52c457f82
+	source = https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz
+	source = fix_build_32bit.patch
+	sha256sums = 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a
+	sha256sums = ae0e2805c4fa19ab5e51c4ec8e414c548eb0d66511ee45d41ca8c99a1ca32db5
 
 pkgname = lib32-chromaprint
 
diff --git a/PKGBUILD b/PKGBUILD
index c6190867dddc..ce95a502a159 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,25 @@
 
 _basename=chromaprint
 pkgname="lib32-$_basename"
-pkgver=1.4.3
-pkgrel=3
+pkgver=1.5.0
+pkgrel=1
 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source (32-bit)'
 url='https://acoustid.org/chromaprint'
 arch=('x86_64')
 license=('LGPL')
 depends=('lib32-ffmpeg' 'chromaprint')
 makedepends=('cmake')
-source=("https://github.com/acoustid/chromaprint/releases/download/v${pkgver}/chromaprint-${pkgver}.tar.gz")
-sha256sums=('ea18608b76fb88e0203b7d3e1833fb125ce9bb61efe22c6e169a50c52c457f82')
+source=("https://github.com/acoustid/chromaprint/releases/download/v${pkgver}/chromaprint-${pkgver}.tar.gz"
+        "fix_build_32bit.patch")
+sha256sums=('573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a'
+            'ae0e2805c4fa19ab5e51c4ec8e414c548eb0d66511ee45d41ca8c99a1ca32db5')
 
 prepare() {
     mkdir build
+
+    cd ${_basename}-v${pkgver}
+
+    patch -Np1 -i ../fix_build_32bit.patch
 }
 
 build() {
diff --git a/fix_build_32bit.patch b/fix_build_32bit.patch
new file mode 100644
index 000000000000..ab1c7dfd08be
--- /dev/null
+++ b/fix_build_32bit.patch
@@ -0,0 +1,57 @@
+diff '--color=auto' --unified --recursive --text chromaprint-v1.5.0.orig/CMakeLists.txt chromaprint-v1.5.0.new/CMakeLists.txt
+--- chromaprint-v1.5.0.orig/CMakeLists.txt	2020-04-15 01:08:10.000000000 -0300
++++ chromaprint-v1.5.0.new/CMakeLists.txt	2020-06-10 01:42:01.000000000 -0300
+@@ -1,11 +1,21 @@
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 2.8.12)
++
++if(POLICY CMP0042)
++	cmake_policy(SET CMP0042 NEW)
++endif()
++
++if(POLICY CMP0048)
++    cmake_policy(SET CMP0048 OLD)
++endif()
++
++project(chromaprint C CXX)
+ 
+ set(chromaprint_VERSION_MAJOR 1)
+ set(chromaprint_VERSION_MINOR 5)
+ set(chromaprint_VERSION_PATCH 0)
+ set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}")
+ 
+-project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}")
++set(PROJECT_VERSION "${chromaprint_VERSION}")
+ 
+ set(chromaprint_SOVERSION 1)
+ 
+@@ -21,14 +31,14 @@
+ 
+ find_package(Threads)
+ 
+-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+-
+-set(CMAKE_CXX_STANDARD 11)
++check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
++if(COMPILER_SUPPORTS_CXX11)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++endif()
+ 
+-if(BUILD_SHARED_LIBS)
+-	set(CMAKE_C_VISIBILITY_PRESET hidden)
+-	set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+-	set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
++if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+@@ -60,6 +70,7 @@
+ 	set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to")
+ endif()
+ 
++option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+ option(BUILD_TOOLS "Build command line tools" OFF)
+ option(BUILD_TESTS "Build test suite" OFF)
+