1 files changed, 31 insertions, 24 deletions
diff --git a/audio/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild
index c3c1ccc3a1..a7a08ba818 100644
--- a/audio/speex/speex.SlackBuild
+++ b/audio/speex/speex.SlackBuild
@@ -31,7 +31,7 @@
 PRGNAM=speex
 VERSION=${VERSION:-1.2rc2}
 DSPVERSION=${DSPVERSION:-1.2rc3}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,15 +66,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf ${PRGNAM}dsp-$DSPVERSION
+tar xvf $CWD/${PRGNAM}dsp-$DSPVERSION.tar.gz
+cd ${PRGNAM}dsp-$DSPVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,53 +82,60 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/dsp \
   --enable-static=no \
+  --enable-sse \
   --build=$ARCH-slackware-linux
 
 # Hack to also make it look in the right directory on multilib systems
 make LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
 make install DESTDIR=$PKG
 
-# Man pages aren't installed by "make install" anymore...
-mkdir -p $PKG/usr/man/man1
-for i in speexenc speexdec; do gzip -c9 src/$i.1 > $PKG/usr/man/man1/$i.1.gz; done
-
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION/dsp
 find $PKG/usr/doc -type f -exec chown root:root {} \; -exec chmod 644 {} \;
 
 cd $TMP
-rm -rf ${PRGNAM}dsp-$DSPVERSION
-tar xvf $CWD/${PRGNAM}dsp-$DSPVERSION.tar.gz
-cd ${PRGNAM}dsp-$DSPVERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix end-of-line encoding.
+sed -i 's/\r//' README.TI-DSP
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+SPEEXDSP_CFLAGS="-I$PKG/usr/include" \
+SPEEXDSP_LIBS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION/dsp \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
-  --enable-sse \
+  --enable-binaries \
   --build=$ARCH-slackware-linux
 
 # Hack to also make it look in the right directory on multilib systems
-make LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}"
+make LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp"
 make install DESTDIR=$PKG
 
+find $PKG/usr/man -type f -exec gzip -9 '{}' \;
+
+# Fix libspeex.la
+sed -i "s|-L$PKG.*/lib${LIBDIRSUFFIX} ||" $PKG/usr/lib${LIBDIRSUFFIX}/libspeex.la
+
 cp -a \
-  README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION/dsp
+  AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chown root:root {} \; -exec chmod 644 {} \;
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \