3 files changed, 32 insertions, 14 deletions
diff --git a/audio/kid3/README b/audio/kid3/README
index f052709d14..dbd7ab3a51 100644
--- a/audio/kid3/README
+++ b/audio/kid3/README
@@ -3,4 +3,5 @@ MP2, Speex, TrueAudio and WavPack files (e.g. full albums) without typing
 the same information again and again and have control over both ID3v1
 and ID3v2 tags, then Kid3 is the program you are looking for.
 
-mp4lib is an optional dependency.
+libmp4v2 (for MP4 support), chromaprint (for fingerprinting detection)
+and ffmpeg are optional dependencies.
diff --git a/audio/kid3/kid3.SlackBuild b/audio/kid3/kid3.SlackBuild
index 96afca0b3d..175cfb189d 100644
--- a/audio/kid3/kid3.SlackBuild
+++ b/audio/kid3/kid3.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=kid3
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-20120816_a1403e8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -21,12 +21,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ $MP4TAG = "no" ]; then
-   MP4TAG="-DWITH_MP4V2=no"
-else
-   MP4TAG=""
-fi
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -41,13 +35,34 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Autodetection of kde4
+if [ -f /usr/bin/kde4 ]; then
+  KDE4="ON"
+else
+  KDE4="OFF"
+fi
+
+# Autodetection of libmp4v2
+if [ -h /usr/lib$LIBDIRSUFFIX/libmp4v2.so ]; then
+  MP4TAG="ON"
+else
+  MP4TAG="OFF"
+fi
+
+# Autodetection of chromaprint
+if pkg-config --exists libchromaprint ; then
+  CHROMA="ON"
+else
+  CHROMA="OFF"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -66,7 +81,9 @@ cmake . \
     -DMAN_INSTALL_DIR=/usr/man \
     -DSYSCONF_INSTALL_DIR=/etc \
     -DINCLUDE_INSTALL_DIR=/usr/include \
-    $MP4TAG
+    -DWITH_CHROMAPRINT="$CHROMA" \
+    -DWITH_MP4V2="$MP4TAG" \
+    -DWITH_KDE="$KDE4"
     
 # breaks compilation
 #-DBUILD_SHARED_LIBS:BOOL=ON \
diff --git a/audio/kid3/kid3.info b/audio/kid3/kid3.info
index a9dc76cb26..6cc063064e 100644
--- a/audio/kid3/kid3.info
+++ b/audio/kid3/kid3.info
@@ -1,10 +1,10 @@
 PRGNAM="kid3"
-VERSION="2.0.1"
+VERSION="20120816_a1403e8"
 HOMEPAGE="http://kid3.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/kid3/kid3-2.0.1.tar.gz"
-MD5SUM="08741a839ca2ff0e6759d5a1ff74e063"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/kid3-20120816_a1403e8.tar.xz"
+MD5SUM="72df3bfefa323b11dcac24220ca26c26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="id3lib libtunepimp"
+REQUIRES="id3lib"
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"