1 files changed, 26 insertions, 8 deletions
diff --git a/audio/mp4tools/mp4tools.SlackBuild b/audio/mp4tools/mp4tools.SlackBuild
index 278c567c577ed..374448a8a4f19 100644
--- a/audio/mp4tools/mp4tools.SlackBuild
+++ b/audio/mp4tools/mp4tools.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mp4tools
-VERSION=${VERSION:-0.6.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,14 +54,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+SRCNAM=${SRCNAM:-MP4Tools}
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/${SRCNAM}-${VERSION}.tar.bz2
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,16 +72,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -Np0 < $CWD/audiorip_fix_mplayer.diff || true
+patch -Np0 < $CWD/mp4tools-wx-config.patch || true
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-mkdir -p $PKG/usr/bin
-make INSTDIR=$PKG/usr
+make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+install -Dm644 $CWD/mp4joiner.desktop $PKG/usr/share/applications/mp4joiner.desktop
+install -Dm644 $CWD/mp4splitter.desktop $PKG/usr/share/applications/mp4splitter.desktop
+install -Dm644 resources/mp4joiner.png $PKG/usr/share/pixmaps/mp4joiner.png
+install -Dm644 resources/mp4splitter.png $PKG/usr/share/pixmaps/mp4splitter.png
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT README $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
 
 mkdir -p $PKG/install