summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/speex/README (renamed from multimedia/speex/README)0
-rw-r--r--audio/speex/slack-desc (renamed from multimedia/speex/slack-desc)0
-rw-r--r--audio/speex/speex.SlackBuild (renamed from multimedia/speex/speex.SlackBuild)23
-rw-r--r--audio/speex/speex.info8
-rw-r--r--multimedia/speex/speex.info8
5 files changed, 21 insertions, 18 deletions
diff --git a/multimedia/speex/README b/audio/speex/README
index 339c23c818..339c23c818 100644
--- a/multimedia/speex/README
+++ b/audio/speex/README
diff --git a/multimedia/speex/slack-desc b/audio/speex/slack-desc
index 4186abd7ab..4186abd7ab 100644
--- a/multimedia/speex/slack-desc
+++ b/audio/speex/slack-desc
diff --git a/multimedia/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild
index 8d2527c9ef..8e17451547 100644
--- a/multimedia/speex/speex.SlackBuild
+++ b/audio/speex/speex.SlackBuild
@@ -1,6 +1,5 @@
#!/bin/sh
-
# Slackware build script for speex
# Copyright (c) 2007 Alex Lysenka <me@alkos333.net>
# All rights reserved.
@@ -30,32 +29,36 @@
# 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.
-
-set -e
+# Modified by SlackBuilds.org
PRGNAM=speex
-VERSION=1.2beta2
+VERSION=1.2rc1
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$( pwd )
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-#chown -R root:root .
+chown -R root:root .
chmod -R u+w,go+r-w,a-s .
CFLAGS="$SLKCFLAGS" \
@@ -65,10 +68,10 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-static=no \
--docdir=/usr/doc/$PRGNAM-$VERSION
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
-mv $PKG/usr/share/doc $PKG/usr/share/man $PKG/usr
+mv $PKG/usr/share/man $PKG/usr
gzip -9 $PKG/usr/man/man?/*
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
diff --git a/audio/speex/speex.info b/audio/speex/speex.info
new file mode 100644
index 0000000000..062b3b4195
--- /dev/null
+++ b/audio/speex/speex.info
@@ -0,0 +1,8 @@
+PRGNAM="speex"
+VERSION="1.2rc1"
+HOMEPAGE="http://www.speex.org"
+DOWNLOAD="http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
+MD5SUM="c4438b22c08e5811ff10e2b06ee9b9ae"
+MAINTAINER="alkos333"
+EMAIL="me@alkos333.net"
+APPROVED="dsomero"
diff --git a/multimedia/speex/speex.info b/multimedia/speex/speex.info
deleted file mode 100644
index e6f9933a90..0000000000
--- a/multimedia/speex/speex.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="speex"
-VERSION="1.2beta2"
-HOMEPAGE="http://www.speex.org"
-DOWNLOAD="http://downloads.us.xiph.org/releases/speex/speex-1.2beta2.tar.gz"
-MD5SUM="5480fa53a7451603ecb57ff815c87ac0"
-MAINTAINER="Alex Lysenka"
-EMAIL="me@alkos333.net"
-APPROVED="rworkman,alien"