gstreamermm: updated to 0.10.10.2

1 files changed, 22 insertions, 12 deletions

diff --git a/gstreamermm/build/gstreamermm.SlackBuild b/gstreamermm/build/gstreamermm.SlackBuild
index a6b42d58..16341ffd 100755
--- a/gstreamermm/build/gstreamermm.SlackBuild
+++ b/gstreamermm/build/gstreamermm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -35,6 +35,8 @@
 # 0.10.9-1:   07/aug/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update for Slackware 13.37. The 0.10.10 release won't compile
 #               on Slackware 13.37 because that requires gstreamer-0.10.35.
+# 0.10.10.2-1:31/may/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update for Slackware 14.0 and 14.1.
 # 
 # Run 'sh gstreamermm.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -45,7 +47,7 @@
 # Set initial variables:
 
 PRGNAM=gstreamermm
-VERSION=${VERSION:-0.10.9}
+VERSION=${VERSION:-0.10.10.2}
 MAJVER=$(echo $VERSION | cut -d. -f1-2)
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
@@ -61,8 +63,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://ftp.gnome.org/pub/GNOME/sources/${PRGNAM}/${MAJVER}/${PRGNAM}-${VERSION}.tar.bz2"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
+SRCURL="http://ftp.gnome.org/pub/GNOME/sources/${PRGNAM}/${MAJVER}/${PRGNAM}-${VERSION}.tar.xz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -85,11 +87,16 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  *)         SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+  *)         SLKCFLAGS=${SLKCFLAGS:-"O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
              ;;
 esac
 
+case "$ARCH" in
+    arm*)    TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)       TARGET=$ARCH-slackware-linux ;;
+esac
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -112,10 +119,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
     wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
@@ -162,11 +170,13 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix= \
   --disable-static \
   --disable-documentation \
-  --build=$ARCH-slackware-linux \
+  --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
-make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+make $NUMJOBS libdocdir=/usr/doc/$PRGNAM-$VERSION \
+  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make libdocdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG install \
+  2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION