Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2017-08-10 14:04:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clementine" Thu Aug 10 14:04:07 2017 rev:42 rq:512532 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2017-04-11 09:40:57.928659918 +0200 +++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2017-08-10 14:12:02.788932296 +0200 @@ -1,0 +2,12 @@ +Tue Jul 25 12:44:14 UTC 2017 - [email protected] + +- Do not recommend fluendo as mp3 is enabled out of the box now in gst +- Remove if0 conditional that is never triggered + +------------------------------------------------------------------- +Tue Jul 25 11:03:59 UTC 2017 - [email protected] + +- Added clementine-1.3.1-support-chromaprint-1.4.patch to fix + build + +------------------------------------------------------------------- New: ---- clementine-1.3.1-support-chromaprint-1.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.QQJrsz/_old 2017-08-10 14:12:03.700803906 +0200 +++ /var/tmp/diff_new_pack.QQJrsz/_new 2017-08-10 14:12:03.716801654 +0200 @@ -34,6 +34,8 @@ Patch3: clementine-moodbar-fpic.patch # PATCH-FIX-UPSTREAM clementine-gcc7fix.patch [email protected] -- add <funtional> to includes. Patch4: clementine-gcc7fix.patch +# PATCH-FIX-UPSTREAM clementine-1.3.1-support-chromaprint-1.4.patch -- backported commit #ded3126 +Patch5: clementine-1.3.1-support-chromaprint-1.4.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -79,7 +81,6 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 Requires: libtag1 >= 1.8 -Recommends: gstreamer-fluendo-mp3 Recommends: sni-qt # clementine-kde was last used in openSUSE 12.2. # plasma_runner was dropped in Clementine 1.1.0. @@ -106,18 +107,13 @@ %patch2 -p1 %patch3 %patch4 +%patch5 -p1 # NOTE: Build using system versions of libraries. rm -rvf 3rdparty/taglib #rm -rvf 3rdparty/libmygpo-qt #rm -rvf 3rdparty/sha2 %build -%if 1 == 0 -%define gcc_version 7 -export CC=gcc-7 -export CPP=cpp-7 -export CXX=g++-7 -%endif export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" %cmake \ @@ -129,7 +125,7 @@ -DENABLE_MOODBAR=ON \ -DENABLE_DBUS=ON make %{?_smp_mflags} -#-fPIC + %install %cmake_install ++++++ clementine-1.3.1-support-chromaprint-1.4.patch ++++++ >From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 From: Chocobozzz <[email protected]> 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);
