1 files changed, 17 insertions, 27 deletions
diff --git a/libraries/zita-resampler/zita-resampler.SlackBuild b/libraries/zita-resampler/zita-resampler.SlackBuild
index 4e62ce8487..77d8754859 100644
--- a/libraries/zita-resampler/zita-resampler.SlackBuild
+++ b/libraries/zita-resampler/zita-resampler.SlackBuild
@@ -3,13 +3,13 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=zita-resampler
-VERSION=${VERSION:-1.3.0}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -20,8 +20,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -49,36 +49,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# no configure file
-cd $TMP/$PRGNAM-$VERSION/libs
-sed -i -e 's+/usr/local+/usr/bin+' -e 's+^CXXFLAGS.*++' Makefile
+# Thanks to ARCH Linux
+sed -e '/native/d' \
+      -e 's/ldconfig/& -N $(DESTDIR)\/$(LIBDIR)/' \
+      -i source/Makefile
+sed -e 's|\ $(BINDIR)|\ $(DESTDIR)$(BINDIR)|' apps/Makefile
 
-SUFFIX="$LIBDIRSUFFIX" \
+make -C source
+ln -sv lib$PRGNAM.so.$VERSION source/lib$PRGNAM.so
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -Wall -ffast-math" \
-  make
+CXXFLAGS="$SLKCFLAGS -I../source" \
+LDFLAGS+=" -L../source" \
+make -C apps
+make -C source install DESTDIR=$PKG PREFIX=/usr SUFFIX="$LIBDIRSUFFIX"
 
-# copy library and header file
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-install -m 755 lib${PRGNAM}.so.${VERSION} $PKG/usr/lib${LIBDIRSUFFIX}
-cd $PKG/usr/lib${LIBDIRSUFFIX}/
-ln -s ./lib${PRGNAM}.so.${VERSION} ./lib${PRGNAM}.so
-
-cd $TMP/$PRGNAM-$VERSION/libs
-mkdir -p $PKG/usr/include/$PRGNAM
-install -m 644 $PRGNAM/*.h $PKG/usr/include/$PRGNAM/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION/
-cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION/
-cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install