libraries/libiec61883: Updated for version 1.2.0

3 files changed, 39 insertions, 10 deletions

diff --git a/libraries/libiec61883/README b/libraries/libiec61883/README
index a604982b48..d9ca447af8 100644
--- a/libraries/libiec61883/README
+++ b/libraries/libiec61883/README
@@ -6,5 +6,3 @@ The libiec61883 library provides a higher level API for streaming DV, MPEG-2
 and audio over Linux IEEE 1394. This includes both reception and transmission.
 It uses the new "rawiso" API of libraw1394, which transparently provides 
 mmap-ed DMA for efficient data transfer.  
-
-This requires libraw1394 (available at SlackBuilds.org).
diff --git a/libraries/libiec61883/libiec61883.SlackBuild b/libraries/libiec61883/libiec61883.SlackBuild
index f9435317f9..b8441b9a88 100644
--- a/libraries/libiec61883/libiec61883.SlackBuild
+++ b/libraries/libiec61883/libiec61883.SlackBuild
@@ -1,14 +1,37 @@
 #!/bin/sh
 
 # Pierre Cazenave revision date 11/11/2007
+#       Updated for Slackware64 28/05/2009
 # Modified by Robby Workman <rworkman@slackbuilds.org> for better
 # consistency with our other scripts
+#
+# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 
 PRGNAM=libiec61883
-VERSION=1.1.0
+VERSION=1.2.0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -16,12 +39,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -33,6 +61,7 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -42,8 +71,10 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
diff --git a/libraries/libiec61883/libiec61883.info b/libraries/libiec61883/libiec61883.info
index 833943e833..dfca10f939 100644
--- a/libraries/libiec61883/libiec61883.info
+++ b/libraries/libiec61883/libiec61883.info
@@ -1,8 +1,8 @@
 PRGNAM="libiec61883"
-VERSION="1.1.0"
+VERSION="1.2.0"
 HOMEPAGE="http://www.linux1394.org/"
-DOWNLOAD="http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz"
-MD5SUM="08f46840912ae2032499186228842a32"
+DOWNLOAD="http://www.linux1394.org/dl/libiec61883-1.2.0.tar.gz"
+MD5SUM="8af39fff74988073c3ad53fbab147da9"
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"