From 124bebb4bfa888d33202f3aebeb2c48445368db8 Mon Sep 17 00:00:00 2001 From: milisbir Date: Tue, 3 Apr 2018 10:13:29 +0300 Subject: [PATCH] clementine --- ...add-missing-functional-includes-5630.patch | 51 +++++++++++++++++++ .../clementine-1.3.1-chromaprint-1.4.0.patch | 41 +++++++++++++++ .../c/clementine/clementine-cryptopp6.patch | 25 +++++++++ talimatname/genel/c/clementine/talimat | 34 ++++++++----- 4 files changed, 137 insertions(+), 14 deletions(-) create mode 100644 talimatname/genel/c/clementine/add-missing-functional-includes-5630.patch create mode 100644 talimatname/genel/c/clementine/clementine-1.3.1-chromaprint-1.4.0.patch create mode 100644 talimatname/genel/c/clementine/clementine-cryptopp6.patch diff --git a/talimatname/genel/c/clementine/add-missing-functional-includes-5630.patch b/talimatname/genel/c/clementine/add-missing-functional-includes-5630.patch new file mode 100644 index 000000000..0355eefca --- /dev/null +++ b/talimatname/genel/c/clementine/add-missing-functional-includes-5630.patch @@ -0,0 +1,51 @@ +From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001 +From: Morris Hafner +Date: Mon, 13 Feb 2017 17:46:46 +0100 +Subject: [PATCH] Add missing includes (#5630) + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6fd..8c210d391 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb34..5f63ef248 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f36..e5f711b34 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; +-- +2.13.4 + diff --git a/talimatname/genel/c/clementine/clementine-1.3.1-chromaprint-1.4.0.patch b/talimatname/genel/c/clementine/clementine-1.3.1-chromaprint-1.4.0.patch new file mode 100644 index 000000000..099704026 --- /dev/null +++ b/talimatname/genel/c/clementine/clementine-1.3.1-chromaprint-1.4.0.patch @@ -0,0 +1,41 @@ +From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 +From: Chocobozzz +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(data.data()), ++ chromaprint_feed(chromaprint, reinterpret_cast(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); diff --git a/talimatname/genel/c/clementine/clementine-cryptopp6.patch b/talimatname/genel/c/clementine/clementine-cryptopp6.patch new file mode 100644 index 000000000..8197c38fe --- /dev/null +++ b/talimatname/genel/c/clementine/clementine-cryptopp6.patch @@ -0,0 +1,25 @@ +diff --git a/src/internet/spotify/spotifyblobdownloader.cpp b/src/internet/spotify/spotifyblobdownloader.cpp +index e34577f5d..045aeeb8a 100644 +--- a/src/internet/spotify/spotifyblobdownloader.cpp ++++ b/src/internet/spotify/spotifyblobdownloader.cpp +@@ -189,7 +189,7 @@ bool SpotifyBlobDownloader::CheckSignature( + + try { + CryptoPP::ByteQueue bytes; +- bytes.Put(reinterpret_cast(public_key_data.constData()), ++ bytes.Put(reinterpret_cast(public_key_data.constData()), + public_key_data.size()); + bytes.MessageEnd(); + +@@ -204,9 +204,9 @@ bool SpotifyBlobDownloader::CheckSignature( + actual_filename.remove(kSignatureSuffix); + + const bool result = verifier.VerifyMessage( +- reinterpret_cast(file_data[actual_filename].constData()), ++ reinterpret_cast(file_data[actual_filename].constData()), + file_data[actual_filename].size(), +- reinterpret_cast( ++ reinterpret_cast( + file_data[signature_filename].constData()), + file_data[signature_filename].size()); + qLog(Debug) << "Verifying" << actual_filename << "against" diff --git a/talimatname/genel/c/clementine/talimat b/talimatname/genel/c/clementine/talimat index a0e797c43..52faf7245 100644 --- a/talimatname/genel/c/clementine/talimat +++ b/talimatname/genel/c/clementine/talimat @@ -1,25 +1,31 @@ # Tanım: Bir müzik çalar ve kütüphane organizatörü. # URL: http://www.clementine-player.org/ # Paketçi: milisarge -# Gerekler: cmake boost qt4 qjson sparsehash xorg-mesa libcdio libmtp protobuf qca taglib chromaprint glew gstreamer gstreamer-plugins-base gstreamer-plugins-good gstreamer-plugins-ugly gstreamer-plugins-ffmpeg gstreamer-plugins-bad gvfs +# Gerekler: cmake boost qt4 qjson libspotify sparsehash xorg-mesa libcdio libmtp protobuf qca-qt5 taglib chromaprint glew gstreamer gstreamer-plugins-base gstreamer-plugins-good gstreamer-plugins-ugly gstreamer-plugins-ffmpeg gstreamer-plugins-bad gvfs # Grup: medya isim=clementine -surum=1.2.3 -devir=5 +surum=1.3.1 +devir=1 kaynak=(https://github.com/clementine-player/Clementine/archive/$surum.tar.gz clementine-1.2.3-gcc5.1-1.patch - clementine-1.2.3-udisks-namespace.patch) + clementine-1.2.3-udisks-namespace.patch + clementine-cryptopp6.patch + clementine-1.3.1-chromaprint-1.4.0.patch + add-missing-functional-includes-5630.patch) derle() { -cd Clementine-$surum -patch -Np1 -i $SRC/clementine-1.2.3-udisks-namespace.patch -patch -Np1 -i $SRC/clementine-1.2.3-gcc5.1-1.patch -mkdir build -cd build -cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE='Release' -make -make DESTDIR=$PKG install + cd Clementine-$surum + #patch -Np1 -i $SRC/clementine-1.2.3-udisks-namespace.patch + #patch -Np1 -i $SRC/clementine-1.2.3-gcc5.1-1.patch + patch -p1 -i ../add-missing-functional-includes-5630.patch + patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch + patch -p1 -i ../clementine-cryptopp6.patch + mkdir build + cd build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE='Release' + make + make DESTDIR=$PKG install }