From b2137d95a95a40f7d578839ca129d0f587e0fb3b Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 11 Apr 2020 10:45:40 -0500 Subject: clementine-1.4.0rc1-1.parabola1: updating version --- libre/clementine/PKGBUILD | 82 ++++------------------ libre/clementine/clementine-chromaprint1.4.0.patch | 41 ----------- libre/clementine/clementine-cryptopp6.patch | 25 ------- libre/clementine/clementine-gcc6.patch | 22 ------ 4 files changed, 14 insertions(+), 156 deletions(-) delete mode 100644 libre/clementine/clementine-chromaprint1.4.0.patch delete mode 100644 libre/clementine/clementine-cryptopp6.patch delete mode 100644 libre/clementine/clementine-gcc6.patch diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index ee9b381f4..dffb5bc70 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -15,47 +15,17 @@ # - build from release tarball instead of VCS pkgname=clementine -_pkgname=$pkgname-libre -pkgver=1.3.1.r831.664c5a31f -pkgrel=3 -pkgrel+=.parabola2 +pkgver=1.4.0rc1 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc='A modern music player and library organizer' pkgdesc+=', without nonfree artwork and Spotify support' url=https://www.clementine-player.org/ license=(GPL) arch=(x86_64) arch+=(i686 armv7h) -depends=( - chromaprint - crypto++ - fftw - glew - glib2 - gst-plugins-base-libs - gstreamer - libcdio - libgl - libgpod - liblastfm-qt5 - libmtp - libmygpo-qt5 - libpulse - libx11 - protobuf - qt5-base - qt5-x11extras - sqlite - zlib - libprotobuf.so -) -makedepends=( - boost - cmake - git - mesa - qt5-tools - sparsehash -) +depends=(chromaprint crypto++ glew gst-plugins-base-libs libcdio libgpod liblastfm-qt5 libmtp libmygpo-qt5 protobuf qt5-x11extras) +makedepends=(boost cmake qt5-tools sparsehash) optdepends=( 'gst-plugins-base: "Base" plugin libraries' 'gst-plugins-good: "Good" plugin libraries' @@ -64,39 +34,18 @@ optdepends=( 'gst-libav: Libav plugin' 'gvfs: Various devices support' ) -source=( - git+https://github.com/clementine-player/Clementine.git#commit=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6 - clementine-gcc6.patch - remove-nonfree-artwork-and-spotify.patch - moognu.png -) -sha256sums=('SKIP' - '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee' +source=("https://github.com/clementine-player/Clementine/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" + remove-nonfree-artwork-and-spotify.patch + moognu.png) + +sha256sums=('96ba2f5f3ece47b2c1065e980dcc37ada93ea42cf37b794ee804514ce4a65459' '75536b5290ebcd6126d9e8796c3f15a0b0d5339257060ebab511dfe665d64e32' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') -pkgver() { - cd Clementine - - git describe --tags | sed 's/-/.r/; s/-g/./' -} - prepare() { - if [[ -d build ]]; then - rm -rf build - fi - mkdir build + mkdir -p build - cd Clementine - - # Fix build with GCC 6 - patch -p1 -i ../clementine-gcc6.patch - # https://github.com/clementine-player/Clementine/pull/5630 - git cherry-pick -n 8a6cc8b5069265e1e92e22def985e22c5955e503 - # FS#58413 - git cherry-pick -n -m 1 75f9439843a0e9cdc26cd739d5e1dbd93bd974bc - # Fix DI.FM - git cherry-pick -n ddfa5e63f1ef0e243a007efbe576fceb9b2442e8 + cd "$pkgname-$pkgver" # remove nonfree artwork for the Nyan Cat plugin # https://labs.parabola.nu/issues/329 @@ -129,14 +78,11 @@ prepare() { build() { cd build - cmake ../Clementine \ - -DCMAKE_BUILD_TYPE=Release \ + cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - make DESTDIR="${pkgdir}" -C build install + make DESTDIR="$pkgdir" -C build install } - -# vim: ts=2 sw=2 et: diff --git a/libre/clementine/clementine-chromaprint1.4.0.patch b/libre/clementine/clementine-chromaprint1.4.0.patch deleted file mode 100644 index 099704026..000000000 --- a/libre/clementine/clementine-chromaprint1.4.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/libre/clementine/clementine-cryptopp6.patch b/libre/clementine/clementine-cryptopp6.patch deleted file mode 100644 index 8197c38fe..000000000 --- a/libre/clementine/clementine-cryptopp6.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/libre/clementine/clementine-gcc6.patch b/libre/clementine/clementine-gcc6.patch deleted file mode 100644 index 24c38735e..000000000 --- a/libre/clementine/clementine-gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001 -From: Bigard Florian -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) -- cgit v1.2.3