diff options
| -rw-r--r-- | network/cclive/README | 7 | ||||
| -rw-r--r-- | network/cclive/cclive.SlackBuild | 36 | ||||
| -rw-r--r-- | network/cclive/cclive.info | 10 |
3 files changed, 26 insertions, 27 deletions
diff --git a/network/cclive/README b/network/cclive/README index 23a526b3b7..aac7ab605c 100644 --- a/network/cclive/README +++ b/network/cclive/README @@ -4,8 +4,5 @@ video content. It has low memory footprint compared to other similar tools. It is a rewrite ot the clive software in C++, and it is free software, licensed under the GPLv3. -If you put the lines below in $HOME/.ccliverc, the output filename would -look nice. - -filename-format=%t.%s -subst=s<\s>{_}g +If you wish custom settings, e.g. for the output filename, create +$HOME/.ccliverc (see manpage). diff --git a/network/cclive/cclive.SlackBuild b/network/cclive/cclive.SlackBuild index d9e5b0ebdd..393a6d7868 100644 --- a/network/cclive/cclive.SlackBuild +++ b/network/cclive/cclive.SlackBuild @@ -1,17 +1,18 @@ #!/bin/sh # Slackware build script for cclive -# Written by crocket (crockabiscuit@gmail.com) -# Maintained by slackmuz (petar.linog@gmail.com) + +# Written by crocket <crockabiscuit@gmail.com> +# Modified by Marek Srejma <sam_web@yahoo.de> 2017/05/03 PRGNAM=cclive -VERSION=${VERSION:-0.7.16} +VERSION=${VERSION:-0.9.3} 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 @@ -22,18 +23,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -42,7 +39,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -51,14 +48,16 @@ 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 {} \; -CPPFLAGS="-P" \ +# Add missing library +sed -i '25,1i#include <iostream>' src/cc/error.h src/cc/options.h +# Eliminate some warnings +sed -i '/with.*CXX/ s/", "/ ", " /' src/cc/options.h + +CPPFLAGS="-P -std=gnu++11" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux @@ -67,10 +66,13 @@ make make install-strip DESTDIR=$PKG 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 +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/cclive/cclive.info b/network/cclive/cclive.info index fc6e23b5bd..c0179ebe65 100644 --- a/network/cclive/cclive.info +++ b/network/cclive/cclive.info @@ -1,10 +1,10 @@ PRGNAM="cclive" -VERSION="0.7.16" +VERSION="0.9.3" HOMEPAGE="http://cclive.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/cclive/cclive-0.7.16.tar.xz" -MD5SUM="7767dadf1a6134208cb6fb9c1ab6a70e" +DOWNLOAD="https://downloads.sourceforge.net/cclive/cclive-0.9.3.tar.xz" +MD5SUM="c336f97e29327d92ead62765a0ef0b65" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="quvi" -MAINTAINER="slackmuz" -EMAIL="petar.linog@gmail.com" +MAINTAINER="Marek Srejma" +EMAIL="sam_web@yahoo.de" |