libraries/libavc1394: Updated for version 0.5.3

3 files changed, 32 insertions, 6 deletions

diff --git a/libraries/libavc1394/README b/libraries/libavc1394/README
index 7b31c813c6..3f1c83e870 100644
--- a/libraries/libavc1394/README
+++ b/libraries/libavc1394/README
@@ -1,5 +1,3 @@
 libavc1394 is a programming interface for the 1394 Trade Association AV/C 
 (Audio/Video Control) Digital Interface Command Set. It is intended for 
 use with GNU/Linux IEEE-1394.
-
-This requires libraw1394 (also available from SlackBuilds.org).
diff --git a/libraries/libavc1394/libavc1394.SlackBuild b/libraries/libavc1394/libavc1394.SlackBuild
index 88b22f06eb..07a62ce26c 100644
--- a/libraries/libavc1394/libavc1394.SlackBuild
+++ b/libraries/libavc1394/libavc1394.SlackBuild
@@ -1,14 +1,36 @@
 #!/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 other scripts in our repository
+#
+# 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=libavc1394
 VERSION=0.5.3
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -16,10 +38,13 @@ 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
@@ -38,14 +63,17 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static
 
 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/libavc1394/libavc1394.info b/libraries/libavc1394/libavc1394.info
index 6c8e7522b5..f2ef1a9da8 100644
--- a/libraries/libavc1394/libavc1394.info
+++ b/libraries/libavc1394/libavc1394.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://downloads.sourceforge.net/libavc1394/libavc1394-0.5.3.tar.gz"
 MD5SUM="09e30b1fb5ae455b6d8407e457a711a3"
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"