[arch-commits] Commit in clementine/trunk (3 files)

[Evangelos Foutras]

    Date: Thursday, August 3, 2017 @ 18:18:33
  Author: foutrelis
Revision: 247901

Mirror patches since checksums already failed once

Added:
  clementine/trunk/clementine-1.3.1-chromaprint-1.4.0.patch
  clementine/trunk/clementine-gcc6.patch
Modified:
  clementine/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   10 +++----
 clementine-1.3.1-chromaprint-1.4.0.patch |   41 +++++++++++++++++++++++++++++
 clementine-gcc6.patch                    |   22 +++++++++++++++
 3 files changed, 68 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-03 18:14:11 UTC (rev 247900)
+++ PKGBUILD	2017-08-03 18:18:33 UTC (rev 247901)
@@ -23,16 +23,16 @@
             'gst-libav: Libav plugin'
             'gvfs: Various devices support')
 source=("clementine-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
-        clementine-gcc6.patch::"https://github.com/clementine-player/Clementine/commit/e31278.patch"
-        clementine-1.3.1-chromaprint-1.4.0.patch::"https://github.com/clementine-player/Clementine/commit/ded3126.patch")
+        clementine-gcc6.patch
+        clementine-1.3.1-chromaprint-1.4.0.patch)
 sha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c'
-            '785c485d0a2398a31728a012f6869573f6714359c0d65fbc06f7532c86b82643'
-            'cf5c1c625885cc4436722ac38dc201cdc491478dc73e171ea2af95bfb59fd0c6')
+            '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee'
+            '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0')
 
 prepare() {
   cd Clementine-${pkgver}
 
-# Fix build with GCC 6
+  # Fix build with GCC 6
   patch -p1 -i ../clementine-gcc6.patch
   # Fix build with chromaprint 1.4.0
   patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch

Added: clementine-1.3.1-chromaprint-1.4.0.patch
===================================================================
--- clementine-1.3.1-chromaprint-1.4.0.patch	                        (rev 0)
+++ clementine-1.3.1-chromaprint-1.4.0.patch	2017-08-03 18:18:33 UTC (rev 247901)
@@ -0,0 +1,41 @@
+From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.bigard at gmail.com>
+Date: Thu, 8 Dec 2016 23:12:17 +0100
+Subject: [PATCH] Add compatibility with chromaprint >= 1.4
+
+---
+ src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
+index 9579b62ae..c7ad99e2e 100644
+--- a/src/musicbrainz/chromaprinter.cpp
++++ b/src/musicbrainz/chromaprinter.cpp
+@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
+   ChromaprintContext* chromaprint =
+       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
+   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
+-  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
++  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
+                    data.size() / 2);
+   chromaprint_finish(chromaprint);
+ 
+-  void* fprint = nullptr;
+   int size = 0;
++
++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
++  u_int32_t *fprint = nullptr;
++  char *encoded = nullptr;
++#else
++  void *fprint = nullptr;
++  void *encoded = nullptr;
++#endif
++
+   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
++
+   QByteArray fingerprint;
+   if (ret == 1) {
+-    void* encoded = nullptr;
+     int encoded_size = 0;
+     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
+                                    &encoded, &encoded_size, 1);

Added: clementine-gcc6.patch
===================================================================
--- clementine-gcc6.patch	                        (rev 0)
+++ clementine-gcc6.patch	2017-08-03 18:18:33 UTC (rev 247901)
@@ -0,0 +1,22 @@
+From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001
+From: Bigard Florian <florian.bigard at gmail.com>
+Date: Mon, 9 May 2016 11:55:34 +0200
+Subject: [PATCH] Fix projectm compilation with GCC 6 (#5371)
+
+---
+ 3rdparty/libprojectm/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
+index e6287f176..0ef785c49 100644
+--- a/3rdparty/libprojectm/CMakeLists.txt
++++ b/3rdparty/libprojectm/CMakeLists.txt
+@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON)
+ set(DISABLE_NATIVE_PRESETS ON)
+ set(DISABLE_MILKDROP_PRESETS OFF)
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
++
+ if(DISABLE_NATIVE_PRESETS)
+   ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)
+ endif(DISABLE_NATIVE_PRESETS)