aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/chromaprint/README6
-rw-r--r--libraries/chromaprint/chromaprint.SlackBuild17
-rw-r--r--libraries/chromaprint/chromaprint.info6
3 files changed, 14 insertions, 15 deletions
diff --git a/libraries/chromaprint/README b/libraries/chromaprint/README
index f602377901c78..631df5a90de4c 100644
--- a/libraries/chromaprint/README
+++ b/libraries/chromaprint/README
@@ -4,6 +4,6 @@ Chromaprint is the core component of the Acoustid project.
It's a client-side library that implements a custom algorithm for
extracting fingerprints from any audio source.
-ffmpeg is an optional dependency: it's used in place of fftw3 for
-calcs and some extra tools are built. But it's *broken* ATM (so
-it's disabled in the script).
+ffmpeg is an optional dependency: if present it's used in place
+of fftw3 for calcs and the utility fpcalc is included in the
+resulting package.
diff --git a/libraries/chromaprint/chromaprint.SlackBuild b/libraries/chromaprint/chromaprint.SlackBuild
index 9be319aee97ff..3e9269f9c84e0 100644
--- a/libraries/chromaprint/chromaprint.SlackBuild
+++ b/libraries/chromaprint/chromaprint.SlackBuild
@@ -22,7 +22,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=chromaprint
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,14 +55,12 @@ fi
# Check for ffmpeg: use it for calculations and build some tools
if pkg-config --exists libavcodec libavformat libavutil ; then
- # this is disabled until compatible with our ffmpeg
- #tools="ON" ; avfft="ON" ; fftw3="OFF"
- tools="OFF" ; avfft="OFF" ; fftw3="ON"
+ avfft="ON" ; fftw3="OFF" ; examples="ON"
else
- tools="OFF" ; avfft="OFF" ; fftw3="ON"
+ avfft="OFF" ; fftw3="ON" ; examples="OFF"
fi
-DOCS="COPYING.txt NEWS.txt README.txt"
+DOCS="COPYING.txt NEWS.txt README.md"
set -e
@@ -75,7 +73,7 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
@@ -88,8 +86,9 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DWITH_AVFFT="$avfft" \
-DWITH_FFTW3="$fftw3" \
- -DBUILD_TOOLS="$tools" \
- -DBUILD_EXAMPLES="ON" \
+ -DBUILD_EXAMPLES="$examples" \
+ -DWITH_KISSFFT="OFF" \
+ -DWITH_VDSP="OFF" \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
diff --git a/libraries/chromaprint/chromaprint.info b/libraries/chromaprint/chromaprint.info
index cd5b7ee737c73..fe8d89cdd6067 100644
--- a/libraries/chromaprint/chromaprint.info
+++ b/libraries/chromaprint/chromaprint.info
@@ -1,8 +1,8 @@
PRGNAM="chromaprint"
-VERSION="1.1"
+VERSION="1.2"
HOMEPAGE="http://acoustid.org/chromaprint"
-DOWNLOAD="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.1.tar.gz"
-MD5SUM="6db0b5240231b7d2e6628f49fc765b4a"
+DOWNLOAD="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.2.tar.gz"
+MD5SUM="748da044a8f0ee5f31edec8b67045b3e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""