audio/clementine: Updated for version 1.3.1_c7f3ae9.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 22 insertions, 51 deletions

diff --git a/audio/clementine/chromaprint-1.4.patch b/audio/clementine/chromaprint-1.4.patch
deleted file mode 100644
index 3b833aa48a..0000000000
--- a/audio/clementine/chromaprint-1.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Clementine-1.3.1/src/musicbrainz/chromaprinter.cpp.orig	2016-04-19 22:08:35.000000000 +0700
-+++ Clementine-1.3.1/src/musicbrainz/chromaprinter.cpp	2017-01-02 08:07:14.334983962 +0700
-@@ -143,16 +143,24 @@
-   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);
diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild
index d5e99369ae..8f6d7039e0 100644
--- a/audio/clementine/clementine.SlackBuild
+++ b/audio/clementine/clementine.SlackBuild
@@ -25,9 +25,10 @@
 # Modified by SlackBuilds.org
 
 PRGNAM=clementine
-DIRNAM=Clementine
-VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-2}
+SRCNAM=${PRGNAM/c/C}
+VERSION=${VERSION:-1.3.1_c7f3ae9}
+COMMITVERSION="c7f3ae93e0dbc0d7a04e7691114d9faab0da1740"
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,9 +63,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $DIRNAM-$VERSION
-tar xvf $CWD/$DIRNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
-cd $DIRNAM-$VERSION
+rm -rf $SRCNAM-$COMMITVERSION
+tar xvf $CWD/$SRCNAM-$COMMITVERSION.tar.gz
+cd $SRCNAM-$COMMITVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,25 +75,25 @@ find -L . \
 
 patch -p1 < $CWD/sqlite.patch
 
+# This is no longer needed but I'll keep it around just in case the above fails
+# for any reason.
 # Add upstream patch for chromaprint 1.4 compatibility
 # https://github.com/clementine-player/Clementine/commit/ded312685735fc266d4154d355286eeb86db3bcd
-patch -p1 < $CWD/chromaprint-1.4.patch
+#patch -p1 < $CWD/chromaprint-1.4.patch
 
 mkdir build
 cd build
   cmake \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-	-DMAN_INSTALL_DIR=/usr/man \
-	-DCMAKE_BUILD_TYPE=Release \
-	..
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
   make all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER"
   make install DESTDIR=$PKG
 cd ..
 
-for i in 16 32 ; do
+for i in 16 32 64 128; do
   install -m 0644 -D dist/${PRGNAM}_${i}.png \
     $PKG/usr/share/icons/hicolor/${i}x${i}/apps/application-x-clementine.png
 done
@@ -101,7 +102,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changelog $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a COPYING Changelog README.md $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info
index 1f92d726a1..c62d4277b6 100644
--- a/audio/clementine/clementine.info
+++ b/audio/clementine/clementine.info
@@ -1,8 +1,8 @@
 PRGNAM="clementine"
-VERSION="1.3.1"
-HOMEPAGE="http://www.clementine-player.org/"
-DOWNLOAD="https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz"
-MD5SUM="04ce1c102841282e620d4caae2a897a2"
+VERSION="1.3.1_c7f3ae9"
+HOMEPAGE="http://www.clementine-player.org"
+DOWNLOAD="https://github.com/clementine-player/Clementine/archive/c7f3ae9/Clementine-c7f3ae93e0dbc0d7a04e7691114d9faab0da1740.tar.gz"
+MD5SUM="654dba49d8c1b3af543f47c4a1ec2388"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="chromaprint cryptopp libechonest protobuf"
diff --git a/audio/clementine/slack-desc b/audio/clementine/slack-desc
index ac18ce1ee0..526fcf0fb8 100644
--- a/audio/clementine/slack-desc
+++ b/audio/clementine/slack-desc
@@ -12,8 +12,8 @@ clementine: Clementine is a modern music player and library organiser. Clementin
 clementine: is a port of Amarok 1.4, with some features rewritten to take
 clementine: advantage of Qt4.
 clementine:
-clementine: Homepage:
 clementine: http://www.kde-apps.org/content/show.php/Clementine?content=120598
 clementine:
 clementine:
 clementine:
+clementine: