diff options
-rw-r--r-- | audio/flake/1001-buffer_overrun.patch | 18 | ||||
-rw-r--r-- | audio/flake/flake.SlackBuild | 34 | ||||
-rw-r--r-- | audio/flake/flake.info | 8 | ||||
-rw-r--r-- | audio/flake/slack-desc | 2 |
4 files changed, 22 insertions, 40 deletions
diff --git a/audio/flake/1001-buffer_overrun.patch b/audio/flake/1001-buffer_overrun.patch deleted file mode 100644 index d26bee3196ff6..0000000000000 --- a/audio/flake/1001-buffer_overrun.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Pass max_order instead of max_order+1 to compute_lpc_coefs(). - This avoids a buffer overrun in the autoc[] array. -Origin: upstream, commit:263 ---- - libflake/lpc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- flake.orig/libflake/lpc.c -+++ flake/libflake/lpc.c -@@ -232,7 +232,7 @@ lpc_calc_coefs(const int32_t *samples, i - int i; - int opt_order; - -- compute_autocorr(samples, blocksize, max_order+1, autoc); -+ compute_autocorr(samples, blocksize, max_order, autoc); - - opt_order = max_order; - if(omethod == FLAKE_ORDER_METHOD_EST) { diff --git a/audio/flake/flake.SlackBuild b/audio/flake/flake.SlackBuild index 3ab56c525c462..52a4dd823c8fb 100644 --- a/audio/flake/flake.SlackBuild +++ b/audio/flake/flake.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for flake. # -# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=flake -VERSION=${VERSION:-0.11} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.11.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,13 +54,16 @@ else LIBDIRSUFFIX="" fi +SRCVER=${SRCVER:-f80a2307e442510aeecf3e59785b44135b07e1e8} + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +mv $PRGNAM-$SRCVER $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,15 +72,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -p1 < $CWD/1001-buffer_overrun.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} +mkdir -p build; cd build -make -j1 +cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIBRARY_OUTPUT_PATH:PATH=$PKG/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_BUILD_TYPE=Release \ + .. +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -85,14 +88,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/man/man1 cp $CWD/flake.1 $PKG/usr/man/man1 - find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -DOCS="Changelog COPYING README" - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp ../{Changelog,COPYING,README,TODO,doc/flac_constraints.txt} $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild mkdir -p $PKG/install diff --git a/audio/flake/flake.info b/audio/flake/flake.info index 46bedf706a514..21e1f52eb51e0 100644 --- a/audio/flake/flake.info +++ b/audio/flake/flake.info @@ -1,8 +1,8 @@ PRGNAM="flake" -VERSION="0.11" -HOMEPAGE="http://flake-enc.sourceforge.net/" -DOWNLOAD="http://ufpr.dl.sourceforge.net/project/flake-enc/flake/0.11/flake-0.11.tar.bz2" -MD5SUM="a01f663adf897f872df71e1c28b7ae79" +VERSION="0.11.5" +HOMEPAGE="https://github.com/justinruggles/flake" +DOWNLOAD="https://github.com/justinruggles/flake/archive/f80a2307e442510aeecf3e59785b44135b07e1e8/flake-f80a2307e442510aeecf3e59785b44135b07e1e8.tar.gz" +MD5SUM="8eabe7c7429a9b9fd33f4f63bf1f8507" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/flake/slack-desc b/audio/flake/slack-desc index fb29fd2467b5d..1fc3510f5a6b4 100644 --- a/audio/flake/slack-desc +++ b/audio/flake/slack-desc @@ -12,7 +12,7 @@ flake: Flake is an open-souce FLAC audio encoder. It was developed as an flake: independent implementation of the FLAC specification, and is meant flake: to be an alternative to the FLAC reference encoder. flake: -flake: Home Page: http://flake-enc.sourceforge.net/ +flake: Home Page: https://github.com/justinruggles/flake flake: flake: flake: |