diff options
author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 01:49:04 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-23 23:21:44 -0500 |
commit | 23afcf6ab97ea89e6cc9d366d0cfb0480acbc9ff (patch) | |
tree | c24715978a164e848dd187baae02056a2405d10c | |
parent | 0b5ae144f1d30116524d26483d18b8f53cf7117b (diff) | |
download | slackbuilds-23afcf6ab97ea89e6cc9d366d0cfb0480acbc9ff.tar.gz |
libraries/libdvdcss: Miscellaneous cleanups
-rw-r--r-- | libraries/libdvdcss/libdvdcss.SlackBuild | 16 | ||||
-rw-r--r-- | libraries/libdvdcss/slack-desc | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/libraries/libdvdcss/libdvdcss.SlackBuild b/libraries/libdvdcss/libdvdcss.SlackBuild index 6af38b4dc9..07179afae5 100644 --- a/libraries/libdvdcss/libdvdcss.SlackBuild +++ b/libraries/libdvdcss/libdvdcss.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libdvdcss -# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=libdvdcss VERSION=1.2.10 -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e diff --git a/libraries/libdvdcss/slack-desc b/libraries/libdvdcss/slack-desc index acd0bbd9bf..e3010e9ad8 100644 --- a/libraries/libdvdcss/slack-desc +++ b/libraries/libdvdcss/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler------------------------------------------------------| libdvdcss: libdvdcss (DVD decryption library) -libdvdcss: +libdvdcss: libdvdcss: libdvdcss is a cross-platform library for transparent DVD device libdvdcss: access with on-the-fly CSS decryption. It is used by libdvdread libdvdcss: and most DVD players such as VLC because of its portability and |