diff options
Diffstat (limited to 'multimedia')
594 files changed, 10350 insertions, 5676 deletions
diff --git a/multimedia/AtomicParsley/AtomicParsley.SlackBuild b/multimedia/AtomicParsley/AtomicParsley.SlackBuild index 4cc89fbb80..2c80eb18a6 100644 --- a/multimedia/AtomicParsley/AtomicParsley.SlackBuild +++ b/multimedia/AtomicParsley/AtomicParsley.SlackBuild @@ -21,12 +21,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220331 bkw, BUILD=3: don't use "cp -a" when copying docs from $CWD. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=AtomicParsley SRCNAM=$( echo $PRGNAM | tr A-Z a-z ) VERSION=${VERSION:-0.9.6} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -75,9 +74,9 @@ cd $SRCNAM-$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 {} \+ ./autogen.sh @@ -94,14 +93,14 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/tools +# 20220331 bkw: note, no -a in this cp command, else I end up with files +# owned by urchlay:users in the package. +cp $CWD/Using_AtomicParsley.{rtf,txt} $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING CREDITS Changes.txt README.md $CWD/Using_AtomicParsley.{rtf,txt} \ + COPYING CREDITS Changes.txt README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild install -D -m0755 tools/iTunMOVI-1.1.pl \ diff --git a/multimedia/AviSynthPlus/AviSynthPlus.SlackBuild b/multimedia/AviSynthPlus/AviSynthPlus.SlackBuild new file mode 100644 index 0000000000..09f85d3829 --- /dev/null +++ b/multimedia/AviSynthPlus/AviSynthPlus.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/bash + +# Slackware build script for AviSynthPlus + +# Copyright 2022 Vijay Marcel +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=AviSynthPlus +VERSION=${VERSION:-3.7.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 +trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -pv $TMP/$PRGNAM-$VERSION/distrib/docs/english/source/_static + +cmake -B build -S $TMP/$PRGNAM-$VERSION \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_PLUGINS=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DINSTALL_ONLY_HEADER=OFF \ + -DENABLE_CUDA=OFF + +make -C build +make -C build install DESTDIR=$PKG + +make -C $TMP/$PRGNAM-$VERSION/distrib/docs/english html + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +cd $TMP/$PRGNAM-$VERSION/distrib/Examples; find . -type f -exec install -Dm644 "{}" "$PKG/usr/share/$PRGNAM-$VERSION/Examples/{}" \; + +cd ../.. + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cd $TMP/$PRGNAM-$VERSION/distrib/docs/english/build/html; for i in $(find . -type f); do install -Dm644 "${i}" "$PKG/usr/doc/$PRGNAM-$VERSION/${i}"; done + +cd ../../../../.. + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/AviSynthPlus/AviSynthPlus.info b/multimedia/AviSynthPlus/AviSynthPlus.info new file mode 100644 index 0000000000..a6df242ee4 --- /dev/null +++ b/multimedia/AviSynthPlus/AviSynthPlus.info @@ -0,0 +1,10 @@ +PRGNAM="AviSynthPlus" +VERSION="3.7.2" +HOMEPAGE="https://avs-plus.net" +DOWNLOAD="https://github.com/AviSynth/AviSynthPlus/archive/v3.7.2/AviSynthPlus-3.7.2.tar.gz" +MD5SUM="cac7ab4e64af4caa8c10aa14e796331f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="DevIL Sphinx" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/AviSynthPlus/README b/multimedia/AviSynthPlus/README new file mode 100644 index 0000000000..850a12ed33 --- /dev/null +++ b/multimedia/AviSynthPlus/README @@ -0,0 +1,5 @@ +avisynthplus is an improved version of avisynth +frameserver with improved features and developer +friendliness. + +This is an optional dependency of FFmpeg diff --git a/multimedia/straw-viewer/slack-desc b/multimedia/AviSynthPlus/slack-desc index aea1cf0983..dc642be285 100644 --- a/multimedia/straw-viewer/slack-desc +++ b/multimedia/AviSynthPlus/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -straw-viewer: straw-viewer (search and stream videos from youtube) -straw-viewer: -straw-viewer: straw-viewer is a lightweight application for searching and streaming -straw-viewer: videos from YouTube, using the API of invidio.us. The project is in -straw-viewer: its early development stages and some features are not implemented -straw-viewer: yet. -straw-viewer: -straw-viewer: -straw-viewer: -straw-viewer: -straw-viewer: +AviSynthPlus: AviSynthPlus (AviSynth With Improvements) +AviSynthPlus: +AviSynthPlus: AviSynthPlus is an improved version of avisynth +AviSynthPlus: frameserver with improved features and developer +AviSynthPlus: friendliness. +AviSynthPlus: +AviSynthPlus: +AviSynthPlus: Homepage:https://avs-plus.net +AviSynthPlus: +AviSynthPlus: +AviSynthPlus: diff --git a/multimedia/DivFix++/DivFix++.SlackBuild b/multimedia/DivFix++/DivFix++.SlackBuild index 559ce43d82..dd065ea558 100644 --- a/multimedia/DivFix++/DivFix++.SlackBuild +++ b/multimedia/DivFix++/DivFix++.SlackBuild @@ -22,25 +22,30 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220331 bkw: Modified by SlackBuilds.org, BUILD=3: +# - install docs to correct dir, usr/doc/$PRGNAM-$VERSION. +# - i486 => i586. +# - do not use wildcards for tarball name. +# - fix grammar in README and slack-desc. +# - make .desktop file validate. +# - use "set -e". + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=DivFix++ VERSION=${VERSION:-0.34} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,8 +55,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" @@ -64,32 +69,41 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM -tar xvf $CWD/${PRGNAM}_v$VERSION-src.tar.?z* || exit 1 +tar xvf $CWD/${PRGNAM}_v$VERSION-src.tar.bz2 || \ + tar xvf $CWD/DivFix%2B%2B_v$VERSION-src.tar.bz2 cd ${PRGNAM}_v$VERSION || exit 1 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +# 20220331 bkw: fix warnings and errors from desktop-file-validate. also +# use absolute path to icon, since it's not in /usr/share/icons/. +sed -i \ + -e '/Version/s,=v,=,' \ + -e '/^Icon/s,=,=/usr/share/pixmaps/,' \ + -e '/^Categories/s,Application;,,' \ + -e '/^Encoding/d' \ + resources/DivFix++.desktop CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + make +make install DESTDIR=$PKG +strip $PKG/usr/bin/$PRGNAM cd $TMP/${PRGNAM}_v$VERSION/docs -mkdir -p $PKG/usr/doc/${PRGNAM}_v$VERSION -cp -a Change.log GPL.txt ReadMe.txt \ - $PKG/usr/doc/${PRGNAM}_v$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/${PRGNAM}_v$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Change.log GPL.txt ReadMe.txt $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/DivFix++/README b/multimedia/DivFix++/README index f52b1e4430..4b9fdc570f 100644 --- a/multimedia/DivFix++/README +++ b/multimedia/DivFix++/README @@ -1,8 +1,8 @@ -This program repairs broken AVI file streams by rebuilding index -part of file. This is very useful when trying to preview movies -which has no index part, like some files are currently downloading -from ed2k (eMule) or bittorent networks. DivFix++ specialy designed -for preview video download files from P2P networks. +This program repairs broken AVI file streams by rebuilding the index +part of the file. This is very useful when trying to preview movies +which have no index part, like files that are partially downloaded +from ed2k (eMule) or bittorent networks. DivFix++ is specially +designed for previewing video download files from P2P networks before +they have finished downloading. -Note that wxGTK3 could be used as a dependency in alternative -to wxPython. +Note that wxGTK3 could be used as a dependency instead of wxPython. diff --git a/multimedia/DivFix++/slack-desc b/multimedia/DivFix++/slack-desc index 08f14859ae..3878d32c9e 100644 --- a/multimedia/DivFix++/slack-desc +++ b/multimedia/DivFix++/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| DivFix++: DivFix++ (CLI "DivFix" clone) DivFix++: -DivFix++: This program repairs broken AVI file streams by rebuilding index -DivFix++: part of file. This is very useful when trying to preview movies -DivFix++: which has no index part, like some files are currently downloading -DivFix++: from ed2k (eMule) or bittorent networks. DivFix++ specialy designed -DivFix++: for preview video download files from P2P networks. +DivFix++: This program repairs broken AVI file streams by rebuilding the index +DivFix++: part of the file. This is very useful when trying to preview movies +DivFix++: which have no index part, like files that are partially downloaded +DivFix++: from ed2k (eMule) or bittorent networks. DivFix++ is specially +DivFix++: desigmed for previewing video download files from P2P networks before +DivFix++: they have finished downloading. DivFix++: DivFix++: Homepage: http://divfixpp.sourceforge.net/ DivFix++: -DivFix++: diff --git a/multimedia/Gem/Gem.SlackBuild b/multimedia/Gem/Gem.SlackBuild index 3ebe9c5f87..16a4e081f6 100644 --- a/multimedia/Gem/Gem.SlackBuild +++ b/multimedia/Gem/Gem.SlackBuild @@ -3,10 +3,14 @@ # # Michales (clavisound) Michaloudes korgie@gmail.com <2017> +# 20220214 bkw: Modified by SlackBuilds.org: +# - updated for v0.94, as 0.93.3 won't build on Slackware 15.0. +# - moved pkg-config stuff to proper place (/usr/lib64 on x86_64). + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Gem -VERSION=${VERSION:-0.93.3} +VERSION=${VERSION:-0.94} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,9 +23,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -47,18 +48,21 @@ fi set -e +ZIPFILE="$CWD/Gem[v0.94](Sources).dek" +[ -e "$ZIPFILE" ] || ZIPFILE="$CWD/Gem%5Bv0.94%5D%28Sources%29.dek" + 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 +unzip $ZIPFILE +cd $PRGNAM 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 {} \+ # I think useless # patch externals/Gem/configure.ac < $CWD/change_gem_configure_file.patch @@ -66,8 +70,10 @@ find -L . \ # Cannot manage to compile with v4l2 # sed -i "s|linux/videodev\.h|libv4l1-videodev.h|" configure || exit 1 +./autogen.sh + CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" +CXXFLAGS="$SLKCFLAGS -std=c++11 -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -87,10 +93,12 @@ make # make install DESTDIR=$PKG/usr/lib${LIBDIRSUFFIX}/pd/extra # will go to $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -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 +if [ -n "$LIBDIRSUFFIX" ] ; then + mv $PKG/usr/lib/pkgconfig $PKG/usr/lib$LIBDIRSUFFIX +fi +rmdir $PKG/usr/lib 2>/dev/null || true # does nothing on 32-bit. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/Gem/Gem.info b/multimedia/Gem/Gem.info index 3dca8f22a4..4113217a69 100644 --- a/multimedia/Gem/Gem.info +++ b/multimedia/Gem/Gem.info @@ -1,10 +1,10 @@ PRGNAM="Gem" -VERSION="0.93.3" +VERSION="0.94" HOMEPAGE="http://gem.iem.at" -DOWNLOAD="http://gem.iem.at/releases/0.93.3/Gem-0.93.3.tar.gz" -MD5SUM="06ec538d157b06cbb2972c0e137ddb48" +DOWNLOAD="http://gem.iem.at/releases/0.94/Gem%5Bv0.94%5D%28Sources%29.dek" +MD5SUM="20b3f7aaca8f77b1691b89145e80bb4f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pd" +REQUIRES="pd ftgl" MAINTAINER="Michales Michaloudes" EMAIL="korgie@gmail.com" diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild index 87a3bd5707..e16c80373b 100644 --- a/multimedia/HandBrake/HandBrake.SlackBuild +++ b/multimedia/HandBrake/HandBrake.SlackBuild @@ -10,8 +10,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=HandBrake -VERSION=${VERSION:-1.0.7} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.5.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} DOCDIR=${DOCDIR:-/usr/doc} @@ -24,9 +24,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -36,8 +33,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" @@ -51,8 +48,6 @@ else fi SLKCFLAGS="$SLKCFLAGS -fno-aggressive-loop-optimizations" -saved_CFLAGS="$CFLAGS" -saved_CXXFLAGS="$CFLAGS" export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -62,10 +57,10 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2 cd $PRGNAM-$VERSION mkdir -p download -cp -r $CWD/* download +cp -r $CWD/*{gz,bz2} download chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -73,25 +68,33 @@ 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 {} \; +# 20220324 bkw: this fixes the 32-bit build, at the cost of adding +# x265 as a required dep. It's based on Debian's +# 0001-Remove-embedded-downloaded-copies-of-various-librari.patch +# ...but it only affects x265. +patch -p1 < $CWD/system_x265.diff + +# Autodetect onevpl support +if pkg-config --exists vpl ; then qsv="--enable-qsv" ; else qsv="" ; fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --disable-gtk-update-checks \ --enable-fdk-aac \ - --disable-libav-aac \ + --enable-nvenc \ + --enable-vce \ --enable-x265 \ + $qsv \ --arch=$ARCH cd build - # Fix underlinking by configuring the gtk module first, then sed: - make gtk.configure make make install DESTDIR=$PKG -cd $TMP/$PRGNAM-$VERSION +strip $PKG/usr/bin/* -export CFLAGS="$saved_CFLAGS" -export CXXFLAGS="$saved_CXXFLAGS" +cd $TMP/$PRGNAM-$VERSION mkdir -p $PKG/$DOCDIR/$PRGNAM-$VERSION cp -a AUTHORS.markdown COPYING NEWS.markdown THANKS.markdown README.markdown \ diff --git a/multimedia/HandBrake/HandBrake.info b/multimedia/HandBrake/HandBrake.info index 52166db079..3b55d6b603 100644 --- a/multimedia/HandBrake/HandBrake.info +++ b/multimedia/HandBrake/HandBrake.info @@ -1,26 +1,30 @@ PRGNAM="HandBrake" -VERSION="1.0.7" +VERSION="1.5.1" HOMEPAGE="https://handbrake.fr/" -DOWNLOAD="https://download.handbrake.fr/releases/1.0.7/HandBrake-1.0.7.tar.bz2 \ - https://download.handbrake.fr/contrib/libvpx-1.5.0.tar.bz2 \ - https://download.handbrake.fr/handbrake/contrib/libav-12.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1.tar.bz2 \ - https://download.handbrake.fr/contrib/x265_2.1-1.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2 \ - https://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz" -MD5SUM="bf39fcc56a82ccca32a9faac8fa633f5 \ - 49e59dd184caa255886683facea56fca \ - a389fd293cf7b52d8fe194615e2547a8 \ - e274a7d7f6cd92c71ec5c78e4dc9f8b7 \ - 607a5dd41b0dd2f35433d6deac79b99e \ - 81e30fb57eaf9f61aa6513a7bd85bd74 \ - 2d9cb183d2675dfb325abdedd2424bfa \ - c51fd34f933431559371be30b59cff51 \ - 694058b83b43b39b7e5b5fc38dbe2b88" +DOWNLOAD="https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBrake-1.5.1-source.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.18.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.2.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.1.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.0.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.1.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-11.0.10.1.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.3.tar.gz" +MD5SUM="d7fa3057eb830d11d5a18a868bd3ff2d \ + c1e8aae3434b8fe6109e47e88e5b4de4 \ + 52415d8b51774e960598bc6d07e6a608 \ + 5b85f858ee416a058574a1028a3e1b85 \ + 9c2ca54e7f353a861e57525ff6da335b \ + d185696bef5f10ac04154e2b22b55b67 \ + 46c46cb0294fbd1fcb8a0181818dad15 \ + 09c7423568fb679279fd2a2bc6b10b6e \ + 3400a117b9d4291f36be00c522057578 \ + 10e99ad6f862598f2f39a50d663bf4f3 \ + 43e157debdfebf737db3a709fc971869" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass x264" +REQUIRES="libass x264 x265 numactl" MAINTAINER="klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/HandBrake/README b/multimedia/HandBrake/README index 85642f5a07..fd686dcd3b 100644 --- a/multimedia/HandBrake/README +++ b/multimedia/HandBrake/README @@ -1,7 +1,7 @@ -HandBrake is a DVD ripping application that reads DVDs and outputs to a -variety of video and audio formats, with options for subtitles, alternate -data streams, presets, and control over advanced options like bitrate, -pixel aspect ratio, deinterlacing, and so on. +HandBrake is a DVD ripping application that reads DVDs and outputs +to a variety of video and audio formats, with options for subtitles, +alternate data streams, presets, and control over advanced options +like bitrate, pixel aspect ratio, deinterlacing, and so on. The legality of ripping content from commercial DVDs varies from nation to nation. diff --git a/multimedia/HandBrake/system_x265.diff b/multimedia/HandBrake/system_x265.diff new file mode 100644 index 0000000000..0badbab3ec --- /dev/null +++ b/multimedia/HandBrake/system_x265.diff @@ -0,0 +1,45 @@ +diff -Naur HandBrake-1.5.1/libhb/module.defs HandBrake-1.5.1.patched/libhb/module.defs +--- HandBrake-1.5.1/libhb/module.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/libhb/module.defs 2022-03-24 15:57:45.803548141 -0400 +@@ -129,10 +129,6 @@ + LIBHB.dll.libs += $(CONTRIB.build/)lib/libvpl.a + endif + +-ifeq (1,$(FEATURE.x265)) +-LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a +-endif +- + ifneq ($(HAS.iconv),1) + LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a + else +diff -Naur HandBrake-1.5.1/make/include/main.defs HandBrake-1.5.1.patched/make/include/main.defs +--- HandBrake-1.5.1/make/include/main.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/make/include/main.defs 2022-03-24 15:58:28.972263692 -0400 +@@ -40,13 +40,6 @@ + MODULES += contrib/fdk-aac + endif + +-ifeq (1,$(FEATURE.x265)) +- MODULES += contrib/x265 +- MODULES += contrib/x265_8bit +- MODULES += contrib/x265_10bit +- MODULES += contrib/x265_12bit +-endif +- + MODULES += contrib/libdav1d + MODULES += contrib/zimg + MODULES += contrib/ffmpeg +diff -Naur HandBrake-1.5.1/test/module.defs HandBrake-1.5.1.patched/test/module.defs +--- HandBrake-1.5.1/test/module.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/test/module.defs 2022-03-24 15:59:19.957108790 -0400 +@@ -23,6 +23,10 @@ + TEST.GCC.l += fontconfig + endif + ++ifeq (1,$(FEATURE.x265)) ++ TEST.GCC.l += x265 ++endif ++ + ifeq (1,$(FEATURE.qsv)) + TEST.GCC.l += vpl + ifneq (,$(filter $(HOST.system),linux freebsd)) diff --git a/multimedia/JSampler/JSampler.SlackBuild b/multimedia/JSampler/JSampler.SlackBuild index 5831c9ecd7..d90897d403 100644 --- a/multimedia/JSampler/JSampler.SlackBuild +++ b/multimedia/JSampler/JSampler.SlackBuild @@ -11,11 +11,20 @@ # notice and this notice are preserved. This file is offered as-is, # without any warranty. +# 20220331 bkw: Modified by SlackBuilds.org, BUILD=2: +# - abort if JAVA_HOME not set and can't be set from /etc/profile.d. +# this avoids creating a /jre in the package root. +# - include an icon in the package, since there's a .desktop file. +# - add a doinst.sh, needed for the icon and .desktop. +# - include a wrapper script to launch from the command line. +# Note: this really should be noarch, and should install the .jar file +# to /usr/share/$PRGNAM. I don't have time to test such changes right now. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=JSampler VERSION=${VERSION:-0.9} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -27,9 +36,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -66,9 +72,21 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +if [ -z "$JAVA_HOME" ]; then + source /etc/profile.d/zulu-openjdk8.sh +fi + +if [ -z "$JAVA_HOME" ]; then + cat <<EOF +*** No JDK found. Install zulu-openjdk8 or another *jdk package and +*** try again. +EOF + exit 1 +fi # make sure destdir exists mkdir -p $PKG/$JAVA_HOME/jre/bin/ @@ -87,6 +105,18 @@ install -D -m 0644 $CWD/$PRGNAM.desktop \ echo -e "\nExec=java -jar $JAVA_HOME/jre/bin/$(echo "${THEME[@]^}")-0.9.jar" \ >> $PKG/usr/share/applications/$PRGNAM-$THEME.desktop +# 20220331 bkw: for those of us who don't use KDE or XFCE or want to: +mkdir -p $PKG/usr/bin +cat > $PKG/usr/bin/$PRGNAM <<EOF +#!/bin/sh +exec java -jar $JAVA_HOME/jre/bin/$(echo "${THEME[@]^}")-0.9.jar +EOF +chmod 0755 $PKG/usr/bin/$PRGNAM + +# 20220331 bkw: icon. should be multiple sizes in /usr/share/icons... +mkdir -p $PKG/usr/share/pixmaps +cat res/fantasia/icons/LinuxSampler-logo.png > $PKG/usr/share/pixmaps/$PRGNAM.png + # docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -ar \ @@ -97,6 +127,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/JSampler/JSampler.desktop b/multimedia/JSampler/JSampler.desktop index 4dfe780082..9fbf1be85f 100644 --- a/multimedia/JSampler/JSampler.desktop +++ b/multimedia/JSampler/JSampler.desktop @@ -3,7 +3,7 @@ Name=JSampler Version=1.0 GenericName=LinuxSampler GUI Comment=JSampler is a LinuxSampler Java GUI Interface -Icon=qsampler +Icon=/usr/share/pixmaps/JSampler.png Categories=Audio;AudioVideo;Midi;X-Alsa;X-Jack; Terminal=false Type=Application diff --git a/multimedia/lwks/doinst.sh b/multimedia/JSampler/doinst.sh index 5fb28930db..5fb28930db 100644 --- a/multimedia/lwks/doinst.sh +++ b/multimedia/JSampler/doinst.sh diff --git a/multimedia/LBRY/LBRY.SlackBuild b/multimedia/LBRY/LBRY.SlackBuild index e448f89f22..49d46b412b 100644 --- a/multimedia/LBRY/LBRY.SlackBuild +++ b/multimedia/LBRY/LBRY.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for LBRY -# Copyright 2020, 2021, Chris Abela, Malta +# Copyright 2020-2022, Chris Abela, Malta # lbc donations will be accepted at: bZQ9x64nw2iVi9F2WeB1Z25U29rQ5TxkUm # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LBRY -VERSION=${VERSION:-0.50.2} +VERSION=${VERSION:-0.53.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +73,7 @@ find -L . \ 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 -ln -s /opt/LBRY/lbry usr/bin/lbry +ln -s ../../opt/LBRY/lbry usr/bin/lbry mv usr/share/doc/lbry usr/doc/$PRGNAM-$VERSION rm -rf usr/share/doc cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/LBRY/LBRY.info b/multimedia/LBRY/LBRY.info index 151960e6ed..3880e33325 100644 --- a/multimedia/LBRY/LBRY.info +++ b/multimedia/LBRY/LBRY.info @@ -1,10 +1,10 @@ PRGNAM="LBRY" -VERSION="0.50.2" +VERSION="0.53.3" HOMEPAGE="https://lbry.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/lbryio/lbry-desktop/releases/download/v0.50.2/LBRY_0.50.2.deb" -MD5SUM_x86_64="7e8bfd7062fa9378422a92aeec994e6e" +DOWNLOAD_x86_64="https://github.com/lbryio/lbry-desktop/releases/download/v0.53.3/LBRY_0.53.3.deb" +MD5SUM_x86_64="775cf3bef0171068daf8c53aad524fca" REQUIRES="" MAINTAINER="Chris Abela" EMAIL="kristofru@gmail.com" diff --git a/multimedia/MediathekView/MediathekView.SlackBuild b/multimedia/MediathekView/MediathekView.SlackBuild index d9311482ed..43368f7dc2 100644 --- a/multimedia/MediathekView/MediathekView.SlackBuild +++ b/multimedia/MediathekView/MediathekView.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for MediathekView -# Copyright 2013-2021 Heiko Rosemann, Germany +# Copyright 2013-2022 Heiko Rosemann, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=MediathekView -VERSION=${VERSION:-13.7.1} +VERSION=${VERSION:-13.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/MediathekView/MediathekView.info b/multimedia/MediathekView/MediathekView.info index ab24031046..c956fa4e88 100644 --- a/multimedia/MediathekView/MediathekView.info +++ b/multimedia/MediathekView/MediathekView.info @@ -1,10 +1,10 @@ PRGNAM="MediathekView" -VERSION="13.7.1" +VERSION="13.9.1" HOMEPAGE="http://www.mediathekview.de" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.mediathekview.de/stabil/MediathekView-13.7.1-linux.tar.gz" -MD5SUM_x86_64="3d7076b812308e88ff0b10ed12266a56" +DOWNLOAD_x86_64="https://download.mediathekview.de/stabil/MediathekView-13.9.1-linux.tar.gz" +MD5SUM_x86_64="43a6e40d641cf254b404e6b88c1925a7" REQUIRES="" MAINTAINER="Heiko Rosemann" EMAIL="heiko.rosemann@web.de" diff --git a/multimedia/Mopidy/Mopidy.SlackBuild b/multimedia/Mopidy/Mopidy.SlackBuild index aa4acaa44d..14c9fcf933 100644 --- a/multimedia/Mopidy/Mopidy.SlackBuild +++ b/multimedia/Mopidy/Mopidy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Mopidy -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2022 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Mopidy -VERSION=${VERSION:-2.1.0} +VERSION=${VERSION:-3.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,16 +79,25 @@ 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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG 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/man/man1 -cp $CWD/mopidy.1.gz $PKG/usr/man/man1/mopidy.1.gz +mkdir -p $PKG/usr/bin +install -m0755 extra/mopidyctl/mopidyctl $PKG/usr/bin + +mkdir -p $PKG/usr/share/applications +cp extra/desktop/mopidy.desktop $PKG/usr/share/applications/ + +mkdir -p $PKG/usr/man/man8 +cp extra/mopidyctl/mopidyctl.8 $PKG/usr/man/man8 + +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS LICENSE PKG-INFO README.rst docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/Mopidy/Mopidy.info b/multimedia/Mopidy/Mopidy.info index 27e1195acb..3c3cc4e38b 100644 --- a/multimedia/Mopidy/Mopidy.info +++ b/multimedia/Mopidy/Mopidy.info @@ -1,10 +1,10 @@ PRGNAM="Mopidy" -VERSION="2.1.0" +VERSION="3.4.0" HOMEPAGE="https://www.mopidy.com/" -DOWNLOAD="https://pypi.python.org/packages/60/76/427ad1fbe879034e34cf9898310ba5a9cc42cd36b08898059be06066fa38/Mopidy-2.1.0.tar.gz" -MD5SUM="ac41bb099309653b6a859daa32af30fb" +DOWNLOAD="https://files.pythonhosted.org/packages/10/16/aff3fb185a1e9c2d0ce98bee39f742f6a8ad46ba0153a71903581bbc9a20/Mopidy-3.4.0.tar.gz" +MD5SUM="7694e738ebe46a41a5f4ad4df3311263" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Pykka gst-python tornado" +REQUIRES="Pykka python3-tornado" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/multimedia/Mopidy/README b/multimedia/Mopidy/README index d12942a260..9011fa48ff 100644 --- a/multimedia/Mopidy/README +++ b/multimedia/Mopidy/README @@ -1,5 +1,5 @@ -Mopidy is a music server which can play music both from multiple sources, like -your local hard drive, radio streams, and from Spotify and SoundCloud. Searches -combines results from all music sources, and you can mix tracks from all -sources in your play queue. Your playlists from Spotify or SoundCloud are also -available for use. +Mopidy is a music server which can play music both from multiple +sources, like your local hard drive, radio streams, and from Spotify +and SoundCloud. Searches combines results from all music sources, and +you can mix tracks from all sources in your play queue. Your playlists +from Spotify or SoundCloud are also available for use. diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild index ad1fe4050d..2db14943c6 100644 --- a/multimedia/MuseScore/MuseScore.SlackBuild +++ b/multimedia/MuseScore/MuseScore.SlackBuild @@ -1,6 +1,14 @@ #!/bin/bash # Slackware build script for MuseScore -# Maintained by Klaatu at member.fsf dot org + +# Copyright 2022 Klaatu <klaatu@member.fsf.org> | Lawrence NZ +# Thanks to Tim Dickson + +# GNU All-Permissive License +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. cd $(dirname $0) ; CWD=$(pwd) @@ -67,27 +75,31 @@ cp $CWD/MuseScore_General.sf3 share/sound # so turn it off in CMakeLists.txt sed -i '/(BUILD_CRASH_REPORTER/s|ON)|OFF)|' CMakeLists.txt sed -i 's|share/man|man|' CMakeLists.txt -#musescore doesn't like to build with webengine with qt4 installed -#because the qmake finder finds the qt4 version. lets patch this -sed -i 's/qmake)/qmake-qt5)/g' build/FindQt5.cmake - -make revision - -make release \ - PREFIX=/usr \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - LDFLAGS="-pthread" \ - MUSESCORE_BUILD_CONFIG=release \ - DOWNLOAD_SOUNDFONT=OFF \ - USE_SYSTEM_FREETYPE=ON \ - BUILD_WEBENGINE=ON \ - VERBOSE=1 + +mkdir b +cd b +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \ + -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="-pthread" \ + -DMUSESCORE_BUILD_CONFIG=release \ + -DDOWNLOAD_SOUNDFONT=OFF \ + -DUSE_SYSTEM_FREETYPE=ON \ + -DBUILD_WEBENGINE=OFF \ + -DBUILD_TELEMETRY_MODULE=OFF \ + -DBUILD_PORTAUDIO=ON \ + -DBUILD_PORTMIDI=ON \ + -DQMAKE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ + -DQT_QMAKE_EXECUTABLE=/usr/lib"${LIBDIRSUFFIX}"/qt5/bin/qmake \ + .. + make install \ - -C build.release \ DESTDIR=$PKG \ UPDATE_CACHE=FALSE +cd .. + 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 diff --git a/multimedia/MuseScore/README b/multimedia/MuseScore/README index 26c3e9a318..449a4c6663 100644 --- a/multimedia/MuseScore/README +++ b/multimedia/MuseScore/README @@ -6,6 +6,5 @@ program, licenced under GNU GPL. Features: * easy and fast note entry with mouse, keyboard or midi * integrated sequencer and FluidSynth software synthesizer * import and export of MusicXml and standard midifiles (SMF) - * platform independent code for Linux, Windows and Mac + * platform independent code for Linux, Windows, Mac -Optional dependency: portaudio diff --git a/multimedia/OpenLP/README b/multimedia/OpenLP/README index 4077fe3e13..f859aea4f4 100644 --- a/multimedia/OpenLP/README +++ b/multimedia/OpenLP/README @@ -1,15 +1,19 @@ -OpenLP stands for "Open Lyrics Projection" and is presentation software -developed for churches to provide a single easy to use interface for the -projection needs of a typical worship service. -First created in 2004, it has steadily grown in features and maturity such -that it is now a mainstay in hundreds of churches around the world. +OpenLP stands for "Open Lyrics Projection" and is presentation +software developed for churches to provide a single easy to use +interface for the projection needs of a typical worship service. -OpenLP has searchable databases of songs and Bible verses allowing them to be -projected instantly or saved in a pre-prepared order of service file. Themes -allow for a variety of presentation options and allow you to add attractive -visuals to enhance your presentations. PowerPoint and OpenOffice presentations, -videos and audio files can be run from within the program removing the need -to switch between different programs. Alert messages can be displayed so the -nursery or car park stewards can notify the congregation easily. -Remote capability allows the worship leader to change songs, or for alert -messages to be sent from anywhere on the network, even via smart phone/tablet. +First created in 2004, it has steadily grown in features and maturity +such that it is now a mainstay in hundreds of churches around the +world. + +OpenLP has searchable databases of songs and Bible verses allowing +them to be projected instantly or saved in a pre-prepared order +of service file. Themes allow for a variety of presentation +options and allow you to add attractive visuals to enhance your +presentations. PowerPoint and OpenOffice presentations, videos and +audio files can be run from within the program removing the need to +switch between different programs. Alert messages can be displayed so +the nursery or car park stewards can notify the congregation easily. +Remote capability allows the worship leader to change songs, or for +alert messages to be sent from anywhere on the network, even via smart +phone/tablet. diff --git a/multimedia/OpenPHT/OpenPHT b/multimedia/OpenPHT/OpenPHT deleted file mode 100644 index 78c8190d1d..0000000000 --- a/multimedia/OpenPHT/OpenPHT +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# disable PulseAudio -export AE_ENGINE=Soft - -export XBMC_HOME=/opt/OpenPHT/share/XBMC -exec /opt/OpenPHT/bin/openpht diff --git a/multimedia/OpenPHT/OpenPHT.SlackBuild b/multimedia/OpenPHT/OpenPHT.SlackBuild deleted file mode 100644 index 767fbb5384..0000000000 --- a/multimedia/OpenPHT/OpenPHT.SlackBuild +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash - -# Slackware build script for "OpenPHT" - -# Copyright 2014-2015 Marcel Saegebarth <marc@mos6581.de> -# Copyright 2016 Philip van der Hoeven, Almere, The Netherlands -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=OpenPHT -VERSION=${VERSION:-1.8.0.148} -REV=${REV:-573b6d73} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -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 - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION-$REV -tar xvf $CWD/$PRGNAM-$VERSION-$REV.tar.gz || tar xvf $CWD/v$VERSION-$REV.tar.gz -cd $PRGNAM-$VERSION-$REV -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 \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Find fribidi-0.19.7 -# https://raw.githubusercontent.com/foux/fouxlay/master/media-tv/plex-home-theater/files/fribidi.patch -patch -p1 < $CWD/fribidi.patch - -mkdir build -cd build - -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_AUTOUPDATE='FALSE' \ - -DENABLE_DUMP_SYMBOLS='FALSE' \ - -DENABLE_PYTHON='TRUE' \ - -DUSE_INTERNAL_FFMPEG='TRUE' \ - -DCREATE_BUNDLE='FALSE' \ - -DENABLE_SHAIRPLAY=off \ - -DENABLE_CEC=off \ - .. - -# internal ffmpeg version doesn't build with multiple jobs -make -j1 -make install DESTDIR=$PKG - -cd .. - -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/bin -install -D -m 0755 $CWD/OpenPHT $PKG/usr/bin - -mkdir -p $PKG/usr/share/applications -install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications - -mkdir -p $PKG/usr/share/pixmaps -install -D -m 0644 $CWD/${PRGNAM}_512x512.png $PKG/usr/share/pixmaps - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CONTRIBUTORS LICENSE.GPL README README-BUILD-PLEX.md docs/README.* \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/OpenPHT/OpenPHT.desktop b/multimedia/OpenPHT/OpenPHT.desktop deleted file mode 100644 index 1a0bcb7a17..0000000000 --- a/multimedia/OpenPHT/OpenPHT.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=OpenPHT - Plex Home Theater -GenericName=Media Center -Exec=OpenPHT -StartupNotify=true -Terminal=false -Type=Application -Icon=/usr/share/pixmaps/OpenPHT_512x512.png -Categories=Audio;Music;Video;Player;AudioVideo; diff --git a/multimedia/OpenPHT/OpenPHT.info b/multimedia/OpenPHT/OpenPHT.info deleted file mode 100644 index 5e4e3c8331..0000000000 --- a/multimedia/OpenPHT/OpenPHT.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="OpenPHT" -VERSION="1.8.0.148" -HOMEPAGE="https://github.com/RasPlex/OpenPHT" -DOWNLOAD="https://github.com/RasPlex/OpenPHT/archive/v1.8.0.148-573b6d73/OpenPHT-1.8.0.148-573b6d73.tar.gz" -MD5SUM="7eddac9c7638d70c2a25d04cc451ddcc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="yajl libmicrohttpd tinyxml avahi libmpeg2 libass rtmpdump libmodplug openjdk7 libcec" -MAINTAINER="Philip van der Hoeven" -EMAIL="philip@vd-hoeven.nl" diff --git a/multimedia/OpenPHT/OpenPHT_512x512.png b/multimedia/OpenPHT/OpenPHT_512x512.png Binary files differdeleted file mode 100644 index 89f68bb648..0000000000 --- a/multimedia/OpenPHT/OpenPHT_512x512.png +++ /dev/null diff --git a/multimedia/OpenPHT/README b/multimedia/OpenPHT/README deleted file mode 100644 index 7477cbfcc3..0000000000 --- a/multimedia/OpenPHT/README +++ /dev/null @@ -1,6 +0,0 @@ - -Plex Home Theater is optimized for the big screen and supports -a wide variety of formats with high-definition audio, native -framerates, and more. - -Optional dependencies: libcec libnfs diff --git a/multimedia/OpenPHT/fribidi.patch b/multimedia/OpenPHT/fribidi.patch deleted file mode 100644 index 3b135bdfc3..0000000000 --- a/multimedia/OpenPHT/fribidi.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/plex/CMakeModules/FindFriBiDi.cmake -+++ b/plex/CMakeModules/FindFriBiDi.cmake -@@ -10,43 +10,9 @@ - # FRIBIDI_LIBRARY, where to find the FriBiDi library. - - include(CheckSymbolExists) -+include(FindPkgConfig) -+pkg_check_modules(FRIBIDI fribidi) - --SET(FRIBIDI_FOUND "NO") -- --# Set variable in temp var, otherwise FIND_PATH might fail --# unset isn't present in the required version of cmake. --FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h -- PATHS /usr/local/include -- /usr/include -- PATH_SUFFIXES fribidi -- ) --set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR}) -- --SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) --FIND_LIBRARY(FRIBIDI_LIBRARY -- NAMES ${FRIBIDI_NAMES} -- PATHS /usr/lib /usr/local/lib -- ) -- --IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) -- SET(CMAKE_REQUIRED_INCLUDES ${FRIBIDI_INCLUDE_DIR}) -- SET(CMAKE_REQUIRED_LIBRARIES ${FRIBIDI_LIBRARY}) -- CHECK_SYMBOL_EXISTS(fribidi_utf8_to_unicode fribidi.h FOUND_fribidi_utf8_to_unicode) -- CHECK_SYMBOL_EXISTS(fribidi_charset_to_unicode fribidi.h FOUND_fribidi_charset_to_unicode) -- if(FOUND_fribidi_charset_to_unicode) -- SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY}) -- SET(FRIBIDI_FOUND "YES") -- elseif(FOUND_fribidi_utf8_to_unicode) -- SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY}) -- SET(FRIBIDI_FOUND "YES") -- add_definitions(-DOLD_FRIBIDI) -- MESSAGE(STATUS "Legacy FriBiDi: ${FRIBIDI_LIBRARY}") -- else() -- SET(FRIBIDI_LIBRARIES "NOTFOUND") -- SET(FRIBIDI_INCLUDE_DIR "NOTFOUND") -- SET(FRIBIDI_FOUND "NO") -- endif() --ENDIF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) - - IF (FRIBIDI_FOUND) diff --git a/multimedia/QMPlay2/QMPlay2.SlackBuild b/multimedia/QMPlay2/QMPlay2.SlackBuild index f3d75526f2..c21ff81afa 100644 --- a/multimedia/QMPlay2/QMPlay2.SlackBuild +++ b/multimedia/QMPlay2/QMPlay2.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for QMPlay2. # -# Copyright 2017-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2017-2022 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=QMPlay2 -VERSION=${VERSION:-21.03.09} +VERSION=${VERSION:-22.10.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,8 +79,6 @@ 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 {} \; -for i in $CWD/patches/* ; do patch -p1 < $i ; done - mkdir build cd build cmake \ diff --git a/multimedia/QMPlay2/QMPlay2.info b/multimedia/QMPlay2/QMPlay2.info index 9d9a7e1bbb..dff07555b0 100644 --- a/multimedia/QMPlay2/QMPlay2.info +++ b/multimedia/QMPlay2/QMPlay2.info @@ -1,8 +1,8 @@ PRGNAM="QMPlay2" -VERSION="21.03.09" +VERSION="22.10.23" HOMEPAGE="https://github.com/zaps166/QMPlay2" -DOWNLOAD="https://github.com/zaps166/QMPlay2/releases/download/21.03.09/QMPlay2-src-21.03.09.tar.xz" -MD5SUM="5fe8a2b836c86fcfd5521d3636c579f8" +DOWNLOAD="https://github.com/zaps166/QMPlay2/releases/download/22.10.23/QMPlay2-src-22.10.23.tar.xz" +MD5SUM="d4e4a0877cf946666ffd300088248dad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libass libgme" diff --git a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch b/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch deleted file mode 100644 index efe8495825..0000000000 --- a/multimedia/QMPlay2/patches/7b2df68ba9bdec45271d9791a4b997f7031aef2b.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b2df68ba9bdec45271d9791a4b997f7031aef2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl> -Date: Tue, 16 Mar 2021 18:02:28 +0100 -Subject: [PATCH] Fix svg icon engine warning after KDE update - ---- - src/gui/Main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp -index 2ebd731b..284c2c53 100644 ---- a/src/gui/Main.cpp -+++ b/src/gui/Main.cpp -@@ -790,7 +790,7 @@ int main(int argc, char *argv[]) - qmplay2Gui.loadIcons(); - { - const QIcon svgIcon = QIcon(":/QMPlay2.svgz"); -- if (!svgIcon.availableSizes().isEmpty()) -+ if (svgIcon.availableSizes().size() == 1) - QMessageBox::warning(nullptr, QString(), QObject::tr("QtSvg icon engine plugin doesn't exist.\nQMPlay2 will not scale up icons!")); - } - diff --git a/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch b/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch deleted file mode 100644 index 040e835f71..0000000000 --- a/multimedia/QMPlay2/patches/c0927948a42621e41da0571209b27ff39badf4cc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0927948a42621e41da0571209b27ff39badf4cc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl> -Date: Sun, 28 Mar 2021 16:19:51 +0200 -Subject: [PATCH] VA-API/Vulkan: Treat invalid DRM format modifier as linear - -AMD and Mesa 21.0.1 reports invalid DRM modifier instead of linear. -This causes a driver crash when QMPlay2 is trying to play with invalid -image tiling. ---- - src/modules/FFmpeg/VAAPIVulkan.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/modules/FFmpeg/VAAPIVulkan.cpp b/src/modules/FFmpeg/VAAPIVulkan.cpp -index 47ecf7ab..d31dfd66 100644 ---- a/src/modules/FFmpeg/VAAPIVulkan.cpp -+++ b/src/modules/FFmpeg/VAAPIVulkan.cpp -@@ -112,8 +112,13 @@ void VAAPIVulkan::map(Frame &frame) - MemoryObject::FdDescriptors fdDescriptors(vaSurfaceDescr.num_objects); - for (uint32_t i = 0; i < vaSurfaceDescr.num_objects; ++i) - { -- if (i == 0 && vaSurfaceDescr.objects[i].drm_format_modifier != 0) -- isLinear = false; -+ if (i == 0) -+ { -+ // 0x0000000000000000 - linear, 0x00ffffffffffffff - invalid -+ const auto drmFmtMod = vaSurfaceDescr.objects[i].drm_format_modifier; -+ if (drmFmtMod != 0ull && drmFmtMod != 0xffffffffffffffull) -+ isLinear = false; -+ } - - fdDescriptors[i].first = vaSurfaceDescr.objects[i].fd; - fdDescriptors[i].second = (vaSurfaceDescr.objects[i].size > 0) diff --git a/multimedia/RenameMyTVSeries/README b/multimedia/RenameMyTVSeries/README new file mode 100644 index 0000000000..a9605bafd1 --- /dev/null +++ b/multimedia/RenameMyTVSeries/README @@ -0,0 +1,15 @@ +A tool to quickly and easily rename poorly named TV Show episode +files to a format that makes sense and is to your liking using +information from thetvdb.com + +Features: +Support the new TheTVDB.com API (v2) +Caching shows and banners +Dark Theme support (MacOS and Linux only) +Automatically move files into a desired directory structure +Define your own file and directory name format +Create NFO files for the TV Show and for individual Episodes +Store a banner for the TV Show +Merge 2 Episodes into 1 (filename only of course) +Log file of what files have been renamed + diff --git a/multimedia/RenameMyTVSeries/RenameMyTVSeries.SlackBuild b/multimedia/RenameMyTVSeries/RenameMyTVSeries.SlackBuild new file mode 100644 index 0000000000..6601c799de --- /dev/null +++ b/multimedia/RenameMyTVSeries/RenameMyTVSeries.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/bash + +# Slackware build script for RenameMyTVSeries + +# Copyright 2023 Matt Dinslage, Springfield MO +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=RenameMyTVSeries +VERSION=${VERSION:-2.1.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +PKGSOURCE=$TMP/$PRGNAM-$VERSION +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-GTK-beta-Linux-64bit-shared-ffmpeg.tar.gz -C $PRGNAM-$VERSION +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Create directories and install binary +mkdir -p $PKG/usr/bin +mkdir -p $PKG/usr/share/applications +install -Dm755 $PRGNAM $PKG/usr/bin + +# Add application icons +chmod 0644 icons/* +for i in 16 32 64 128 256 512; do + mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps + cp icons/${i}x${i}.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png +done + +# Correct RenameMyTVSeries.desktop file +cat $PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop +sed -i '4d;12d' $PKG/usr/share/applications/$PRGNAM.desktop +sed -i \ + -e "s|Exec=/usr/share/RenameMyTVSeries/RenameMyTVSeries|Exec=/usr/bin/RenameMyTVSeries|" \ + -e "s|Icon=/usr/share/RenameMyTVSeries/icons/512x512.png|Icon=RenameMyTVSeries|" \ + -e "s|Categories=Utility;|Categories=AudioVideo;|" \ + $PKG/usr/share/applications/$PRGNAM.desktop + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 +cp -a \ + readme.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/RenameMyTVSeries/RenameMyTVSeries.info b/multimedia/RenameMyTVSeries/RenameMyTVSeries.info new file mode 100644 index 0000000000..4721771092 --- /dev/null +++ b/multimedia/RenameMyTVSeries/RenameMyTVSeries.info @@ -0,0 +1,10 @@ +PRGNAM="RenameMyTVSeries" +VERSION="2.1.7" +HOMEPAGE="https://www.tweaking4all.com/home-theatre/rename-my-tv-series-v2/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://www.tweaking4all.com/downloads/betas/RenameMyTVSeries-2.1.7-GTK-beta-Linux-64bit-shared-ffmpeg.tar.gz" +MD5SUM_x86_64="cfc8a8456b74a611b8f2e3ab329ca936" +REQUIRES="" +MAINTAINER="M.Dinslage" +EMAIL="matthewdinslage@gmail.com" diff --git a/multimedia/simpleburn/doinst.sh b/multimedia/RenameMyTVSeries/doinst.sh index 65c7e2eeb9..a25271d80c 100644 --- a/multimedia/simpleburn/doinst.sh +++ b/multimedia/RenameMyTVSeries/doinst.sh @@ -1,7 +1,8 @@ if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 + /usr/bin/update-desktop-database -q usr/share/applications fi +# If other icon themes are installed, then add to/modify this as needed if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 diff --git a/multimedia/RenameMyTVSeries/slack-desc b/multimedia/RenameMyTVSeries/slack-desc new file mode 100644 index 0000000000..1578b61c29 --- /dev/null +++ b/multimedia/RenameMyTVSeries/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +RenameMyTVSeries: RenameMyTVSeries (Rename My TV Series) +RenameMyTVSeries: +RenameMyTVSeries: A simple tool to rename TV Show files using TheTVDB.com database. +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: +RenameMyTVSeries: diff --git a/multimedia/SimpleSysexxer/README b/multimedia/SimpleSysexxer/README index 4794dcfbd7..36762a2985 100644 --- a/multimedia/SimpleSysexxer/README +++ b/multimedia/SimpleSysexxer/README @@ -1,2 +1,2 @@ -SimpleSysexxer is a GUI tool to create backups of the memory contents of your -MIDI devices +SimpleSysexxer is a GUI tool to create backups of the memory contents +of your MIDI devices diff --git a/multimedia/SimpleSysexxer/SimpleSysexxer.SlackBuild b/multimedia/SimpleSysexxer/SimpleSysexxer.SlackBuild index c8c75b9c73..e9848b879d 100644 --- a/multimedia/SimpleSysexxer/SimpleSysexxer.SlackBuild +++ b/multimedia/SimpleSysexxer/SimpleSysexxer.SlackBuild @@ -60,7 +60,7 @@ find -L . \ -exec chmod 644 {} \; sed -i "s%-O0 -g3%$SLKCFLAGS%" $PRGNAM.pro -qmake SimpleSysexxer.pro +qmake-qt4 SimpleSysexxer.pro make # manual copy of translations diff --git a/multimedia/SimpleSysexxer/SimpleSysexxer.info b/multimedia/SimpleSysexxer/SimpleSysexxer.info index e3d683e838..b0f29434c8 100644 --- a/multimedia/SimpleSysexxer/SimpleSysexxer.info +++ b/multimedia/SimpleSysexxer/SimpleSysexxer.info @@ -3,8 +3,8 @@ VERSION="0.3" HOMEPAGE="http://www.christeck.de/wp/?page_id=24" DOWNLOAD="http://downloads.sourceforge.net/project/sysexxer/SimpleSysexxer-0.3/SimpleSysexxer-0.3.tar.gz" MD5SUM="59c1b91089bb15050e3a58aa602332db" -DOWNLOAD_x86_64="UNTESTED" +DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt4" MAINTAINER="Michales Michaloudes" EMAIL="korgie@gmail.com" diff --git a/multimedia/Yolo/Yolo.info b/multimedia/Yolo/Yolo.info index 6aa571df25..a604b97fe7 100644 --- a/multimedia/Yolo/Yolo.info +++ b/multimedia/Yolo/Yolo.info @@ -5,6 +5,6 @@ DOWNLOAD="http://iweb.dl.sourceforge.net/project/yolo/Yolo/Yolo%20May%2005%20200 MD5SUM="bb137d249f20d4f262c8a30c07871b36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/abcMIDI/README b/multimedia/abcMIDI/README index c5ce7f59fa..44eb2495aa 100644 --- a/multimedia/abcMIDI/README +++ b/multimedia/abcMIDI/README @@ -1,8 +1,8 @@ -The abcMIDI package contains the following : +The abcMIDI package contains the following: abc2midi - a program to convert abc notation to MIDI files. midi2abc - a program to produce crude abc from a MIDI file. - abc2abc - a utility to do transposition, error checking and re-formatting -on an abc file. + abc2abc - a utility to do transposition, error checking and + re-formatting on an abc file. yaps - (NEW) utility to convert abc to PostScript based on Michael -Methfessel's PostScript library for abc2ps. + Methfessel's PostScript library for abc2ps. diff --git a/multimedia/aces-dev/README b/multimedia/aces-dev/README index bbb076e3f5..38988847c5 100644 --- a/multimedia/aces-dev/README +++ b/multimedia/aces-dev/README @@ -1,29 +1,24 @@ Aces-dev contains reference CTL transforms and documentation meant to aid implementing the ACES workflow. -In this package: ----------------- +## In this package * Color encoding and metric specs, file format specs, color transformations, and an open source reference implementation * Python and a CSH wrapper script from Arri to generate a CTL based on - Alexa EI setting + Alexa EI Setting -* Documentation on the system and software tools - - -Missing from this package: --------------------------- +## Not in this package 500mb of reference images (with CTLs applied). You can download reference images individually or as a ZIP file from the Academy's -public DropBox account: +public DropBox account, referenced in the `images` folder after +installation. -https://dl.dropboxusercontent.com/content_link_zip/1Fm7ngrWzwj9AHEpn0AIsy74RItDirfO5KVIiLAWAshpEIpIUSFCh1SxmAtIj60x/file +## Recommended packages -Recommended ------------ +For this to be useful, you probably also need -aces_container -ctl +* aces_container +* ctl diff --git a/multimedia/aces-dev/aces-dev.SlackBuild b/multimedia/aces-dev/aces-dev.SlackBuild index 2d90f135f2..ec10affda1 100644 --- a/multimedia/aces-dev/aces-dev.SlackBuild +++ b/multimedia/aces-dev/aces-dev.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for aces-dev -# Copyright 2016 Klaatu, Wellington NZ +# Copyright 2016-22 Klaatu <klaatu@member.fsf.org> # All rights reserved. # # GNU All-Permissive License @@ -14,7 +14,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aces-dev -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.3} BUILD=${BUILD:-1} DOCDIR=${DOCDIR:-1} TAG=${TAG:-_SBo} @@ -57,17 +57,17 @@ mkdir -p $PKG/$PREFIX/bin find . -type f -name "*.py" -exec install -D -m 0755 {} $PKG/$PREFIX/bin/ \; find . -type f -name "*.csh" -exec install -D -m 0755 {} $PKG/$PREFIX/bin/ \; -# if you modify this line, -find ./transforms/ctl/idt/vendorSupplied/arri/alexa/ -depth -name "*.py" -type f -delete -find ./transforms/ctl/idt/vendorSupplied/arri/alexa/ -depth -name "*.csh" -type f -delete -# for heavens sake -# be careful with find and -delete +## install utilities +install -D transforms/renameCTL.py $PKG/usr/bin mkdir -p $PKG/usr/share/$PRGNAM-$VERSION -rsync -av transforms/ctl/ $PKG/usr/share/$PRGNAM-$VERSION/ +rsync -av formats $PKG/usr/share/$PRGNAM-$VERSION/ +rsync -av transforms/ctl $PKG/usr/share/$PRGNAM-$VERSION/ +rsync -av images $PKG/usr/share/$PRGNAM-$VERSION/ + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a documents/LaTeX images CHANGELOG.md LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/aces-dev/aces-dev.info b/multimedia/aces-dev/aces-dev.info index fdb2b01f98..9011db2983 100644 --- a/multimedia/aces-dev/aces-dev.info +++ b/multimedia/aces-dev/aces-dev.info @@ -1,10 +1,10 @@ PRGNAM="aces-dev" -VERSION="1.0.2" +VERSION="1.3" HOMEPAGE="https://www.oscars.org/science-technology/sci-tech-projects/aces" -DOWNLOAD="https://github.com/ampas/aces-dev/archive/v1.0.2/aces-dev-1.0.2.tar.gz" -MD5SUM="66af1b9098515b9ca4d15560bf486214" +DOWNLOAD="https://github.com/ampas/aces-dev/archive/v1.3/aces-dev-1.3.tar.gz" +MD5SUM="b9a7b1c8ca2508545d93d53ff2b6fcad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="numpy" +REQUIRES="python2-numpy" MAINTAINER="Klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/aces_container/aces_container.SlackBuild b/multimedia/aces_container/aces_container.SlackBuild index a0c44cd2c0..3562bc9c95 100644 --- a/multimedia/aces_container/aces_container.SlackBuild +++ b/multimedia/aces_container/aces_container.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for aces_container -# Copyright 2016 Klaatu +# Copyright 2016-22 Klaatu # All rights reserved. # # GNU All-Permissive License @@ -14,7 +14,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aces_container -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/aces_container/aces_container.info b/multimedia/aces_container/aces_container.info index c716c665d1..2f587638e2 100644 --- a/multimedia/aces_container/aces_container.info +++ b/multimedia/aces_container/aces_container.info @@ -1,8 +1,8 @@ PRGNAM="aces_container" -VERSION="1.0.1" +VERSION="1.0.2" HOMEPAGE="http://www.oscars.org/aces" -DOWNLOAD="https://github.com/ampas/aces_container/archive/v1.0.1/aces_container-1.0.1.tar.gz" -MD5SUM="8c7317267b9feed95187e19f7a573917" +DOWNLOAD="https://github.com/ampas/aces_container/archive/v1.0.2/aces_container-1.0.2.tar.gz" +MD5SUM="b82364639768d650dd45e6085b429fb6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/acetoneiso/README b/multimedia/acetoneiso/README new file mode 100644 index 0000000000..d62f62b188 --- /dev/null +++ b/multimedia/acetoneiso/README @@ -0,0 +1,18 @@ +AcetoneISO (CD/DVD image manipulator for GNU/Linux) + +AcetoneISO is a feature-rich and complete software application +to manage CD/DVD images. AcetoneISO will let You mount typical +proprietary images formats of the Windows world such as ISO BIN +NRG MDF IMG and do plenty of other things. + +Some features you can see in /usr/doc/$PRGNAM-$VERSION/FEATURES. + +For image conversion you would need PowerISO which can be +found in https://www.poweriso.com/poweriso-1.3.tar.gz +extract and put it in $HOME/.acetoneiso + +If for some reason cdrtools doesn't work with acetoneiso +use cdrkit from SBo and uninstall cdrtools. + +xorriso comes with Slackware so there is no need to install +it from AlienBob's repository diff --git a/multimedia/acetoneiso/acetoneiso.SlackBuild b/multimedia/acetoneiso/acetoneiso.SlackBuild new file mode 100644 index 0000000000..edd78e39b6 --- /dev/null +++ b/multimedia/acetoneiso/acetoneiso.SlackBuild @@ -0,0 +1,133 @@ +#!/bin/bash + +# Slackware build script for acetoneiso + +# Copyright 2016-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2022 Vijay Marcel +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=acetoneiso +VERSION=${VERSION:-2.4.3} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) + DEBARCH=i386 + ARCH=i586 + LIBDIRSUFFIX="" + ;; + x86_64) + DEBARCH=amd64 + ARCH=x86_64 + LIBDIRSUFFIX="64" + ;; + # unsupported + *) + echo "ARCH $( uname -m ) is unsupported" + exit 1 + ;; + esac +else + case "$ARCH" in + i?86) + DEBARCH=i386 + LIBDIRSUFFIX="" + ;; + x86_64) + DEBARCH=amd64 + LIBDIRSUFFIX="64" + ;; + # unsupported + *) + echo "$ARCH is unsupported" + exit 1 + ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e +trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir -pv $PRGNAM +cd $PRGNAM + +if [ "$DEBARCH" = "i386" ]; then + mv -v $CWD/acetoneiso_2.4-3+b1_i386.deb $CWD/$PRGNAM-$VERSION.deb + ar -x $CWD/$PRGNAM-$VERSION.deb + tar xvf data.tar.xz -C $PKG +elif [ "$DEBARCH" = "amd64" ]; then + mv -v $CWD/acetoneiso_2.4-3+b1_amd64.deb $CWD/$PRGNAM-$VERSION.deb + ar -x $CWD/$PRGNAM-$VERSION.deb + tar xvf data.tar.xz -C $PKG +else + echo "This program is not supported for your System Architecture" +fi + +cd $PKG +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +cd .. + +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 + +mv -v $PKG/usr/share/man $PKG/usr/ +rm -rvf $PKG/usr/share/man + +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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv -v $PKG/usr/share/doc/acetoneiso/* $PKG/usr/doc/$PRGNAM-$VERSION +rm -rvf $PKG/usr/share/doc/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/acetoneiso/acetoneiso.info b/multimedia/acetoneiso/acetoneiso.info new file mode 100644 index 0000000000..9ceb58f79f --- /dev/null +++ b/multimedia/acetoneiso/acetoneiso.info @@ -0,0 +1,10 @@ +PRGNAM="acetoneiso" +VERSION="2.4.3" +HOMEPAGE="https://packages.debian.org/bullseye/acetoneiso" +DOWNLOAD="http://http.us.debian.org/debian/pool/main/a/acetoneiso/acetoneiso_2.4-3+b1_i386.deb" +MD5SUM="ec4e63fbe75beedc13a1447f72e5e2f2" +DOWNLOAD_x86_64="http://http.us.debian.org/debian/pool/main/a/acetoneiso/acetoneiso_2.4-3+b1_amd64.deb" +MD5SUM_x86_64="24ea0feccc4607457cde50163303c74e" +REQUIRES="fuseiso p7zip youtube-dl" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/subtitlecomposer/doinst.sh b/multimedia/acetoneiso/doinst.sh index 0fb9c8b686..aea0f894eb 100644 --- a/multimedia/subtitlecomposer/doinst.sh +++ b/multimedia/acetoneiso/doinst.sh @@ -11,4 +11,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/multimedia/acetoneiso/slack-desc b/multimedia/acetoneiso/slack-desc new file mode 100644 index 0000000000..697a1982ff --- /dev/null +++ b/multimedia/acetoneiso/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +acetoneiso: acetoneiso (CD/DVD Image Manipulator for GNU/Linux) +acetoneiso: +acetoneiso: AcetoneISO is a feature rich and complete software solution +acetoneiso: to manage CD/DVD images. It will let you mount proprietary +acetoneiso: image formats such as ISO,NRG,MDF,BIN,IMG and do plenty of +acetoneiso: other things. +acetoneiso: +acetoneiso: Homepage:https://packages.debian.org/bullseye/acetoneiso +acetoneiso: +acetoneiso: +acetoneiso: diff --git a/multimedia/aegisub/README b/multimedia/aegisub/README index 44843a8d81..267d701606 100644 --- a/multimedia/aegisub/README +++ b/multimedia/aegisub/README @@ -1,3 +1,3 @@ -A general-purpose subtitle editor with ASS/SSA support +A general-purpose subtitle editor -Optional dependency: PortAudio +Optional dependency: portaudio diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild index e1d203730a..6bc267eb30 100644 --- a/multimedia/aegisub/aegisub.SlackBuild +++ b/multimedia/aegisub/aegisub.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aegisub -VERSION=${VERSION:-3.2.2} -BUILD=${BUILD:-2} +SRCNAM=Aegisub +VERSION=${VERSION:-3.3.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -MVER=3.2 - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) export ARCH=i586 ;; @@ -38,9 +37,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,24 +65,22 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$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 {} \; - -for i in $CWD/patches/* ; do patch -p1 < $i ; done -sed 's|gil/gil_all.hpp|gil.hpp|g' -i src/*.cpp # boost 1.69 -sed 's/$(LIBS_BOOST) $(LIBS_ICU)/$(LIBS_BOOST) $(LIBS_ICU) -pthread/' -i tools/Makefile # missing link flag + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +autoreconf -fiv LDFLAGS="$LDFLAGS -lz" \ CFLAGS="$SLKCFLAGS" \ CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' \ CXXFLAGS="$SLKCFLAGS" \ +FORCE_GIT_VERSION="TRUE" \ ./configure \ --prefix=/usr \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -95,18 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -ln -s $PRGNAM-$MVER $PKG/usr/bin/$PRGNAM - 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 -rm -f $PKG/usr/bin/aegisub -( - cd $PKG/usr/bin - ln -s aegisub-$MVER aegisub -) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md LICENCE $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/aegisub/aegisub.info b/multimedia/aegisub/aegisub.info index 249abeaab7..2f11f77bec 100644 --- a/multimedia/aegisub/aegisub.info +++ b/multimedia/aegisub/aegisub.info @@ -1,10 +1,10 @@ PRGNAM="aegisub" -VERSION="3.2.2" -HOMEPAGE="https://github.com/Aegisub/Aegisub" -DOWNLOAD="https://github.com/Aegisub/Aegisub/releases/download/v3.2.2/aegisub-3.2.2.tar.xz" -MD5SUM="d80e852c34811add358c06d77f5cd40d" +VERSION="3.3.3" +HOMEPAGE="https://github.com/wangqr/Aegisub/" +DOWNLOAD="https://github.com/wangqr/Aegisub/archive/v3.3.3/Aegisub-3.3.3.tar.gz" +MD5SUM="08d7750b8b7732b790e9756ca3195baf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass lua ffms2 wxGTK3" +REQUIRES="libass lua ffms2 wxGTK3 libuchardet" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/multimedia/aegisub/patches/boost.patch b/multimedia/aegisub/patches/boost.patch deleted file mode 100644 index 5d917f607e..0000000000 --- a/multimedia/aegisub/patches/boost.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Mon, 9 Jul 2018 20:15:29 +0000 -Subject: [PATCH] Keep using std::distance after Boost 1.68 - -src/search_replace_engine.cpp:256:14: error: call to - 'distance' is ambiguous - count += distance( - ^~~~~~~~ -/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = - boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >] -distance(_InputIter __first, _InputIter __last) -^ -/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = - boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >] - distance(SinglePassIterator first, SinglePassIterator last) - ^ ---- - src/search_replace_engine.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp -index 594c21e5e..14c71680d 100644 ---- a/src/search_replace_engine.cpp -+++ b/src/search_replace_engine.cpp -@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { - if (MatchState ms = matches(&diag, 0)) { - auto& diag_field = diag.*get_dialogue_field(settings.field); - std::string const& text = diag_field.get(); -- count += distance( -+ count += std::distance( - boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re), - boost::u32regex_iterator<std::string::const_iterator>()); - diag_field = u32regex_replace(text, *ms.re, settings.replace_with); diff --git a/multimedia/aegisub/patches/ffms2.patch b/multimedia/aegisub/patches/ffms2.patch deleted file mode 100644 index ed40181e14..0000000000 --- a/multimedia/aegisub/patches/ffms2.patch +++ /dev/null @@ -1,387 +0,0 @@ -From 1aa9215e7fc360de05da9b7ec2cd68f1940af8b2 Mon Sep 17 00:00:00 2001 -From: Thomas Goyne <plorkyeran@aegisub.org> -Date: Wed, 6 Apr 2016 11:24:21 -0700 -Subject: [PATCH] Use FFMS_DoIndexing2 when using a recent version of ffms2 - -And clean up the audio track selection logic a bit. ---- - src/audio_provider_ffmpegsource.cpp | 40 ++++++++------------------ - src/ffmpegsource_common.cpp | 44 +++++++++++++++++++++-------- - src/ffmpegsource_common.h | 25 +++++----------- - src/video_provider_ffmpegsource.cpp | 12 ++++---- - 4 files changed, 56 insertions(+), 65 deletions(-) - -diff --git a/src/audio_provider_ffmpegsource.cpp b/src/audio_provider_ffmpegsource.cpp -index 4e44b1d29..606d5b415 100644 ---- a/src/audio_provider_ffmpegsource.cpp -+++ b/src/audio_provider_ffmpegsource.cpp -@@ -91,18 +91,20 @@ void FFmpegSourceAudioProvider::LoadAudio(agi::fs::path const& filename) { - } - - std::map<int, std::string> TrackList = GetTracksOfType(Indexer, FFMS_TYPE_AUDIO); -- if (TrackList.empty()) -- throw agi::AudioDataNotFound("no audio tracks found"); - - // initialize the track number to an invalid value so we can detect later on - // whether the user actually had to choose a track or not - int TrackNumber = -1; - if (TrackList.size() > 1) { -- TrackNumber = AskForTrackSelection(TrackList, FFMS_TYPE_AUDIO); -- // if it's still -1 here, user pressed cancel -- if (TrackNumber == -1) -+ auto Selection = AskForTrackSelection(TrackList, FFMS_TYPE_AUDIO); -+ if (Selection == TrackSelection::None) - throw agi::UserCancelException("audio loading canceled by user"); -+ TrackNumber = static_cast<int>(Selection); - } -+ else if (TrackList.size() == 1) -+ TrackNumber = TrackList.begin()->first; -+ else -+ throw agi::AudioDataNotFound("no audio tracks found"); - - // generate a name for the cache file - agi::fs::path CacheName = GetCacheFilename(filename); -@@ -114,24 +116,13 @@ void FFmpegSourceAudioProvider::LoadAudio(agi::fs::path const& filename) { - if (Index && FFMS_IndexBelongsToFile(Index, filename.string().c_str(), &ErrInfo)) - Index = nullptr; - -- // index valid but track number still not set? - if (Index) { -- // track number not set? just grab the first track -- if (TrackNumber < 0) -- TrackNumber = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_AUDIO, &ErrInfo); -- if (TrackNumber < 0) -- throw agi::AudioDataNotFound(std::string("Couldn't find any audio tracks: ") + ErrInfo.Buffer); -- -- // index is valid and track number is now set, -- // but do we have indexing info for the desired audio track? -+ // we already have an index, but the desired track may not have been -+ // indexed, and if it wasn't we need to reindex - FFMS_Track *TempTrackData = FFMS_GetTrackFromIndex(Index, TrackNumber); - if (FFMS_GetNumFrames(TempTrackData) <= 0) - Index = nullptr; - } -- // no valid index exists and the file only has one audio track, index it -- else if (TrackNumber < 0) -- TrackNumber = FFMS_TRACKMASK_ALL; -- // else: do nothing (keep track mask as it is) - - // reindex if the error handling mode has changed - FFMS_IndexErrorHandling ErrorHandling = GetErrorHandlingMode(); -@@ -142,17 +133,10 @@ void FFmpegSourceAudioProvider::LoadAudio(agi::fs::path const& filename) { - - // moment of truth - if (!Index) { -- int TrackMask; -- if (OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() || TrackNumber == FFMS_TRACKMASK_ALL) -- TrackMask = FFMS_TRACKMASK_ALL; -- else -- TrackMask = (1 << TrackNumber); -- -+ TrackSelection TrackMask = static_cast<TrackSelection>(TrackNumber); -+ if (OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool()) -+ TrackMask = TrackSelection::All; - Index = DoIndexing(Indexer, CacheName, TrackMask, ErrorHandling); -- -- // if tracknumber still isn't set we need to set it now -- if (TrackNumber == FFMS_TRACKMASK_ALL) -- TrackNumber = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_AUDIO, &ErrInfo); - } - else - FFMS_CancelIndexing(Indexer); -diff --git a/src/ffmpegsource_common.cpp b/src/ffmpegsource_common.cpp -index 60a7e91e6..d66be0222 100644 ---- a/src/ffmpegsource_common.cpp -+++ b/src/ffmpegsource_common.cpp -@@ -60,7 +60,10 @@ FFmpegSourceProvider::FFmpegSourceProvider(agi::BackgroundRunner *br) - /// @param Indexer A pointer to the indexer object representing the file to be indexed - /// @param CacheName The filename of the output index file - /// @param Trackmask A binary mask of the track numbers to index --FFMS_Index *FFmpegSourceProvider::DoIndexing(FFMS_Indexer *Indexer, agi::fs::path const& CacheName, int Trackmask, FFMS_IndexErrorHandling IndexEH) { -+FFMS_Index *FFmpegSourceProvider::DoIndexing(FFMS_Indexer *Indexer, -+ agi::fs::path const& CacheName, -+ TrackSelection Track, -+ FFMS_IndexErrorHandling IndexEH) { - char FFMSErrMsg[1024]; - FFMS_ErrorInfo ErrInfo; - ErrInfo.Buffer = FFMSErrMsg; -@@ -78,8 +81,22 @@ FFMS_Index *FFmpegSourceProvider::DoIndexing(FFMS_Indexer *Indexer, agi::fs::pat - ps->SetProgress(Current, Total); - return ps->IsCancelled(); - }; -- Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE, -+#if FFMS_VERSION >= ((2 << 24) | (21 << 16) | (0 << 8) | 0) -+ if (Track == TrackSelection::All) -+ FFMS_TrackTypeIndexSettings(Indexer, FFMS_TYPE_AUDIO, 1, 0); -+ else if (Track != TrackSelection::None) -+ FFMS_TrackIndexSettings(Indexer, static_cast<int>(Track), 1, 0); -+ FFMS_SetProgressCallback(Indexer, callback, ps); -+ Index = FFMS_DoIndexing2(Indexer, IndexEH, &ErrInfo); -+#else -+ int Trackmask = 0; -+ if (Track == TrackSelection::All) -+ Trackmask = std::numeric_limits<int>::max(); -+ else if (Track != TrackSelection::None) -+ Trackmask = 1 << static_cast<int>(Track); -+ Index = FFMS_DoIndexing(Indexer, Trackmask, 0, - nullptr, nullptr, IndexEH, callback, ps, &ErrInfo); -+#endif - }); - - if (Index == nullptr) -@@ -99,21 +116,24 @@ std::map<int, std::string> FFmpegSourceProvider::GetTracksOfType(FFMS_Indexer *I - std::map<int,std::string> TrackList; - int NumTracks = FFMS_GetNumTracksI(Indexer); - -+ // older versions of ffms2 can't index audio tracks past 31 -+#if FFMS_VERSION < ((2 << 24) | (21 << 16) | (0 << 8) | 0) -+ if (Type == FFMS_TYPE_AUDIO) -+ NumTracks = std::min(NumTracks, std::numeric_limits<int>::digits); -+#endif -+ - for (int i=0; i<NumTracks; i++) { - if (FFMS_GetTrackTypeI(Indexer, i) == Type) { -- const char *CodecName = FFMS_GetCodecNameI(Indexer, i); -- if (CodecName) -- TrackList.insert(std::pair<int,std::string>(i, CodecName)); -+ if (auto CodecName = FFMS_GetCodecNameI(Indexer, i)) -+ TrackList[i] = CodecName; - } - } - return TrackList; - } - --/// @brief Ask user for which track he wants to load --/// @param TrackList A std::map with the track numbers as keys and codec names as values --/// @param Type The track type to ask about --/// @return Returns the track number chosen (an integer >= 0) on success, or a negative integer if the user cancelled. --int FFmpegSourceProvider::AskForTrackSelection(const std::map<int, std::string> &TrackList, FFMS_TrackType Type) { -+FFmpegSourceProvider::TrackSelection -+FFmpegSourceProvider::AskForTrackSelection(const std::map<int, std::string> &TrackList, -+ FFMS_TrackType Type) { - std::vector<int> TrackNumbers; - wxArrayString Choices; - -@@ -128,8 +148,8 @@ int FFmpegSourceProvider::AskForTrackSelection(const std::map<int, std::string> - Choices); - - if (Choice < 0) -- return Choice; -- return TrackNumbers[Choice]; -+ return TrackSelection::None; -+ return static_cast<TrackSelection>(TrackNumbers[Choice]); - } - - /// @brief Set ffms2 log level according to setting in config.dat -diff --git a/src/ffmpegsource_common.h b/src/ffmpegsource_common.h -index 8cb7f33f6..5f6df7cfa 100644 ---- a/src/ffmpegsource_common.h -+++ b/src/ffmpegsource_common.h -@@ -42,11 +42,6 @@ - - namespace agi { class BackgroundRunner; } - --/// Index all tracks --#define FFMS_TRACKMASK_ALL -1 --/// Index no tracks --#define FFMS_TRACKMASK_NONE 0 -- - /// @class FFmpegSourceProvider - /// @brief Base class for FFMS2 source providers; contains common functions etc - class FFmpegSourceProvider { -@@ -56,24 +51,18 @@ class FFmpegSourceProvider { - public: - FFmpegSourceProvider(agi::BackgroundRunner *br); - -- /// Logging level constants from avutil/log.h -- enum FFMS_LogLevel { -- /// nothing printed -- FFMS_LOG_QUIET = -8, -- FFMS_LOG_PANIC = 0, -- FFMS_LOG_FATAL = 8, -- FFMS_LOG_ERROR = 16, -- FFMS_LOG_WARNING = 24, -- FFMS_LOG_INFO = 32, -- FFMS_LOG_VERBOSE = 40, -- FFMS_LOG_DEBUG = 48, -+ enum class TrackSelection : int { -+ None = -1, -+ All = -2 - }; - - void CleanCache(); - -- FFMS_Index *DoIndexing(FFMS_Indexer *Indexer, agi::fs::path const& Cachename, int Trackmask, FFMS_IndexErrorHandling IndexEH); -+ FFMS_Index *DoIndexing(FFMS_Indexer *Indexer, agi::fs::path const& Cachename, -+ TrackSelection Track, -+ FFMS_IndexErrorHandling IndexEH); - std::map<int, std::string> GetTracksOfType(FFMS_Indexer *Indexer, FFMS_TrackType Type); -- int AskForTrackSelection(const std::map<int, std::string>& TrackList, FFMS_TrackType Type); -+ TrackSelection AskForTrackSelection(const std::map<int, std::string>& TrackList, FFMS_TrackType Type); - agi::fs::path GetCacheFilename(agi::fs::path const& filename); - void SetLogLevel(); - FFMS_IndexErrorHandling GetErrorHandlingMode(); -diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp -index 5fd14f69c..8bd68fbbf 100644 ---- a/src/video_provider_ffmpegsource.cpp -+++ b/src/video_provider_ffmpegsource.cpp -@@ -149,14 +149,12 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - if (TrackList.size() <= 0) - throw VideoNotSupported("no video tracks found"); - -- // initialize the track number to an invalid value so we can detect later on -- // whether the user actually had to choose a track or not - int TrackNumber = -1; - if (TrackList.size() > 1) { -- TrackNumber = AskForTrackSelection(TrackList, FFMS_TYPE_VIDEO); -- // if it's still -1 here, user pressed cancel -- if (TrackNumber == -1) -+ auto Selection = AskForTrackSelection(TrackList, FFMS_TYPE_VIDEO); -+ if (Selection == TrackSelection::None) - throw agi::UserCancelException("video loading cancelled by user"); -+ TrackNumber = static_cast<int>(Selection); - } - - // generate a name for the cache file -@@ -180,9 +178,9 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - - // moment of truth - if (!Index) { -- int TrackMask = FFMS_TRACKMASK_NONE; -+ auto TrackMask = TrackSelection::None; - if (OPT_GET("Provider/FFmpegSource/Index All Tracks")->GetBool() || OPT_GET("Video/Open Audio")->GetBool()) -- TrackMask = FFMS_TRACKMASK_ALL; -+ TrackMask = TrackSelection::All; - Index = DoIndexing(Indexer, CacheName, TrackMask, GetErrorHandlingMode()); - } - else { - -From 7a6da26be6a830f4e1255091952cc0a1326a4520 Mon Sep 17 00:00:00 2001 -From: Thomas Goyne <plorkyeran@aegisub.org> -Date: Fri, 8 Apr 2016 12:14:28 -0700 -Subject: [PATCH] Fix compilation on X11-using platforms - ---- - src/ffmpegsource_common.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/ffmpegsource_common.h b/src/ffmpegsource_common.h -index 5f6df7cfa..383d5baa2 100644 ---- a/src/ffmpegsource_common.h -+++ b/src/ffmpegsource_common.h -@@ -51,6 +51,9 @@ class FFmpegSourceProvider { - public: - FFmpegSourceProvider(agi::BackgroundRunner *br); - -+ // X11 is wonderful -+#undef None -+ - enum class TrackSelection : int { - None = -1, - All = -2 -commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37 -Author: Thomas Goyne <plorkyeran@aegisub.org> -Date: Wed Nov 21 16:41:05 2018 -0800 - - Update ffmpeg and ffms2 - -diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp -index 8bd68fbbf..f4ed6a2f2 100644 ---- a/src/video_provider_ffmpegsource.cpp -+++ b/src/video_provider_ffmpegsource.cpp -@@ -44,6 +44,23 @@ - #include <libaegisub/make_unique.h> - - namespace { -+typedef enum AGI_ColorSpaces { -+ AGI_CS_RGB = 0, -+ AGI_CS_BT709 = 1, -+ AGI_CS_UNSPECIFIED = 2, -+ AGI_CS_FCC = 4, -+ AGI_CS_BT470BG = 5, -+ AGI_CS_SMPTE170M = 6, -+ AGI_CS_SMPTE240M = 7, -+ AGI_CS_YCOCG = 8, -+ AGI_CS_BT2020_NCL = 9, -+ AGI_CS_BT2020_CL = 10, -+ AGI_CS_SMPTE2085 = 11, -+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12, -+ AGI_CS_CHROMATICITY_DERIVED_CL = 13, -+ AGI_CS_ICTCP = 14 -+} AGI_ColorSpaces; -+ - /// @class FFmpegSourceVideoProvider - /// @brief Implements video loading through the FFMS library. - class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider { -@@ -78,7 +95,7 @@ public: - if (matrix == RealColorSpace) - FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr); - else if (matrix == "TV.601") -- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); -+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr); - else - return; - ColorSpace = matrix; -@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) { - std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV"; - - switch (cs) { -- case FFMS_CS_RGB: -+ case AGI_CS_RGB: - return "None"; -- case FFMS_CS_BT709: -+ case AGI_CS_BT709: - return str + ".709"; -- case FFMS_CS_FCC: -+ case AGI_CS_FCC: - return str + ".FCC"; -- case FFMS_CS_BT470BG: -- case FFMS_CS_SMPTE170M: -+ case AGI_CS_BT470BG: -+ case AGI_CS_SMPTE170M: - return str + ".601"; -- case FFMS_CS_SMPTE240M: -+ case AGI_CS_SMPTE240M: - return str + ".240M"; - default: - throw VideoOpenError("Unknown video color space"); -@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - - // set thread count - int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt(); -+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0) - if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF) - Threads = 1; -+#endif - - // set seekmode - // TODO: give this its own option? -@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st - else - DAR = double(Width) / Height; - -- CS = TempFrame->ColorSpace; -+ int VideoCS = CS = TempFrame->ColorSpace; - CR = TempFrame->ColorRange; - -- if (CS == FFMS_CS_UNSPECIFIED) -- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG; -+ if (CS == AGI_CS_UNSPECIFIED) -+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG; - RealColorSpace = ColorSpace = colormatrix_description(CS, CR); - - #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0) -- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo)) -+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) { -+ CS = AGI_CS_BT470BG; -+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR); -+ } -+ -+ if (CS != VideoCS) { -+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo)) - throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer); -- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR); - } - #endif - diff --git a/multimedia/aegisub/patches/icu.patch b/multimedia/aegisub/patches/icu.patch deleted file mode 100644 index 2145140ed0..0000000000 --- a/multimedia/aegisub/patches/icu.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp ---- aegisub-3.2.2.orig/src/utils.cpp 2014-12-08 02:07:09.000000000 +0200 -+++ aegisub-3.2.2/src/utils.cpp 2017-04-26 11:11:15.438239182 +0300 -@@ -44,6 +44,7 @@ - #include <boost/filesystem/path.hpp> - #include <map> - #include <unicode/locid.h> -+#include <unicode/unistr.h> - #include <wx/clipbrd.h> - #include <wx/filedlg.h> - #include <wx/stdpaths.h> diff --git a/multimedia/aegisub/patches/make-4.3.patch b/multimedia/aegisub/patches/make-4.3.patch deleted file mode 100644 index 6edb8c3b5e..0000000000 --- a/multimedia/aegisub/patches/make-4.3.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001 -From: wangqr <wangqr@wangqr.tk> -Date: Mon, 17 Feb 2020 14:42:07 +0800 -Subject: [PATCH] Use target name without directory in $*_OBJ macro - -Fix Aegisub/Aegisub#171 ---- - Makefile.target | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.target b/Makefile.target -index 516ef3c24..5c4c5d259 100644 ---- a/Makefile.target -+++ b/Makefile.target -@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< - # Libraries contain all object files they depend on (but they may depend on other files) - # Not using libtool on OS X because it has an unsilenceable warning about a - # compatibility issue with BSD 4.3 (wtf) --lib%.a: $$($$*_OBJ) -+lib%.a: $$($$(*F)_OBJ) - @$(BIN_MKDIR_P) $(dir $@) - $(BIN_AR) cru $@ $(filter %.o,$^) - $(BIN_RANLIB) $@ diff --git a/multimedia/aegisub/slack-desc b/multimedia/aegisub/slack-desc index 053d304d0a..a29184e5ba 100644 --- a/multimedia/aegisub/slack-desc +++ b/multimedia/aegisub/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| aegisub: aegisub (General-purpose subtitle editor) aegisub: -aegisub: A general-purpose subtitle editor with ASS/SSA support +aegisub: A general-purpose subtitle editor aegisub: aegisub: -aegisub: Project Site: https://code.google.com/p/aegisub/ +aegisub: Project Site: https://github.com/wangqr/Aegisub aegisub: aegisub: aegisub: diff --git a/multimedia/anyremote/README b/multimedia/anyremote/README index 51fe66945a..198129cbe0 100644 --- a/multimedia/anyremote/README +++ b/multimedia/anyremote/README @@ -1,19 +1,23 @@ -The overall goal of this project is to provide remote control service on Linux -through Bluetooth, InfraRed, Wi-Fi or TCP/IP connection. +The overall goal of this project is to provide remote control service +on Linux through Bluetooth, InfraRed, Wi-Fi or TCP/IP connection. -anyRemote supports wide range of modern cell phones line Nokia, SonyEricsson, -Motorola and others. +anyRemote supports wide range of modern cell phones line Nokia, +SonyEricsson, Motorola and others. -anyRemote was developed as a thin "communication" layer between Buetooth -(IR, Wi-Fi)-capabled phone and Linux, and in principle could be configured -to manage almost any software. +anyRemote was developed as a thin "communication" layer between +Buetooth (IR, Wi-Fi)-capabled phone and Linux, and in principle could +be configured to manage almost any software. anyRemote could be used with: - * bluetooth connection with java client if cell phone is JSR82 compatible + * bluetooth connection with java client if cell phone is JSR82 + compatible * Wi-Fi connection with java client if phone supports Wi-Fi - * IR connection with java client if java in phone supports access to IR port - * TCP/IP connection with java client, if PC is connectable from internet + * IR connection with java client if java in phone supports access + to IR port + * TCP/IP connection with java client, if PC is connectable from + internet * bluetooth, infrared or cable connection using AT "modem" commands * web interface - * it supports some of IR remotes supplied with TV tuner cards (like LIRC) + * it supports some of IR remotes supplied with TV tuner cards (like + LIRC) * it has limited support for Bemused clients diff --git a/multimedia/anyremote/anyremote.SlackBuild b/multimedia/anyremote/anyremote.SlackBuild index 8bd5daa10f..576975c76c 100644 --- a/multimedia/anyremote/anyremote.SlackBuild +++ b/multimedia/anyremote/anyremote.SlackBuild @@ -14,7 +14,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -32,8 +32,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" diff --git a/multimedia/aom/README b/multimedia/aom/README index 40b686daea..dbddf20cbb 100644 --- a/multimedia/aom/README +++ b/multimedia/aom/README @@ -3,8 +3,5 @@ video transmission over the Internet. AV1 is planned to surpass VP9 and also to eventually be a competitor with HEVC/H.265. This script builds the encoder aomenc, the decoder aomdec as well -as shared libraries which can be utilised by recent versions of +as shared libraries which can be utilised by suitable versions of both FFmpeg and vlc. - -Note: 'aom' replaces and upgrades 'libaom'; make sure 'libaom' is -removed before using this SlackBuild. diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild index b986c266d6..ac01eefa93 100644 --- a/multimedia/aom/aom.SlackBuild +++ b/multimedia/aom/aom.SlackBuild @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Slackware build script for aom # -# Copyright (c) 2018-2021 Andrew Strong, Blue Mountains, Australia. +# Copyright (c) 2018-2022 Andrew Strong, Blue Mountains, Australia. # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -27,10 +27,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aom -# The 'official' archive for the aom 2.0.1 release has the git commit in +# The 'official' archive for the aom 3.3.0 release has the git commit in # the filename, so adjustments are required for a sane Slackware build: -VERSION=${VERSION:-2.0.1} -GITCOMMIT=${GITCOMMIT:-b52ee6d44adaef8a08f6984390de050d64df9faa} +VERSION=${VERSION:-3.3.0} +GITCOMMIT=${GITCOMMIT:-87460cef80fb03def7d97df1b47bad5432e5e2e4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -88,7 +88,7 @@ find -L . \ cd build # I don't build either the HTML or the Latex docs as IMHO at this stage - # of aom development they are not terribly useful for non-developers. + # of aom development they are still not terribly useful for non-developers. # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build # the docs and then uncomment the 'extra docs' section below to install them... @@ -97,8 +97,8 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_INCLUDEDIR=/include \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_INCLUDEDIR=include \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_NASM=1 \ -DENABLE_DOCS=0 \ diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info index 3537579242..052e807d5b 100644 --- a/multimedia/aom/aom.info +++ b/multimedia/aom/aom.info @@ -1,8 +1,8 @@ PRGNAM="aom" -VERSION="2.0.1" +VERSION="3.3.0" HOMEPAGE="https://aomedia.googlesource.com/aom" -DOWNLOAD="http://www.andrews-corner.org/downloads/aom-b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz" -MD5SUM="d37bf9cfe3353e661637c2b106ee1787" +DOWNLOAD="http://www.andrews-corner.org/downloads/aom-87460cef80fb03def7d97df1b47bad5432e5e2e4.tar.gz" +MD5SUM="8e722dae87dff97dfb98c3857fe38ee2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/apetag/apetag.SlackBuild b/multimedia/apetag/apetag.SlackBuild index 644918a692..7ee1e22e4a 100644 --- a/multimedia/apetag/apetag.SlackBuild +++ b/multimedia/apetag/apetag.SlackBuild @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Now maintained by B. Watson <yalhcru@gmail.com> +# Now maintained by B. Watson <urchlay@slackware.uk> # 20210910 bkw: BUILD=3, fix HTML doc. # 20160817 bkw: diff --git a/multimedia/apetag/apetag.info b/multimedia/apetag/apetag.info index 5f0e989312..4c7851cd8d 100644 --- a/multimedia/apetag/apetag.info +++ b/multimedia/apetag/apetag.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" diff --git a/multimedia/audio-recorder/audio-recorder.SlackBuild b/multimedia/audio-recorder/audio-recorder.SlackBuild index f911ebc25f..0687f58c4c 100644 --- a/multimedia/audio-recorder/audio-recorder.SlackBuild +++ b/multimedia/audio-recorder/audio-recorder.SlackBuild @@ -30,9 +30,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -42,14 +47,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -75,9 +72,9 @@ cd $PRGNAM 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 {} \+ aclocal autoconf @@ -91,13 +88,8 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 - -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 +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man*/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING ChangeLog README \ diff --git a/multimedia/audiopreview/README b/multimedia/audiopreview/README index 018848c451..020d938149 100644 --- a/multimedia/audiopreview/README +++ b/multimedia/audiopreview/README @@ -1,10 +1,12 @@ -AudioPreview is a small command-line tool for Linux that can play previews of: +AudioPreview is a small command-line tool for Linux that can play +previews of: + * Audio Files - o mp3, ogg, flac, rm, wma... + mp3, ogg, flac, rm, wma... * Video Files - o avi, mpg, ogg, mkv, ... + avi, mpg, ogg, mkv, ... * Internet Streams - o radio stations, video streams and audio streams, ... + radio stations, video streams and audio streams, ... For additional codec support, install the optional dependencies gst0-plugins-ugly and gst0-ffmpeg (for video support). diff --git a/multimedia/audiopreview/audiopreview.SlackBuild b/multimedia/audiopreview/audiopreview.SlackBuild index de464685bf..4483e79a90 100644 --- a/multimedia/audiopreview/audiopreview.SlackBuild +++ b/multimedia/audiopreview/audiopreview.SlackBuild @@ -20,9 +20,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -57,11 +54,11 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/multimedia/audiopreview/audiopreview.info b/multimedia/audiopreview/audiopreview.info index e11416c532..30010de22b 100644 --- a/multimedia/audiopreview/audiopreview.info +++ b/multimedia/audiopreview/audiopreview.info @@ -5,6 +5,6 @@ DOWNLOAD="https://launchpad.net/audiopreview/0.x/0.6/+download/audiopreview-0.6. MD5SUM="120f3ba6197c8008d8281e39874e3186" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="gstreamer0" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README index 18c21f4f53..39e6cb56a1 100644 --- a/multimedia/avidemux/README +++ b/multimedia/avidemux/README @@ -1,6 +1,8 @@ -Avidemux is a free video editor designed for simple cutting, filtering and -encoding tasks. It supports many file types, including AVI, DVD compatible -MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated -using projects, job queue and powerful scripting capabilities. +Avidemux is a free video editor designed for simple cutting, filtering +and encoding tasks. It supports many file types, including AVI, DVD +compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks +can be automated using projects, job queue and powerful scripting +capabilities. -Optional dependencies are aften, amrnb, jack, nv-codec-headers, and x265. +Optional dependencies are aften, amrnb, jack, nv-codec-headers, +and x265. diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index d6d537e9c6..6bcbcb6127 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -5,7 +5,7 @@ # Derived from a SlackBuild by Eric Hameleers. # Copyright 2009, 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # Copyright 2015 John Vogel Corning, NY USA -# Copyright 2017-2021 Matteo Bernardini, Pisa, IT +# Copyright 2017-2022 Matteo Bernardini, Pisa, IT # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,10 +25,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2: +# - man page was getting installed as a *file* called /usr/man/man1. fix. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avidemux -VERSION=${VERSION:-2.7.8} +VERSION=${VERSION:-2.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +44,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,11 +80,9 @@ 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 {} \; - -patch -p1 < $CWD/qt-5.15.diff + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1 @@ -97,7 +95,8 @@ make -C buildPluginsCLI DESTDIR="$PKG" install make -C buildPluginsCommon DESTDIR="$PKG" install install -Dm 644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png -install -Dm 644 man/avidemux.1 $PKG/usr/man/man1 +mkdir -p $PKG/usr/man/man1 +gzip -9c < man/avidemux.1 > $PKG/usr/man/man1/avidemux.1.gz make -C buildQt5 DESTDIR="$PKG" install make -C buildPluginsQt5 DESTDIR="$PKG" install diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 3b55b87854..948c45dcc6 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,8 +1,8 @@ PRGNAM="avidemux" -VERSION="2.7.8" +VERSION="2.8.1" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.7.8.tar.gz" -MD5SUM="15e2389c9c526b03bd3779a6a6da9db4" +DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz" +MD5SUM="fee41934cba460ec0fde2a453d5a6307" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faac faad2 libdca x264 xvidcore" diff --git a/multimedia/avidemux/qt-5.15.diff b/multimedia/avidemux/qt-5.15.diff deleted file mode 100644 index 5ebe3753c2..0000000000 --- a/multimedia/avidemux/qt-5.15.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp ---- avidemux_2.7.4/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2019-08-15 07:25:39.000000000 +0000 -+++ avidemux_2.7.4-fix/avidemux/qt4/ADM_UIs/src/T_RubberControl.cpp 2020-06-05 13:48:28.014061206 +0000 -@@ -8,6 +8,7 @@ - ***************************************************************************/// - - #include <QPainter> -+#include <QPainterPath> - #include <QRubberBand> - #include <QBoxLayout> - #include <QSizeGrip> diff --git a/multimedia/bdtools/bdtools.SlackBuild b/multimedia/bdtools/bdtools.SlackBuild index f8451b517c..6867148c25 100644 --- a/multimedia/bdtools/bdtools.SlackBuild +++ b/multimedia/bdtools/bdtools.SlackBuild @@ -24,25 +24,27 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2: +# - no execute permission on COPYING. +# - no useless INSTALL instructions in doc dir. +# - get rid of empty/useless /usr/share dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bdtools VERSION=${VERSION:-1.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,8 +54,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" @@ -77,9 +79,9 @@ 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 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -97,9 +99,11 @@ make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +install -m0644 COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -rm -rf $PKG/usr/share/doc/gtt +rm -rf $PKG/usr/share # 20220404 bkw: nothing there but doc/ + +rm -f $PKG/usr/lib*/*.la mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/beets/README b/multimedia/beets/README index c5ebb6cb95..a926da9257 100644 --- a/multimedia/beets/README +++ b/multimedia/beets/README @@ -24,5 +24,5 @@ panacea: If beets doesn't do what you want yet, writing your own plugin is shockingly simple if you know a little Python. -Optional dependencies: -Flask, pyacoustid, pylast, discogs-client. +Optional dependencies: +Flask, gst-python, pyacoustid, pylast. diff --git a/multimedia/beets/beet b/multimedia/beets/beet new file mode 100644 index 0000000000..5532252f29 --- /dev/null +++ b/multimedia/beets/beet @@ -0,0 +1,2 @@ +_load_beet_completion() { eval "$(beet completion)"; } +complete -F _load_beet_completion beet diff --git a/multimedia/beets/beets.SlackBuild b/multimedia/beets/beets.SlackBuild index ea2fd063ef..21d2b1b97e 100644 --- a/multimedia/beets/beets.SlackBuild +++ b/multimedia/beets/beets.SlackBuild @@ -2,6 +2,7 @@ # Slackware build script for beets +# Copyright 2022 fourtysixandtwo <fourtysixandtwo@sliderr.net> # Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # @@ -22,11 +23,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20221016 46and2: Added bash/zsh completions. +# 20221103 46and2: Rebuilt for python3-mediafile and python3-confuse. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=beets -VERSION=${VERSION:-1.4.9} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.6.0} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,7 +83,13 @@ 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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG + +mkdir -p $PKG/usr/share/bash-completion/completions +install -m644 $CWD/beet $PKG/usr/share/bash-completion/completions/ + +mkdir -p $PKG/usr/share/zsh/site-functions +install -m644 extra/_beet $PKG/usr/share/zsh/site-functions/ install -D -m644 man/beet.1 $PKG/usr/man/man1/beet.1 install -D -m644 man/beetsconfig.5 $PKG/usr/man/man5/beetsconfig.5 diff --git a/multimedia/beets/beets.info b/multimedia/beets/beets.info index 4ed8bec1cc..d6fa9440b2 100644 --- a/multimedia/beets/beets.info +++ b/multimedia/beets/beets.info @@ -1,10 +1,10 @@ PRGNAM="beets" -VERSION="1.4.9" +VERSION="1.6.0" HOMEPAGE="http://beets.radbox.org" -DOWNLOAD="https://github.com/beetbox/beets/releases/download/v1.4.9/beets-1.4.9.tar.gz" -MD5SUM="1218fb28fc270f59a6054135099a69f1" +DOWNLOAD="https://github.com/beetbox/beets/releases/download/v1.6.0/beets-1.6.0.tar.gz" +MD5SUM="d03cd61d7083bc62f4b17ce2808df0d8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mutagen munkres Unidecode musicbrainzngs PyYAML jellyfish" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +REQUIRES="mutagen munkres Unidecode musicbrainzngs jellyfish python3-confuse python3-mediafile" +MAINTAINER="fourtysixandtwo" +EMAIL="fourtysixandtwo@sliderr.net" diff --git a/multimedia/beets/slack-desc b/multimedia/beets/slack-desc index 2c53b0407a..0fb6331910 100644 --- a/multimedia/beets/slack-desc +++ b/multimedia/beets/slack-desc @@ -11,7 +11,7 @@ beets: beets: Beets is the media library management system for obsessive-compulsive beets: music geeks. beets: -beets: homepage: http://beets.radbox.org +beets: homepage: https://beets.io/ beets: beets: beets: diff --git a/multimedia/bino/README b/multimedia/bino/README index 89a0a9c9e9..c272804882 100644 --- a/multimedia/bino/README +++ b/multimedia/bino/README @@ -2,15 +2,12 @@ bino (3D video player) Bino is a 3D video player with multi-display support. -3D videos are more accurately called stereoscopic videos. Such videos -have separate views for the left and right eye and thus allow depth +3D videos are more accurately called stereoscopic videos. Such videos +have separate views for the left and right eyes and thus allow depth perception through stereopsis. -The left and right view of a stereoscopic video can be stored using -different layouts. Bino supports all commonly used layouts. -NOTE: -This SlackBuild build with Qt4 even though the default from upstream -is Qt5. It's still broken at this moment. +The left and right view of a stereoscopic video can be stored using +different layouts. Bino supports all commonly used layouts. -Optional dependency: lirc for infra-red support. -You may need to edit the SlackBuild to enable lirc. +Optional dependency: lirc for infra-red support. Autodetected, but +may be disabled with LIRC=no in the environment. diff --git a/multimedia/bino/bino.SlackBuild b/multimedia/bino/bino.SlackBuild index a8a4e7fb0f..63b9ce2019 100644 --- a/multimedia/bino/bino.SlackBuild +++ b/multimedia/bino/bino.SlackBuild @@ -22,10 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220215 bkw: Modified by SlackBuilds.org: +# - updated for v1.6.8 (old version wouldn't build on Slack 15.0). +# - build with qt5, not qt4. +# - autodetect and build with lirc if present. +# - drop freealut dep from .info (because upstream dropped it). +# - include the texinfo documentation in the package (/usr/info). + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bino -VERSION=${VERSION:-1.6.5} +VERSION=${VERSION:-1.6.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +45,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -75,10 +79,20 @@ 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 {} \+ +# 20220215 bkw: configure script doesn't pick up lirc's libraries, +# help it out a little. +if [ "${LIRC:-yes}" = "yes" ] && pkg-config --exists lirc; then + LIRCLIBS="-llirc -llirc_client" + LIRCOPT="--with-lirc" +else + LIRCOPT="--without-lirc" +fi + +lirc_LIBS="$LIRCLIBS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -89,20 +103,17 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --without-equalizer \ - --without-lirc \ - --with-qt-version=4 \ + $LIRCOPT \ + --with-qt-version=5 \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 +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 +mv $PKG/usr/share/info $PKG/usr/info +rm -f $PKG/usr/info/dir -rm -Rf $PKG/usr/info/dir $PKG/usr/share/info +gzip -9 $PKG/usr/man/man*/* $PKG/usr/info/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/bino/bino.info b/multimedia/bino/bino.info index 70fe81c67c..f3e5842ea3 100644 --- a/multimedia/bino/bino.info +++ b/multimedia/bino/bino.info @@ -1,10 +1,10 @@ PRGNAM="bino" -VERSION="1.6.5" +VERSION="1.6.8" HOMEPAGE="http://bino3d.org" -DOWNLOAD="http://download.savannah.nongnu.org/releases/bino/bino-1.6.5.tar.xz" -MD5SUM="36da300a320481ae9637c66f1f4617d9" +DOWNLOAD="https://bino3d.org/releases/bino-1.6.8.tar.xz" +MD5SUM="8a8e250e62e5e3c136eafc1ffc63e71d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="freealut libass" +REQUIRES="libass" MAINTAINER="William PC" EMAIL="w_calandrini[at]hotmail[dot]com" diff --git a/multimedia/bino/slack-desc b/multimedia/bino/slack-desc index 5fbdd2c990..422ba902d8 100644 --- a/multimedia/bino/slack-desc +++ b/multimedia/bino/slack-desc @@ -11,9 +11,9 @@ bino: bino: Bino is a 3D video player with multi-display support. bino: bino: 3D videos are more accurately called stereoscopic videos. Such videos -bino: have separate views for the left and right eye and thus allow depth +bino: have separate views for the left and right eyes and thus allow depth bino: perception through stereopsis. +bino: bino: The left and right view of a stereoscopic video can be stored using bino: different layouts. Bino supports all commonly used layouts. bino: -bino: diff --git a/multimedia/bombono-dvd/bombono-dvd.SlackBuild b/multimedia/bombono-dvd/bombono-dvd.SlackBuild index af35e4a7a1..b36426d4eb 100644 --- a/multimedia/bombono-dvd/bombono-dvd.SlackBuild +++ b/multimedia/bombono-dvd/bombono-dvd.SlackBuild @@ -23,6 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220215 bkw: Modified by SlackBuilds.org, fix build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bombono-dvd @@ -39,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -76,28 +75,23 @@ 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 {} \+ + +# 20220215 bkw: ported the stupid scons stuff to python3, since +# 15.0's scons doesn't do python2. +patch -p1 < $CWD/patches/scons.diff -# specify our CFLAGS -sed -i "s|-O2||" SConstruct # Allow use of cdrtools as an alternative to cdrkit, thanks gentoo patch -p1 < $CWD/patches/bombono-dvd-1.2.0-cdrtools.patch -# Fix for the newer ffmpeg - thanks ArchLinux -patch -p1 < $CWD/patches/fix_ffmpeg_codecid.patch +# 20220215 bkw: more boost breakage. this is upstream's commit e0956f48d5, +# but slightly edited to remove the reference to README (which won't apply). +patch -p1 < $CWD/patches/boost-1.78.diff -# Credit to ARCH Linux -patch -p1 < $CWD/patches/fix_ptr2bool_cast.patch -patch -p1 < $CWD/patches/fix_c++11_literal_warnings.patch -patch -p1 < $CWD/patches/autoptr2uniqueptr.patch -patch -p1 < $CWD/patches/boost.patch -patch -p1 < $CWD/patches/fix_operator_ambiguity.patch -patch -p1 < $CWD/patches/fix_throw_specifications.patch - -# Fix for ffmpeg-3 -patch -p1 < $CWD/patches/ffmpeg3.patch +# specify our CFLAGS +sed -i "s|-O2||" SConstruct # Build package scons \ @@ -123,13 +117,10 @@ scons \ DESTDIR=$PKG \ install -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 +strip $PKG/usr/bin/* mv $PKG/usr/share/man $PKG/usr/ - -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 +gzip -9 $PKG/usr/man/man*/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/bombono-dvd/patches/autoptr2uniqueptr.patch b/multimedia/bombono-dvd/patches/autoptr2uniqueptr.patch deleted file mode 100644 index ca4c045537..0000000000 --- a/multimedia/bombono-dvd/patches/autoptr2uniqueptr.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bombono-dvd-1.2.2/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp 2015-11-26 20:06:48.693423531 +0330 -@@ -39,7 +39,7 @@ - slots = static_cast<tss_slots*>( pthread_getspecific(tss_data_native_key())); - if (slots == 0) - { -- std::auto_ptr<tss_slots> temp( new_object_ensure_delete<tss_slots>() ); -+ std::unique_ptr<tss_slots> temp( new_object_ensure_delete<tss_slots>() ); - // pre-allocate a few elems, so that we'll be fast - temp->resize(BOOST_LOG_TSS_SLOTS_SIZE); - - diff --git a/multimedia/bombono-dvd/patches/boost-1.78.diff b/multimedia/bombono-dvd/patches/boost-1.78.diff new file mode 100644 index 0000000000..c5df5c413b --- /dev/null +++ b/multimedia/bombono-dvd/patches/boost-1.78.diff @@ -0,0 +1,914 @@ +diff --git a/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp b/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp +index 3077276..af9afd2 100644 +--- a/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp ++++ b/libs/boost-logging/boost/logging/detail/tss/tss_impl_pthread.hpp +@@ -39,7 +39,7 @@ inline tss_slots* get_slots() + slots = static_cast<tss_slots*>( pthread_getspecific(tss_data_native_key())); + if (slots == 0) + { +- std::auto_ptr<tss_slots> temp( new_object_ensure_delete<tss_slots>() ); ++ std::unique_ptr<tss_slots> temp( new_object_ensure_delete<tss_slots>() ); + // pre-allocate a few elems, so that we'll be fast + temp->resize(BOOST_LOG_TSS_SLOTS_SIZE); + +diff --git a/src/mbase/project/media.cpp b/src/mbase/project/media.cpp +index 81e44d2..5f9e4f6 100644 +--- a/src/mbase/project/media.cpp ++++ b/src/mbase/project/media.cpp +@@ -58,7 +58,9 @@ void StorageMD::MakeByPath(const std::string& path, bool cnv_to_utf8, + + std::string MakeAutoName(const std::string& str, int old_sz) + { +- return (str::stream() << str << " " << old_sz+1).str(); ++ str::stream ss; ++ ss << str << " " << old_sz+1; ++ return ss.str(); + } + + void VideoMD::AddChapter(ChapterItem chp) +diff --git a/src/mbase/project/menu.cpp b/src/mbase/project/menu.cpp +index 1f25817..94b8755 100644 +--- a/src/mbase/project/menu.cpp ++++ b/src/mbase/project/menu.cpp +@@ -166,7 +166,9 @@ void MenuMD::SerializeImpl(Archieve& ar) + static std::string MakeObjectPath(int idx, const char* type) + { + ASSERT( idx != NO_HNDL ); +- return (str::stream() << type << "." << idx).str(); ++ str::stream ss; ++ ss << type << "." << idx; ++ return ss.str(); + } + + std::string GetMediaRef(MediaItem mi) +@@ -197,7 +199,9 @@ class RefMaker: public ObjVisitor + void RefMaker::Visit(VideoChapterMD& obj) + { + refStr = GetMediaRef(obj.owner); +- refStr += (str::stream() << "." << ChapterPosInt(&obj)).str(); ++ str::stream ss; ++ ss << "." << ChapterPosInt(&obj); ++ refStr += ss.str(); + } + + std::string Media2Ref(MediaItem mi) +@@ -233,8 +237,9 @@ int GetRefIndex(const char*& str) + + std::string ThrowBadIndex(const char* prefix, int idx) + { +- throw std::runtime_error( +- (str::stream() << prefix << idx).str() ); ++ str::stream ss; ++ ss << prefix << idx; ++ throw std::runtime_error(ss.str()); + } + + MediaItem TryGetMedia(int idx) +diff --git a/src/mbase/project/serialization.h b/src/mbase/project/serialization.h +index ff5b7a9..547c438 100644 +--- a/src/mbase/project/serialization.h ++++ b/src/mbase/project/serialization.h +@@ -75,7 +75,9 @@ namespace ToString + template<typename T> + std::string MakeString(const T& t) + { +- return (str::stream() << t).str(); ++ str::stream ss; ++ ss << t; ++ return ss.str(); + } + + template<typename T> +diff --git a/src/mbase/project/srl-common.cpp b/src/mbase/project/srl-common.cpp +index c2c92b5..ab1c62b 100644 +--- a/src/mbase/project/srl-common.cpp ++++ b/src/mbase/project/srl-common.cpp +@@ -36,10 +36,12 @@ void Serialize(Archieve& ar, MenuParams& mp) + std::string ToString(const RGBA::Pixel& pxl) + { + using Mpeg::set_hms; +- return (str::stream("#") << std::hex +- << set_hms() << (int)pxl.red +- << set_hms() << (int)pxl.green +- << set_hms() << (int)pxl.blue << (int)pxl.alpha).str(); ++ str::stream ss ("#"); ++ ss << std::hex ++ << set_hms() << (int)pxl.red ++ << set_hms() << (int)pxl.green ++ << set_hms() << (int)pxl.blue << (int)pxl.alpha; ++ return ss.str(); + } + + // как pango_color_parse() +diff --git a/src/mbase/project/srl-db.cpp b/src/mbase/project/srl-db.cpp +index c3babec..e50a523 100644 +--- a/src/mbase/project/srl-db.cpp ++++ b/src/mbase/project/srl-db.cpp +@@ -102,7 +102,7 @@ void DbSerializeProjectImpl(Archieve& ar) + } + + void ADatabase::Load(const std::string& fname, +- const std::string& cur_dir) throw (std::exception) ++ const std::string& cur_dir) + { + try + { +diff --git a/src/mbase/project/table.cpp b/src/mbase/project/table.cpp +index 455c334..3e52383 100644 +--- a/src/mbase/project/table.cpp ++++ b/src/mbase/project/table.cpp +@@ -29,6 +29,7 @@ + #include "theme.h" + + #include <mbase/resources.h> ++#include <boost/filesystem/directory.hpp> + + + const char* APROJECT_VERSION = "1.2.4"; +@@ -154,7 +155,7 @@ NameValueT<Media> LoadMedia(Archieve& ar, MediaList& md_list) + void SerializePath(Archieve& ar, const char* tag_name, std::string& fpath) + { + //ar & NameValue("Path", mdPath); +- fs::path rel_to_dir = fs::path(AData().GetProjectFName()).branch_path(); ++ fs::path rel_to_dir = fs::path(AData().GetProjectFName()).parent_path(); + if( ar.IsLoad() ) + { + ar >> NameValue(tag_name, fpath); +@@ -162,7 +163,7 @@ void SerializePath(Archieve& ar, const char* tag_name, std::string& fpath) + if( !fpath.empty() ) + { + fs::path pth(fpath); +- if( !pth.is_complete() ) ++ if( !pth.is_absolute() ) + fpath = (rel_to_dir/fpath).string(); + } + } +diff --git a/src/mbase/project/table.h b/src/mbase/project/table.h +index 7c73085..cc7e36d 100644 +--- a/src/mbase/project/table.h ++++ b/src/mbase/project/table.h +@@ -128,7 +128,7 @@ class ADatabase: public Singleton<ADatabase>, public DataWare + void ClearSettings(); + + void Load(const std::string& fname, +- const std::string& cur_dir = std::string()) throw (std::exception); ++ const std::string& cur_dir = std::string()); + bool Save(); + + bool SaveAs(const std::string& fname, +diff --git a/src/mbase/project/tests/test_table.cpp b/src/mbase/project/tests/test_table.cpp +index f8a1c20..3e7115a 100644 +--- a/src/mbase/project/tests/test_table.cpp ++++ b/src/mbase/project/tests/test_table.cpp +@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( TestMediaList ) + // проверка чтения/записи путей + boost::intrusive_ptr<StillImageMD> pict2 = ptr::dynamic_pointer_cast<StillImageMD>(ml[2]); + fs::path pth = pict2->GetPath(); +- BOOST_CHECK( pth.is_complete() ); ++ BOOST_CHECK( pth.is_absolute() ); + BOOST_CHECK( fs::exists(pth) ); + + // проверка ссылок +diff --git a/src/mdemux/dvdread.cpp b/src/mdemux/dvdread.cpp +index d8392b1..12fcae6 100644 +--- a/src/mdemux/dvdread.cpp ++++ b/src/mdemux/dvdread.cpp +@@ -35,8 +35,10 @@ namespace DVD { + std::string VobFName(VobPos& pos, const std::string& suffix) + { + using Mpeg::set_hms; +- return (str::stream("Video") << set_hms() << int(pos.Vts()) +- << "-" << set_hms() << pos.VobId() << suffix << ".vob").str(); ++ str::stream ss ("Video"); ++ ss << set_hms() << int(pos.Vts()) ++ << "-" << set_hms() << pos.VobId() << suffix << ".vob"; ++ return ss.str(); + } + + typedef boost::function<void(int, double)> VobTimeFnr; +@@ -282,9 +284,11 @@ VobPtr FindVob(VobArr& dvd_vobs, uint8_t vts, uint16_t vob_id) + static void TryDVDReadBlocks(dvd_file_t* file, int off, size_t cnt, char* buf) + { + int real_cnt = DVDReadBlocks(file, off, cnt, (unsigned char*)buf); +- if( (int)cnt != real_cnt ) +- throw std::runtime_error( (str::stream() << real_cnt << +- " != DVDReadBlocks(" << cnt << ")").str() ); ++ if( (int)cnt != real_cnt ) { ++ str::stream ss; ++ ss << real_cnt << " != DVDReadBlocks(" << cnt << ")"; ++ throw std::runtime_error( ss.str() ); ++ } + } + + // размер буфера должен соответствовать читаемому диапазону +diff --git a/src/mdemux/mpeg2demux.cpp b/src/mdemux/mpeg2demux.cpp +index bb7b1b1..ecb3774 100644 +--- a/src/mdemux/mpeg2demux.cpp ++++ b/src/mdemux/mpeg2demux.cpp +@@ -71,7 +71,9 @@ bool DemuxSvc::Filter(uint32_t code) + + static std::string MakePESKey(int id, const char* ext) + { +- return (str::stream() << id << "." << ext).str(); ++ str::stream ss; ++ ss << id << "." << ext; ++ return ss.str(); + } + + static bool ReadPart(io::stream& strm, uint8_t* buf, int sz, int& len) +@@ -110,7 +112,9 @@ static std::string MakeKeyNameForLPCM(int track, uint8_t inf) + ASSERT(0); + } + +- std::string header_str = (str::stream() << sample_rate << ":" << channels << ":" << bps << ".lpcm").str(); ++ str::stream ss; ++ ss << sample_rate << ":" << channels << ":" << bps << ".lpcm"; ++ std::string header_str = ss.str(); + return MakePESKey(track, header_str.c_str()); + } + +diff --git a/src/mdemux/seek.cpp b/src/mdemux/seek.cpp +index e46658f..f0ce934 100644 +--- a/src/mdemux/seek.cpp ++++ b/src/mdemux/seek.cpp +@@ -37,8 +37,10 @@ std::string SecToHMS(double len, bool round_sec) + int hh = min / 60; + int mm = min - hh*60; + +- return (str::stream() << set_hms() << hh << ":" +- << set_hms() << mm << ":" << set_hms() << ss).str(); ++ str::stream strss; ++ strss << set_hms() << hh << ":" ++ << set_hms() << mm << ":" << set_hms() << ss; ++ return strss.str(); + } + + bool MediaInfo::InitBegin(VideoLine& vl) +diff --git a/src/mgui/author/burn.cpp b/src/mgui/author/burn.cpp +index ddfad0a..578429e 100644 +--- a/src/mgui/author/burn.cpp ++++ b/src/mgui/author/burn.cpp +@@ -85,7 +85,7 @@ BurnData& GetInitedBD() + return bd; + } + +-re::pattern WriteSpeed_RE("Write Speed #"RG_NUM":"RG_SPS RG_NUM"\\."RG_NUM "x1385"); ++re::pattern WriteSpeed_RE("Write Speed #" RG_NUM ":" RG_SPS RG_NUM "\\." RG_NUM "x1385"); + + RefPtr<Gtk::ListStore> sp_store; + +@@ -253,7 +253,7 @@ DVDInfo ParseDVDInfo(bool is_good, const std::string& out_info) + } + else + { +- static re::pattern media_type_re("Mounted Media:"RG_SPS"[0-9A-F]+h, ([^ \n]+)"); ++ static re::pattern media_type_re("Mounted Media:" RG_SPS "[0-9A-F]+h, ([^ \n]+)"); + re::match_results what; + + bool is_found = re::search(out_info, what, media_type_re); +@@ -277,7 +277,7 @@ DVDInfo ParseDVDInfo(bool is_good, const std::string& out_info) + // isBlank + if( res != dvdOTHER ) + { +- static re::pattern media_status_re("Disc status:"RG_SPS"([a-z]+)\n"); ++ static re::pattern media_status_re("Disc status:" RG_SPS "([a-z]+)\n"); + bool is_found = re::search(out_info, what, media_status_re); + ASSERT_RTL( is_found ); + +diff --git a/src/mgui/author/execute.cpp b/src/mgui/author/execute.cpp +index 5b2330c..e308552 100644 +--- a/src/mgui/author/execute.cpp ++++ b/src/mgui/author/execute.cpp +@@ -64,9 +64,9 @@ static void InitFoundStageTag(RefPtr<Gtk::TextTag> tag) + tag->property_foreground() = "darkgreen"; + } + +-re::pattern DVDAuthorRE(RG_CMD_BEG"dvdauthor"RG_EW ".*-x"RG_EW RG_SPS RG_BW"DVDAuthor\\.xml"RG_EW); +-re::pattern MkIsoFsRE(RG_CMD_BEG MK_ISO_CMD RG_EW ".*-dvd-video"RG_EW ".*>.*"RG_BW"dvd.iso"RG_EW); +-re::pattern GrowIsoFsRE(RG_CMD_BEG"growisofs"RG_EW ".*-dvd-compat"RG_EW ".*-dvd-video"RG_EW); ++re::pattern DVDAuthorRE(RG_CMD_BEG"dvdauthor" RG_EW ".*-x" RG_EW RG_SPS RG_BW "DVDAuthor\\.xml" RG_EW); ++re::pattern MkIsoFsRE(RG_CMD_BEG MK_ISO_CMD RG_EW ".*-dvd-video" RG_EW ".*>.*" RG_BW "dvd.iso" RG_EW); ++re::pattern GrowIsoFsRE(RG_CMD_BEG"growisofs" RG_EW ".*-dvd-compat" RG_EW ".*-dvd-video" RG_EW); + + //static void PrintMatchResults(const re::match_results& what) + //{ +@@ -94,7 +94,7 @@ class MkIsoFsPP: public ProgressParser + virtual void Filter(const std::string& line); + }; + +-re::pattern MkIsoFsPercent_RE( RG_FLT"?% done"); ++re::pattern MkIsoFsPercent_RE( RG_FLT "?% done"); + + void MkIsoFsPP::Filter(const std::string& line) + { +@@ -126,8 +126,8 @@ class DVDAuthorPP: public ProgressParser + bool fixStage; + }; + +-re::pattern DVDAuthorVOB_RE( "^STAT: VOBU "RG_NUM" at "RG_NUM"MB"); +-re::pattern DVDAuthorFix_RE( "^STAT: fixing VOBU at "RG_NUM"MB \\("RG_NUM"/"RG_NUM", "RG_NUM"%\\)"); ++re::pattern DVDAuthorVOB_RE( "^STAT: VOBU " RG_NUM " at " RG_NUM "MB"); ++re::pattern DVDAuthorFix_RE( "^STAT: fixing VOBU at " RG_NUM "MB \\(" RG_NUM "/" RG_NUM ", " RG_NUM "%\\)"); + + void DVDAuthorPP::Filter(const std::string& line) + { +@@ -157,7 +157,7 @@ void DVDAuthorPP::Filter(const std::string& line) + if( p ) + of.SetProgress(p); + +- static re::pattern ch_error_re("ERR:.*Cannot jump to chapter "RG_NUM" of title "RG_NUM", only "RG_NUM" exist"); ++ static re::pattern ch_error_re("ERR:.*Cannot jump to chapter " RG_NUM " of title " RG_NUM ", only " RG_NUM " exist"); + if( re::search(line, what, ch_error_re) ) + { + std::string& err_str = of.firstError; +diff --git a/src/mgui/author/render.cpp b/src/mgui/author/render.cpp +index 1ffbca2..81720d7 100644 +--- a/src/mgui/author/render.cpp ++++ b/src/mgui/author/render.cpp +@@ -866,7 +866,7 @@ std::string FFmpegPostArgs(const std::string& out_fname, bool is_4_3, bool is_pa + // + // :KLUDGE: (только) в ffmpeg, avformat 53.13.0, поменяли . на : => надо + // самим открывать файл и узнавать индекс! +- static re::pattern audio_idx("Stream #"RG_NUM"[\\.|:]"RG_NUM".*Audio:"); ++ static re::pattern audio_idx("Stream #" RG_NUM "[\\.|:]" RG_NUM ".*Audio:"); + + re::match_results what; + // флаг означает, что перевод строки не может быть точкой +@@ -1221,17 +1221,17 @@ void TestFFmpegForDVDEncoding(const std::string& conts) + { + CheckNoCodecs(CheckForCodecList(conts)); + +- static re::pattern dvd_format("^ .E dvd"RG_EW); ++ static re::pattern dvd_format("^ .E dvd" RG_EW); + CheckStrippedFFmpeg(dvd_format, conts, "dvd format"); + + // :TRICKY: с версии libavcodec 54 при выводе начальный пробел не ставят => поэтому ? + // ("спасибо" Anton Khirnov за очередное "улучшение") + #define _CPP_ "^ ?" +- static re::pattern mpeg2video_codec(_CPP_".EV... mpeg2video"RG_EW); ++ static re::pattern mpeg2video_codec(_CPP_ ".EV... mpeg2video" RG_EW); + CheckStrippedFFmpeg(mpeg2video_codec, conts, "mpeg2 video encoder"); + + // по факту ffmpeg всегда использует ac3, однако mp2 тоже возможен +- static re::pattern ac3_codec(_CPP_".EA... ac3"RG_EW); ++ static re::pattern ac3_codec(_CPP_ ".EA... ac3" RG_EW); + CheckStrippedFFmpeg(ac3_codec, conts, "ac3 audio encoder"); + #undef _CPP_ + } +@@ -1241,7 +1241,7 @@ TripleVersion FindAVVersion(const std::string& conts, const char* avlib_name) + // * ищем версию libavfilter + // пример: " libavfilter 0. 4. 0 / " + #define RG_PADNUM RG_SPS RG_NUM +- std::string reg_str = boost::format(RG_BW"%1%"RG_PADNUM"\\."RG_PADNUM"\\."RG_PADNUM" / ") ++ std::string reg_str = boost::format(RG_BW "%1%" RG_PADNUM "\\." RG_PADNUM "\\." RG_PADNUM " / ") + % avlib_name % bf::stop; + re::pattern avfilter_version(reg_str.c_str()); + return FindVersion(conts, avfilter_version, AVCnvBin(), avlib_name); +@@ -1307,7 +1307,9 @@ FFmpegVersion CheckFFDVDEncoding() + + bool RenderMainPicture(const std::string& out_dir, Menu mn, int i) + { +- Author::Info((str::stream() << "Rendering menu \"" << mn->mdName << "\" ...").str()); ++ str::stream ss; ++ ss << "Rendering menu \"" << mn->mdName << "\" ..."; ++ Author::Info(ss.str()); + const std::string mn_dir = MakeMenuPath(out_dir, mn, i); + + if( IsMotion(mn) ) +diff --git a/src/mgui/author/script.cpp b/src/mgui/author/script.cpp +index ccfd32f..f2b1c7e 100644 +--- a/src/mgui/author/script.cpp ++++ b/src/mgui/author/script.cpp +@@ -130,7 +130,9 @@ static std::string MakeFPTarget(MediaItem mi) + { + VideoItem vi = IsVideo(mi); + ASSERT( vi ); +- str = (str::stream() << "title " << GetAuthorNumber(vi)).str(); ++ str::stream ss; ++ ss << "title " << GetAuthorNumber(vi); ++ str = ss.str(); + } + return str; + } +@@ -179,7 +181,9 @@ void TargetCommandVis::Visit(VideoChapterMD& obj) + // Потому: для удоства пользователей даем создавать нулевую главу, разрешая это здесь + // (однако доп. нулевые главы будут приводить к ошибке Cannot jump to chapter N ... only M exist) + int c_num = ChapterPosInt(&obj) + (owner->List()[0]->chpTime ? 2 : 1) ; +- res = (str::stream() << "jump title " << v_num << " chapter " << c_num << ";").str(); ++ str::stream ss; ++ ss << "jump title " << v_num << " chapter " << c_num << ";"; ++ res = ss.str(); + } + + static std::string MakeButtonJump(MediaItem mi, bool vts_domain) +@@ -204,7 +208,9 @@ std::string MenuAuthorDir(Menu mn, int idx, bool cnv_from_utf8) + if( !fs::native(name) ) + name = "Menu"; + +- std::string fname = (str::stream() << idx+1 << "." << name).str(); ++ str::stream ss; ++ ss << idx+1 << "." << name; ++ std::string fname = ss.str(); + return cnv_from_utf8 ? ConvertPathFromUtf8(fname) : fname ; + } + +@@ -626,7 +632,9 @@ static void CopyRootFile(const std::string& fname, const std::string& out_dir) + void AuthorSectionInfo(const std::string& str) + { + Author::Info("\n#", false); +- Author::Info((str::stream() << "# " << str).str(), false); ++ str::stream ss; ++ ss << "# " << str; ++ Author::Info(ss.str(), false); + Author::Info("#\n", false); + } + +@@ -676,7 +684,7 @@ static void CheckSpumuxFontFile() + if( !fs::exists(font_path) ) + { + std::string err_str; +- if( !CreateDirs(font_path.branch_path(), err_str) ) ++ if( !CreateDirs(font_path.parent_path(), err_str) ) + Error(err_str.c_str()); + fs::copy_file(DataDirPath("copy-n-paste/FreeSans.ttf"), font_path); + } +@@ -755,9 +763,9 @@ static void CalcTransPercent(double cur_dur, Job& job, JobData& jd, double full_ + // ffmpeg выводит статистику первого создаваемого файла каждые полсекунды, + // см. print_report() (при verbose=1, по умолчанию) + // Формат размера: "size=%8.0fkB" +-re::pattern FFmpegSizePat( "size= *"RG_NUM"kB"); ++re::pattern FFmpegSizePat( "size= *" RG_NUM "kB"); + // Формат длительности: "time=%0.2f" +-re::pattern FFmpegDurPat( "time="RG_FLT); ++re::pattern FFmpegDurPat( "time=" RG_FLT); + + static void OnTranscodePrintParse(const char* dat, int sz, const PercentFunctor& fnr) + { +@@ -787,7 +795,7 @@ static void OnTranscodePrintParse(const char* dat, int sz, const PercentFunctor& + + // Формат длительности для ffmpeg c коммита dd471070: "time=%02d:%02d:%02d.%02d" + // Образец: frame= 208 fps= 58 q=2.0 size= 476kB time=00:00:08.44 bitrate= 461.9kbits/s dup=1 drop=0 +-re::pattern FFmpegNewDurPat( "time="RG_NUM":"RG_NUM":"RG_FLT); ++re::pattern FFmpegNewDurPat( "time=" RG_NUM ":" RG_NUM ":" RG_FLT); + + static void OnTranscodeHMSParse(const char* dat, int sz, const PercentFunctor& fnr) + { +@@ -1082,7 +1090,9 @@ static void TranscodeVideos(int pass, const std::string& out_dir) + + static void AuthorImpl(const std::string& out_dir) + { +- AuthorSectionInfo((str::stream() << "Build DVD-Video in folder: " << out_dir).str()); ++ str::stream ss; ++ ss << "Build DVD-Video in folder: " << out_dir; ++ AuthorSectionInfo(ss.str()); + IteratePendingEvents(); + + IndexVideosForAuthoring(); +@@ -1136,7 +1146,7 @@ static void AuthorImpl(const std::string& out_dir) + // 2) парсер dvdauthor не любит незнакомые ему атрибуты => spumux < 0.7 не работает + std::string help_str; + PipeOutput("spumux -h", help_str); +- static re::pattern spumux_version("DVDAuthor::spumux, version "RG_NUM"\\."RG_NUM"\\."RG_NUM"\\.\n"); ++ static re::pattern spumux_version("DVDAuthor::spumux, version " RG_NUM "\\." RG_NUM "\\." RG_NUM "\\.\n"); + if( IsVersionGE(FindVersion(help_str, spumux_version, "spumux"), TripleVersion(0, 7, 0)) ) + AddFormatAttr(sp); + +diff --git a/src/mgui/dvdimport.cpp b/src/mgui/dvdimport.cpp +index 44dcdec..fc9b965 100644 +--- a/src/mgui/dvdimport.cpp ++++ b/src/mgui/dvdimport.cpp +@@ -211,10 +211,11 @@ static void OnPreparePage(ImportData& id) + row[VF().selState] = false; + row[VF().name] = VobFName(vob.pos); + row[VF().thumbnail] = vob.aspect == af4_3 ? pix4_3 : pix16_9; +- std::string desc = (str::stream(Mpeg::SecToHMS(vob.tmLen, true)) << ", " +- << vob.sz.x << "x" << vob.sz.y << ", " +- << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " +- << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB")).str(); ++ str::stream ss (Mpeg::SecToHMS(vob.tmLen, true)); ++ ss << ", " << vob.sz.x << "x" << vob.sz.y << ", " ++ << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " ++ << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB"); ++ std::string desc = ss.str(); + row[VF().desc] = desc; + } + CompleteSelection(id, false); +@@ -275,7 +276,7 @@ static ReaderPtr OpenDVD(const std::string& dvd_path, ImportData& id) + id.errLbl.hide(); + + id.reader = rd; +- SetCurPageComplete(id.ast, id.reader); ++ SetCurPageComplete(id.ast, bool(id.reader)); + + return rd; + } +diff --git a/src/mgui/editor/toolbar.cpp b/src/mgui/editor/toolbar.cpp +index 6a1894c..a039c3a 100644 +--- a/src/mgui/editor/toolbar.cpp ++++ b/src/mgui/editor/toolbar.cpp +@@ -45,6 +45,8 @@ + #include <mlib/sdk/logger.h> + #include <mlib/range/enumerate.h> + ++#include <boost/filesystem/directory.hpp> ++ + namespace Editor + { + +diff --git a/src/mgui/ffviewer.cpp b/src/mgui/ffviewer.cpp +index 64ea813..a8dc6cb 100644 +--- a/src/mgui/ffviewer.cpp ++++ b/src/mgui/ffviewer.cpp +@@ -36,6 +36,10 @@ + #define AVFORMAT_54 + #endif + ++C_LINKAGE_BEGIN ++#include <libavutil/imgutils.h> ++C_LINKAGE_END ++ + // разрабы libav считают себя самыми умными и потому решили + // закрыть простым смертным доступ к ffurl_register_protocol() + // (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224 +@@ -74,7 +78,7 @@ C_LINKAGE_BEGIN + + typedef struct AVCodecTag { + #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) +- enum CodecID id; ++ enum AVCodecID id; + #else + int id; + #endif +@@ -82,14 +86,14 @@ typedef struct AVCodecTag { + } AVCodecTag; + + #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) +-static uint FFCodecID2Tag(CodecID codec_id) ++static uint FFCodecID2Tag(AVCodecID codec_id) + { + unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id); + extern const AVCodecTag ff_codec_bmp_tags[]; + return ff_codec_get_tag(ff_codec_bmp_tags, codec_id); + } + #else +-static uint FFCodecID2Tag(CodecID codec_id) ++static uint FFCodecID2Tag(AVCodecID codec_id) + { + unsigned int codec_get_tag(const AVCodecTag *tags, int id); + extern const AVCodecTag codec_bmp_tags[]; +@@ -400,7 +404,7 @@ static unsigned char GetChar(uint tag, int bit_begin) + return (tag>>bit_begin) & 0xFF; + } + +-static std::string CodecID2Str(CodecID codec_id) ++static std::string CodecID2Str(AVCodecID codec_id) + { + #ifdef _MSC_VER + std::string tag_str = boost::format("%1%") % codec_id % bf::stop; +@@ -807,7 +811,7 @@ static void DoVideoDecode(FFViewer& ffv, int& got_picture, AVPacket* pkt) + #ifdef AVFRAME_INIT_CHANGE + // avcodec_get_frame_defaults() перенесли в avcodec_decode_video2() + #else +- avcodec_get_frame_defaults(&picture); // ffmpeg.c очищает каждый раз ++ av_frame_unref (&picture); + #endif + + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,00) +diff --git a/src/mgui/mux.cpp b/src/mgui/mux.cpp +index 427058e..885dde7 100644 +--- a/src/mgui/mux.cpp ++++ b/src/mgui/mux.cpp +@@ -162,7 +162,7 @@ static void OnVideoSelected(Gtk::FileChooserButton& v_btn, Gtk::FileChooserButto + fs::path pth = GetFilename(v_btn); + if( pth.empty() ) + return; +- std::string folder = pth.branch_path().string(); ++ std::string folder = pth.parent_path().string(); + + if( a_btn.get_filename().empty() ) + a_btn.set_current_folder(folder); +diff --git a/src/mgui/project/add.cpp b/src/mgui/project/add.cpp +index 9454578..e8ae94f 100644 +--- a/src/mgui/project/add.cpp ++++ b/src/mgui/project/add.cpp +@@ -86,7 +86,9 @@ static void SetImportError(ErrorDesc& ed, bool is_good, const std::string& out_s + + static std::string FpsToStr(const Point& frate) + { +- return (str::stream() << (double)frate.x/frate.y).str(); ++ str::stream ss; ++ ss << (double)frate.x/frate.y; ++ return ss.str(); + } + + static std::string TVTypeStr(bool is_ntsc) +@@ -163,7 +165,9 @@ void CheckVideoFormat(ErrorDesc& ed, const Mpeg::SequenceData& vid, bool is_ntsc + // * + bool is_aspect_ok = vid.sarCode == af4_3 || vid.sarCode == af16_9; + Point aspect = vid.SizeAspect(); +- std::string aspect_str = (str::stream() << aspect.x << ':' << aspect.y).str(); ++ str::stream ss; ++ ss << aspect.x << ':' << aspect.y; ++ std::string aspect_str = ss.str(); + SetImportError(ed, is_aspect_ok, + std::string(_("Aspect ratio")) + ": \t" + MarkError(aspect_str, is_aspect_ok), + BF_(Descriptions[2]) % tv_type % bf::stop); +@@ -479,7 +483,7 @@ void TryAddMedias(const Str::List& paths, MediaBrowser& brw, + MessageBox(BF_("The file \"%1%\" looks like VOB from DVD.\nRun import?") % leaf % bf::stop, + Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL) == Gtk::RESPONSE_OK ) + { +- DVD::RunImport(*GetTopWindow(brw), pth.branch_path().string()); ++ DVD::RunImport(*GetTopWindow(brw), pth.parent_path().string()); + return; + } + } +diff --git a/src/mgui/project/browser.cpp b/src/mgui/project/browser.cpp +index 02d95a1..47b730b 100644 +--- a/src/mgui/project/browser.cpp ++++ b/src/mgui/project/browser.cpp +@@ -328,7 +328,7 @@ Gtk::HButtonBox& CreateMListButtonBox() + return hb; + } + +-std::string MediaItemDnDTVType() { return "DnDTreeView<"DND_MI_NAME">"; } ++std::string MediaItemDnDTVType() { return "DnDTreeView<" DND_MI_NAME ">"; } + + void SetupBrowser(ObjectBrowser& brw, int dnd_column, bool is_media_brw) + { +diff --git a/src/mgui/project/mconstructor.cpp b/src/mgui/project/mconstructor.cpp +index 3b56587..754f9f8 100644 +--- a/src/mgui/project/mconstructor.cpp ++++ b/src/mgui/project/mconstructor.cpp +@@ -52,6 +52,8 @@ + // COPY_N_PASTE_ETALON из go-file.c, проект Gnumeric, http://projects.gnome.org/gnumeric/ + // + ++#include <boost/filesystem/directory.hpp> ++ + #ifndef GOFFICE_WITH_GNOME + static char * + check_program (char const *prog) +diff --git a/src/mgui/project/serialize.cpp b/src/mgui/project/serialize.cpp +index a5366aa..03583ec 100644 +--- a/src/mgui/project/serialize.cpp ++++ b/src/mgui/project/serialize.cpp +@@ -73,7 +73,7 @@ static std::string MakeProjectTitle(bool with_path_breakdown = false) + fs::path full_path(db.GetProjectFName()); + std::string res_str = fs::name_str(full_path); + if( with_path_breakdown ) +- res_str += " (" + full_path.branch_path().string() + ")"; ++ res_str += " (" + full_path.parent_path().string() + ")"; + return res_str; + } + +diff --git a/src/mgui/sdk/cairo_utils.cpp b/src/mgui/sdk/cairo_utils.cpp +index 14f11be..10c1f97 100644 +--- a/src/mgui/sdk/cairo_utils.cpp ++++ b/src/mgui/sdk/cairo_utils.cpp +@@ -27,6 +27,8 @@ + std::string MakeSVGFilename(const char* prefix) + { + static int idx = 1; +- return (str::stream() << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg" ).str(); ++ str::stream ss; ++ ss << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg"; ++ return ss.str(); + } + +diff --git a/src/mgui/timeline/layout.cpp b/src/mgui/timeline/layout.cpp +index c139626..b5b5ca7 100644 +--- a/src/mgui/timeline/layout.cpp ++++ b/src/mgui/timeline/layout.cpp +@@ -600,8 +600,10 @@ time4_t FramesToTime(int cnt, double fps) + void FramesToTime(std::string& str, int cnt, double fps) + { + time4_t t4 = FramesToTime(cnt, fps); +- str = (str::stream() << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":" +- << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff).str(); ++ str::stream ss; ++ ss << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":" ++ << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff; ++ str = ss.str(); + } + + } // namespace TimeLine +diff --git a/src/mgui/timeline/select.cpp b/src/mgui/timeline/select.cpp +index 9d8ec5a..337ada6 100644 +--- a/src/mgui/timeline/select.cpp ++++ b/src/mgui/timeline/select.cpp +@@ -152,7 +152,7 @@ static void SaveFrame(DAMonitor& mon) + + mon.FramePixbuf()->save(fnam, ext); + +- SaveFrameDir() = fs::path(fnam).branch_path().string(); ++ SaveFrameDir() = fs::path(fnam).parent_path().string(); + if( add_btn.get_active() ) + Project::TryAddMediaQuiet(fnam, "SaveFrame"); + } +diff --git a/src/mgui/win_utils.cpp b/src/mgui/win_utils.cpp +index e135f1a..beafca8 100644 +--- a/src/mgui/win_utils.cpp ++++ b/src/mgui/win_utils.cpp +@@ -132,7 +132,9 @@ void Scale(RefPtr<Context> cr, RefPtr<ImageSurface> src, + + std::string ColorToString(const unsigned int rgba) + { +- return (str::stream() << std::hex << (rgba >> 8)).str(); ++ str::stream ss; ++ ss << std::hex << (rgba >> 8); ++ return ss.str(); + } + + CR::Color GetBGColor(Gtk::Widget& wdg) +diff --git a/src/mlib/filesystem.cpp b/src/mlib/filesystem.cpp +index 7ae7162..278dfc5 100644 +--- a/src/mlib/filesystem.cpp ++++ b/src/mlib/filesystem.cpp +@@ -30,6 +30,7 @@ + #if BOOST_MINOR_VERSION >= 51 + #define BOOST_FS_3 boost::filesystem + #include <boost/filesystem/path_traits.hpp> // boost::filesystem::convert() ++#include <boost/filesystem/directory.hpp> + #else + #define BOOST_FS_3 boost::filesystem3 + #include <boost/filesystem/v3/path_traits.hpp> +@@ -161,25 +162,16 @@ namespace Project + + fs::path MakeAbsolutePath(const fs::path& pth, const fs::path& cur_dir) + { +- fs::path res; +- +- if( pth.is_complete() ) +- res = pth; +- else +- { +- fs::path dir = cur_dir.empty() ? fs::current_path() : cur_dir ; +- res = dir/pth; +- } +- return res.normalize(); ++ return absolute(pth, cur_dir); + } + + // оба аргумента должны быть абсолютными путями + bool MakeRelativeToDir(fs::path& pth, fs::path dir) + { +- pth.normalize(); +- dir.normalize(); +- ASSERT( pth.is_complete() ); +- ASSERT( dir.is_complete() ); ++ pth = canonical(pth); ++ dir = canonical(dir); ++ ASSERT( pth.is_absolute() ); ++ ASSERT( dir.is_absolute() ); + + fs::path::iterator p_itr = pth.begin(), p_end = pth.end(); + fs::path::iterator d_itr = dir.begin(), d_end = dir.end(); +diff --git a/src/mlib/read_stream.h b/src/mlib/read_stream.h +index 9806ae3..05c6e1f 100644 +--- a/src/mlib/read_stream.h ++++ b/src/mlib/read_stream.h +@@ -22,6 +22,8 @@ + #ifndef __MLIB_READ_STREAM_H__ + #define __MLIB_READ_STREAM_H__ + ++#include <boost/mpl/bool.hpp> ++ + #include "stream.h" + #include "filesystem.h" + +diff --git a/src/mlib/regex.cpp b/src/mlib/regex.cpp +index df98fdb..dc9ea62 100644 +--- a/src/mlib/regex.cpp ++++ b/src/mlib/regex.cpp +@@ -22,7 +22,7 @@ + #include "regex.h" + #include "string.h" + +-#include <boost/regex.hpp> ++#include <boost/regex/v4/regex.hpp> + + namespace re + { +diff --git a/src/mlib/regex.h b/src/mlib/regex.h +index 4a18717..8da1214 100644 +--- a/src/mlib/regex.h ++++ b/src/mlib/regex.h +@@ -27,6 +27,7 @@ + #include <boost/regex/v4/regbase.hpp> + #include <boost/regex/v4/match_flags.hpp> + ++#include <boost/mpl/bool.hpp> + #include <mlib/ptr.h> + + #include <string> +@@ -185,7 +186,7 @@ bool search(const std::string& s, + #define RG_EW "\\>" // конец слова + #define RG_SPS "[[:space:]]*" // пробелы + #define RG_NUM "([0-9]+)" // число +-#define RG_FLT RG_NUM"([\\.,]"RG_NUM")" // вещ. число, в паре с ExtractDouble() ++#define RG_FLT RG_NUM "([\\.,]" RG_NUM ")" // вещ. число, в паре с ExtractDouble() + #define RG_CMD_BEG RG_BW // "^"RG_SPS // начало команды + + bool ExtractDouble(double& val, const re::match_results& what, int idx = 1); +diff --git a/src/mlib/sdk/bfs.h b/src/mlib/sdk/bfs.h +index c12b5d0..6e172cc 100644 +--- a/src/mlib/sdk/bfs.h ++++ b/src/mlib/sdk/bfs.h +@@ -7,6 +7,7 @@ + //#define BOOST_FILESYSTEM_NO_DEPRECATED + + #include <boost/filesystem/path.hpp> ++#include <boost/filesystem/exception.hpp> + #include <boost/filesystem/operations.hpp> + #include <boost/filesystem/convenience.hpp> // fs::create_directories() + +diff --git a/src/mlib/sdk/misc.cpp b/src/mlib/sdk/misc.cpp +index 5d3f297..803187b 100644 +--- a/src/mlib/sdk/misc.cpp ++++ b/src/mlib/sdk/misc.cpp +@@ -173,12 +173,16 @@ std::string PointToStr(const Point& pnt) + std::string Double2Str(double val) + { + //return boost::format("%1%") % val % bf::stop; +- return (str::stream() << val).str(); ++ str::stream ss; ++ ss << val; ++ return ss.str(); + } + + std::string Int2Str(int val) + { +- return (str::stream() << val).str(); ++ str::stream ss; ++ ss << val; ++ return ss.str(); + } + + static bool ICaseMatch(const std::string& str, const std::string& pat_str) +diff --git a/src/mlib/sdk/system.cpp b/src/mlib/sdk/system.cpp +index 8d10e3f..e9508bd 100644 +--- a/src/mlib/sdk/system.cpp ++++ b/src/mlib/sdk/system.cpp +@@ -28,7 +28,9 @@ + int GetMemSize() + { + pid_t pid = getpid(); +- std::string str = (str::stream() << "/proc/" << pid << "/statm").str(); ++ str::stream ss; ++ ss << "/proc/" << pid << "/statm"; ++ std::string str = ss.str(); + + io::stream strm(str.c_str(), iof::in); + int mem; +diff --git a/src/mlib/tech.h b/src/mlib/tech.h +index 6ddadf8..f2e2c2a 100644 +--- a/src/mlib/tech.h ++++ b/src/mlib/tech.h +@@ -26,7 +26,7 @@ + // Технические вещи + // + #include <boost/current_function.hpp> // для BOOST_CURRENT_FUNCTION +-#include <boost/detail/endian.hpp> // для BOOST_XXX_ENDIAN ++#include <boost/predef/other/endian.h> // BOOST_ENDIAN_*_BYTE + #include <boost/version.hpp> // для BOOST_MINOR_VERSION + + // для С-шного кода в С++ +@@ -78,9 +78,9 @@ void AssertImpl(const char* assertion, const char* file, + long line, const char* function); + + // endianness +-#if defined(BOOST_BIG_ENDIAN) ++#if defined(BOOST_ENDIAN_BIG_BYTE) + # define HAS_BIG_ENDIAN +-#elif defined(BOOST_LITTLE_ENDIAN) ++#elif defined(BOOST_ENDIAN_LITTLE_BYTE) + # define HAS_LITTLE_ENDIAN + #else + # error mlib/tech.h: unknown endianness (legacy PDP arch?) +diff --git a/src/mlib/tests/test_utils.cpp b/src/mlib/tests/test_utils.cpp +index c4712e8..99a2e94 100644 +--- a/src/mlib/tests/test_utils.cpp ++++ b/src/mlib/tests/test_utils.cpp +@@ -139,17 +139,17 @@ BOOST_AUTO_TEST_CASE( TestFilesystem ) + #endif + } + +- // is_complete ++ // is_absolute + { + fs::path pth("../some_file"); +- BOOST_CHECK( !pth.is_complete() ); +- BOOST_CHECK( fs::current_path().is_complete() ); ++ BOOST_CHECK( !pth.is_absolute() ); ++ BOOST_CHECK( fs::current_path().is_absolute() ); + + fs::path apth = Project::MakeAbsolutePath(pth); + //LOG_INF << "Making abs path: " << pth.string() << " => " << apth.string() << io::endl; + +- BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_complete() ); +- BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_complete() ); ++ BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_absolute() ); ++ BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_absolute() ); + } + + // MakeRelativeToDir diff --git a/multimedia/bombono-dvd/patches/boost.patch b/multimedia/bombono-dvd/patches/boost.patch deleted file mode 100644 index 1bb95aaaa4..0000000000 --- a/multimedia/bombono-dvd/patches/boost.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mbase/project/table.cpp 2016-01-19 13:02:00.117338769 +0330 -@@ -154,7 +154,7 @@ - void SerializePath(Archieve& ar, const char* tag_name, std::string& fpath) - { - //ar & NameValue("Path", mdPath); -- fs::path rel_to_dir = fs::path(AData().GetProjectFName()).branch_path(); -+ fs::path rel_to_dir = fs::path(AData().GetProjectFName()).parent_path(); - if( ar.IsLoad() ) - { - ar >> NameValue(tag_name, fpath); -diff -ru bombono-dvd-1.2.2/src/mgui/author/script.cpp new/src/mgui/author/script.cpp ---- bombono-dvd-1.2.2/src/mgui/author/script.cpp 2016-01-19 12:54:07.640700667 +0330 -+++ new/src/mgui/author/script.cpp 2016-01-19 12:59:52.407346489 +0330 -@@ -676,7 +676,7 @@ - if( !fs::exists(font_path) ) - { - std::string err_str; -- if( !CreateDirs(font_path.branch_path(), err_str) ) -+ if( !CreateDirs(font_path.parent_path(), err_str) ) - Error(err_str.c_str()); - fs::copy_file(DataDirPath("copy-n-paste/FreeSans.ttf"), font_path); - } -diff -ru bombono-dvd-1.2.2/src/mgui/mux.cpp new/src/mgui/mux.cpp ---- bombono-dvd-1.2.2/src/mgui/mux.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/mux.cpp 2016-01-19 12:58:22.840685236 +0330 -@@ -162,7 +162,7 @@ - fs::path pth = GetFilename(v_btn); - if( pth.empty() ) - return; -- std::string folder = pth.branch_path().string(); -+ std::string folder = pth.parent_path().string(); - - if( a_btn.get_filename().empty() ) - a_btn.set_current_folder(folder); -diff -ru bombono-dvd-1.2.2/src/mgui/project/add.cpp new/src/mgui/project/add.cpp ---- bombono-dvd-1.2.2/src/mgui/project/add.cpp 2016-01-19 12:54:07.634034002 +0330 -+++ new/src/mgui/project/add.cpp 2016-01-19 13:00:49.220676388 +0330 -@@ -479,7 +479,7 @@ - MessageBox(BF_("The file \"%1%\" looks like VOB from DVD.\nRun import?") % leaf % bf::stop, - Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL) == Gtk::RESPONSE_OK ) - { -- DVD::RunImport(*GetTopWindow(brw), pth.branch_path().string()); -+ DVD::RunImport(*GetTopWindow(brw), pth.parent_path().string()); - return; - } - } -diff -ru bombono-dvd-1.2.2/src/mgui/project/serialize.cpp new/src/mgui/project/serialize.cpp ---- bombono-dvd-1.2.2/src/mgui/project/serialize.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/project/serialize.cpp 2016-01-19 13:00:29.230677594 +0330 -@@ -73,7 +73,7 @@ - fs::path full_path(db.GetProjectFName()); - std::string res_str = fs::name_str(full_path); - if( with_path_breakdown ) -- res_str += " (" + full_path.branch_path().string() + ")"; -+ res_str += " (" + full_path.parent_path().string() + ")"; - return res_str; - } - -diff -ru bombono-dvd-1.2.2/src/mgui/timeline/select.cpp new/src/mgui/timeline/select.cpp ---- bombono-dvd-1.2.2/src/mgui/timeline/select.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mgui/timeline/select.cpp 2016-01-19 12:59:12.187348923 +0330 -@@ -152,7 +152,7 @@ - - mon.FramePixbuf()->save(fnam, ext); - -- SaveFrameDir() = fs::path(fnam).branch_path().string(); -+ SaveFrameDir() = fs::path(fnam).parent_path().string(); - if( add_btn.get_active() ) - Project::TryAddMediaQuiet(fnam, "SaveFrame"); - } -diff -ru bombono-dvd-1.2.2/src/mbase/project/table.cpp new/src/mbase/project/table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/table.cpp 2016-01-19 13:11:42.883970202 +0330 -+++ new/src/mbase/project/table.cpp 2016-01-19 13:42:58.317190146 +0330 -@@ -162,7 +162,7 @@ - if( !fpath.empty() ) - { - fs::path pth(fpath); -- if( !pth.is_complete() ) -+ if( !pth.is_absolute() ) - fpath = (rel_to_dir/fpath).string(); - } - } -diff -ru bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp new/src/mbase/project/tests/test_table.cpp ---- bombono-dvd-1.2.2/src/mbase/project/tests/test_table.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mbase/project/tests/test_table.cpp 2016-01-19 13:42:16.977192649 +0330 -@@ -129,7 +129,7 @@ - // проверка чтения/записи путей - boost::intrusive_ptr<StillImageMD> pict2 = ptr::dynamic_pointer_cast<StillImageMD>(ml[2]); - fs::path pth = pict2->GetPath(); -- BOOST_CHECK( pth.is_complete() ); -+ BOOST_CHECK( pth.is_absolute() ); - BOOST_CHECK( fs::exists(pth) ); - - // проверка ссылок -diff -ru bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp new/src/mlib/tests/test_utils.cpp ---- bombono-dvd-1.2.2/src/mlib/tests/test_utils.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mlib/tests/test_utils.cpp 2016-01-19 13:23:58.830592369 +0330 -@@ -139,17 +139,17 @@ - #endif - } - -- // is_complete -+ // is_absolute - { - fs::path pth("../some_file"); -- BOOST_CHECK( !pth.is_complete() ); -- BOOST_CHECK( fs::current_path().is_complete() ); -+ BOOST_CHECK( !pth.is_absolute() ); -+ BOOST_CHECK( fs::current_path().is_absolute() ); - - fs::path apth = Project::MakeAbsolutePath(pth); - //LOG_INF << "Making abs path: " << pth.string() << " => " << apth.string() << io::endl; - -- BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_complete() ); -- BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_complete() ); -+ BOOST_CHECK( Project::MakeAbsolutePath(pth, MakeRootComplete("/")).is_absolute() ); -+ BOOST_CHECK( !Project::MakeAbsolutePath(pth, "./").is_absolute() ); - } - - // MakeRelativeToDir -diff -ru bombono-dvd-1.2.2/src/mlib/filesystem.cpp new/src/mlib/filesystem.cpp ---- bombono-dvd-1.2.2/src/mlib/filesystem.cpp 2013-03-08 00:50:45.000000000 +0330 -+++ new/src/mlib/filesystem.cpp 2016-01-19 14:02:05.303787474 +0330 -@@ -161,25 +161,16 @@ - - fs::path MakeAbsolutePath(const fs::path& pth, const fs::path& cur_dir) - { -- fs::path res; -- -- if( pth.is_complete() ) -- res = pth; -- else -- { -- fs::path dir = cur_dir.empty() ? fs::current_path() : cur_dir ; -- res = dir/pth; -- } -- return res.normalize(); -+ return absolute(pth, cur_dir); - } - - // оба аргумента должны быть абсолютными путями - bool MakeRelativeToDir(fs::path& pth, fs::path dir) - { -- pth.normalize(); -- dir.normalize(); -- ASSERT( pth.is_complete() ); -- ASSERT( dir.is_complete() ); -+ pth = canonical(pth); -+ dir = canonical(dir); -+ ASSERT( pth.is_absolute() ); -+ ASSERT( dir.is_absolute() ); - - fs::path::iterator p_itr = pth.begin(), p_end = pth.end(); - fs::path::iterator d_itr = dir.begin(), d_end = dir.end(); - diff --git a/multimedia/bombono-dvd/patches/ffmpeg3.patch b/multimedia/bombono-dvd/patches/ffmpeg3.patch deleted file mode 100644 index ccf726cd1f..0000000000 --- a/multimedia/bombono-dvd/patches/ffmpeg3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp ---- old/src/mgui/ffviewer.cpp 2016-06-18 11:37:10.409735832 +0430 -+++ new/src/mgui/ffviewer.cpp 2016-06-18 11:45:40.343038336 +0430 -@@ -36,6 +36,10 @@ - #define AVFORMAT_54 - #endif - -+C_LINKAGE_BEGIN -+#include <libavutil/imgutils.h> -+C_LINKAGE_END -+ - // разрабы libav считают себя самыми умными и потому решили - // закрыть простым смертным доступ к ffurl_register_protocol() - // (бывшая av_register_protocol2()),- https://bugzilla.libav.org/show_bug.cgi?id=224 -@@ -807,7 +811,7 @@ - #ifdef AVFRAME_INIT_CHANGE - // avcodec_get_frame_defaults() перенесли в avcodec_decode_video2() - #else -- avcodec_get_frame_defaults(&picture); // ffmpeg.c очищает каждый раз -+ av_frame_unref (&picture); - #endif - - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,00) - diff --git a/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch b/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch deleted file mode 100644 index 5cfc96f47e..0000000000 --- a/multimedia/bombono-dvd/patches/fix_c++11_literal_warnings.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff -ruN old/src/mlib/regex.h new/src/mlib/regex.h ---- old/src/mlib/regex.h 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mlib/regex.h 2016-06-18 11:02:30.666528235 +0430 -@@ -185,7 +185,7 @@ - #define RG_EW "\\>" // конец слова - #define RG_SPS "[[:space:]]*" // пробелы - #define RG_NUM "([0-9]+)" // число --#define RG_FLT RG_NUM"([\\.,]"RG_NUM")" // вещ. число, в паре с ExtractDouble() -+#define RG_FLT RG_NUM "([\\.,]" RG_NUM ")" // вещ. число, в паре с ExtractDouble() - #define RG_CMD_BEG RG_BW // "^"RG_SPS // начало команды - - bool ExtractDouble(double& val, const re::match_results& what, int idx = 1); -diff -ruN old/src/mgui/author/burn.cpp new/src/mgui/author/burn.cpp ---- old/src/mgui/author/burn.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/author/burn.cpp 2016-06-18 11:04:08.113189012 +0430 -@@ -85,7 +85,7 @@ - return bd; - } - --re::pattern WriteSpeed_RE("Write Speed #"RG_NUM":"RG_SPS RG_NUM"\\."RG_NUM "x1385"); -+re::pattern WriteSpeed_RE("Write Speed #" RG_NUM ":" RG_SPS RG_NUM "\\." RG_NUM "x1385"); - - RefPtr<Gtk::ListStore> sp_store; - -@@ -253,7 +253,7 @@ - } - else - { -- static re::pattern media_type_re("Mounted Media:"RG_SPS"[0-9A-F]+h, ([^ \n]+)"); -+ static re::pattern media_type_re("Mounted Media:" RG_SPS "[0-9A-F]+h, ([^ \n]+)"); - re::match_results what; - - bool is_found = re::search(out_info, what, media_type_re); -@@ -277,7 +277,7 @@ - // isBlank - if( res != dvdOTHER ) - { -- static re::pattern media_status_re("Disc status:"RG_SPS"([a-z]+)\n"); -+ static re::pattern media_status_re("Disc status:" RG_SPS "([a-z]+)\n"); - bool is_found = re::search(out_info, what, media_status_re); - ASSERT_RTL( is_found ); - -diff -ruN old/src/mgui/author/execute.cpp new/src/mgui/author/execute.cpp ---- old/src/mgui/author/execute.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/author/execute.cpp 2016-06-18 11:07:03.359845082 +0430 -@@ -64,9 +64,9 @@ - tag->property_foreground() = "darkgreen"; - } - --re::pattern DVDAuthorRE(RG_CMD_BEG"dvdauthor"RG_EW ".*-x"RG_EW RG_SPS RG_BW"DVDAuthor\\.xml"RG_EW); --re::pattern MkIsoFsRE(RG_CMD_BEG MK_ISO_CMD RG_EW ".*-dvd-video"RG_EW ".*>.*"RG_BW"dvd.iso"RG_EW); --re::pattern GrowIsoFsRE(RG_CMD_BEG"growisofs"RG_EW ".*-dvd-compat"RG_EW ".*-dvd-video"RG_EW); -+re::pattern DVDAuthorRE(RG_CMD_BEG"dvdauthor" RG_EW ".*-x" RG_EW RG_SPS RG_BW "DVDAuthor\\.xml" RG_EW); -+re::pattern MkIsoFsRE(RG_CMD_BEG MK_ISO_CMD RG_EW ".*-dvd-video" RG_EW ".*>.*" RG_BW "dvd.iso" RG_EW); -+re::pattern GrowIsoFsRE(RG_CMD_BEG"growisofs" RG_EW ".*-dvd-compat" RG_EW ".*-dvd-video" RG_EW); - - //static void PrintMatchResults(const re::match_results& what) - //{ -@@ -94,7 +94,7 @@ - virtual void Filter(const std::string& line); - }; - --re::pattern MkIsoFsPercent_RE( RG_FLT"?% done"); -+re::pattern MkIsoFsPercent_RE( RG_FLT "?% done"); - - void MkIsoFsPP::Filter(const std::string& line) - { -@@ -126,8 +126,8 @@ - bool fixStage; - }; - --re::pattern DVDAuthorVOB_RE( "^STAT: VOBU "RG_NUM" at "RG_NUM"MB"); --re::pattern DVDAuthorFix_RE( "^STAT: fixing VOBU at "RG_NUM"MB \\("RG_NUM"/"RG_NUM", "RG_NUM"%\\)"); -+re::pattern DVDAuthorVOB_RE( "^STAT: VOBU " RG_NUM " at " RG_NUM "MB"); -+re::pattern DVDAuthorFix_RE( "^STAT: fixing VOBU at " RG_NUM "MB \\(" RG_NUM "/" RG_NUM ", " RG_NUM "%\\)"); - - void DVDAuthorPP::Filter(const std::string& line) - { -@@ -157,7 +157,7 @@ - if( p ) - of.SetProgress(p); - -- static re::pattern ch_error_re("ERR:.*Cannot jump to chapter "RG_NUM" of title "RG_NUM", only "RG_NUM" exist"); -+ static re::pattern ch_error_re("ERR:.*Cannot jump to chapter " RG_NUM " of title " RG_NUM ", only " RG_NUM " exist"); - if( re::search(line, what, ch_error_re) ) - { - std::string& err_str = of.firstError; -diff -ruN old/src/mgui/author/render.cpp new/src/mgui/author/render.cpp ---- old/src/mgui/author/render.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/author/render.cpp 2016-06-18 11:08:43.919839004 +0430 -@@ -866,7 +866,7 @@ - // - // :KLUDGE: (только) в ffmpeg, avformat 53.13.0, поменяли . на : => надо - // самим открывать файл и узнавать индекс! -- static re::pattern audio_idx("Stream #"RG_NUM"[\\.|:]"RG_NUM".*Audio:"); -+ static re::pattern audio_idx("Stream #" RG_NUM "[\\.|:]" RG_NUM ".*Audio:"); - - re::match_results what; - // флаг означает, что перевод строки не может быть точкой -@@ -1221,17 +1221,17 @@ - { - CheckNoCodecs(CheckForCodecList(conts)); - -- static re::pattern dvd_format("^ .E dvd"RG_EW); -+ static re::pattern dvd_format("^ .E dvd" RG_EW); - CheckStrippedFFmpeg(dvd_format, conts, "dvd format"); - - // :TRICKY: с версии libavcodec 54 при выводе начальный пробел не ставят => поэтому ? - // ("спасибо" Anton Khirnov за очередное "улучшение") - #define _CPP_ "^ ?" -- static re::pattern mpeg2video_codec(_CPP_".EV... mpeg2video"RG_EW); -+ static re::pattern mpeg2video_codec(_CPP_ ".EV... mpeg2video" RG_EW); - CheckStrippedFFmpeg(mpeg2video_codec, conts, "mpeg2 video encoder"); - - // по факту ffmpeg всегда использует ac3, однако mp2 тоже возможен -- static re::pattern ac3_codec(_CPP_".EA... ac3"RG_EW); -+ static re::pattern ac3_codec(_CPP_ ".EA... ac3" RG_EW); - CheckStrippedFFmpeg(ac3_codec, conts, "ac3 audio encoder"); - #undef _CPP_ - } -@@ -1241,7 +1241,7 @@ - // * ищем версию libavfilter - // пример: " libavfilter 0. 4. 0 / " - #define RG_PADNUM RG_SPS RG_NUM -- std::string reg_str = boost::format(RG_BW"%1%"RG_PADNUM"\\."RG_PADNUM"\\."RG_PADNUM" / ") -+ std::string reg_str = boost::format(RG_BW "%1%" RG_PADNUM "\\." RG_PADNUM "\\." RG_PADNUM " / ") - % avlib_name % bf::stop; - re::pattern avfilter_version(reg_str.c_str()); - return FindVersion(conts, avfilter_version, AVCnvBin(), avlib_name); -diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp ---- old/src/mgui/author/script.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/author/script.cpp 2016-06-18 11:09:54.899834712 +0430 -@@ -755,9 +755,9 @@ - // ffmpeg выводит статистику первого создаваемого файла каждые полсекунды, - // см. print_report() (при verbose=1, по умолчанию) - // Формат размера: "size=%8.0fkB" --re::pattern FFmpegSizePat( "size= *"RG_NUM"kB"); -+re::pattern FFmpegSizePat( "size= *" RG_NUM "kB"); - // Формат длительности: "time=%0.2f" --re::pattern FFmpegDurPat( "time="RG_FLT); -+re::pattern FFmpegDurPat( "time=" RG_FLT); - - static void OnTranscodePrintParse(const char* dat, int sz, const PercentFunctor& fnr) - { -@@ -787,7 +787,7 @@ - - // Формат длительности для ffmpeg c коммита dd471070: "time=%02d:%02d:%02d.%02d" - // Образец: frame= 208 fps= 58 q=2.0 size= 476kB time=00:00:08.44 bitrate= 461.9kbits/s dup=1 drop=0 --re::pattern FFmpegNewDurPat( "time="RG_NUM":"RG_NUM":"RG_FLT); -+re::pattern FFmpegNewDurPat( "time=" RG_NUM ":" RG_NUM ":" RG_FLT); - - static void OnTranscodeHMSParse(const char* dat, int sz, const PercentFunctor& fnr) - { -@@ -1136,7 +1136,7 @@ - // 2) парсер dvdauthor не любит незнакомые ему атрибуты => spumux < 0.7 не работает - std::string help_str; - PipeOutput("spumux -h", help_str); -- static re::pattern spumux_version("DVDAuthor::spumux, version "RG_NUM"\\."RG_NUM"\\."RG_NUM"\\.\n"); -+ static re::pattern spumux_version("DVDAuthor::spumux, version " RG_NUM "\\." RG_NUM "\\." RG_NUM "\\.\n"); - if( IsVersionGE(FindVersion(help_str, spumux_version, "spumux"), TripleVersion(0, 7, 0)) ) - AddFormatAttr(sp); - -diff -ruN old/src/mgui/project/browser.cpp new/src/mgui/project/browser.cpp ---- old/src/mgui/project/browser.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/project/browser.cpp 2016-06-18 11:10:21.113166461 +0430 -@@ -328,7 +328,7 @@ - return hb; - } - --std::string MediaItemDnDTVType() { return "DnDTreeView<"DND_MI_NAME">"; } -+std::string MediaItemDnDTVType() { return "DnDTreeView<" DND_MI_NAME ">"; } - - void SetupBrowser(ObjectBrowser& brw, int dnd_column, bool is_media_brw) - { diff --git a/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch deleted file mode 100644 index 6474693db4..0000000000 --- a/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp ---- old/src/mgui/ffviewer.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/ffviewer.cpp 2016-06-18 10:40:26.789941610 +0430 -@@ -74,7 +74,7 @@ - - typedef struct AVCodecTag { - #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) -- enum CodecID id; -+ enum AVCodecID id; - #else - int id; - #endif -@@ -82,14 +82,14 @@ - } AVCodecTag; - - #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) --static uint FFCodecID2Tag(CodecID codec_id) -+static uint FFCodecID2Tag(AVCodecID codec_id) - { - unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id); - extern const AVCodecTag ff_codec_bmp_tags[]; - return ff_codec_get_tag(ff_codec_bmp_tags, codec_id); - } - #else --static uint FFCodecID2Tag(CodecID codec_id) -+static uint FFCodecID2Tag(AVCodecID codec_id) - { - unsigned int codec_get_tag(const AVCodecTag *tags, int id); - extern const AVCodecTag codec_bmp_tags[]; -@@ -400,7 +400,7 @@ - return (tag>>bit_begin) & 0xFF; - } - --static std::string CodecID2Str(CodecID codec_id) -+static std::string CodecID2Str(AVCodecID codec_id) - { - #ifdef _MSC_VER - std::string tag_str = boost::format("%1%") % codec_id % bf::stop; - diff --git a/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch b/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch deleted file mode 100644 index 5fcfaf0466..0000000000 --- a/multimedia/bombono-dvd/patches/fix_operator_ambiguity.patch +++ /dev/null @@ -1,352 +0,0 @@ -diff -ruN old/src/mbase/project/serialization.h new/src/mbase/project/serialization.h ---- old/src/mbase/project/serialization.h 2017-06-01 13:54:44.086895687 +0430 -+++ new/src/mbase/project/serialization.h 2017-06-01 14:09:16.523275880 +0430 -@@ -75,7 +75,9 @@ - template<typename T> - std::string MakeString(const T& t) - { -- return (str::stream() << t).str(); -+ str::stream ss; -+ ss << t; -+ return ss.str(); - } - - template<typename T> -diff -ruN old/src/mgui/dvdimport.cpp new/src/mgui/dvdimport.cpp ---- old/src/mgui/dvdimport.cpp 2017-06-01 13:54:44.086895687 +0430 -+++ new/src/mgui/dvdimport.cpp 2017-06-01 14:06:42.488114237 +0430 -@@ -211,10 +211,11 @@ - row[VF().selState] = false; - row[VF().name] = VobFName(vob.pos); - row[VF().thumbnail] = vob.aspect == af4_3 ? pix4_3 : pix16_9; -- std::string desc = (str::stream(Mpeg::SecToHMS(vob.tmLen, true)) << ", " -- << vob.sz.x << "x" << vob.sz.y << ", " -- << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " -- << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB")).str(); -+ str::stream ss (Mpeg::SecToHMS(vob.tmLen, true)); -+ ss << ", " << vob.sz.x << "x" << vob.sz.y << ", " -+ << (vob.aspect == af4_3 ? "4:3" : "16:9") << ", " -+ << std::fixed << std::setprecision(2) << vob.Count()/512. << " " << _("MB"); -+ std::string desc = ss.str(); - row[VF().desc] = desc; - } - CompleteSelection(id, false); -diff -ruN old/src/mbase/project/media.cpp new/src/mbase/project/media.cpp ---- old/src/mbase/project/media.cpp 2017-06-01 14:25:09.492134844 +0430 -+++ new/src/mbase/project/media.cpp 2017-06-01 14:37:53.196336367 +0430 -@@ -58,7 +58,9 @@ - - std::string MakeAutoName(const std::string& str, int old_sz) - { -- return (str::stream() << str << " " << old_sz+1).str(); -+ str::stream ss; -+ ss << str << " " << old_sz+1; -+ return ss.str(); - } - - void VideoMD::AddChapter(ChapterItem chp) -diff -ruN old/src/mbase/project/menu.cpp new/src/mbase/project/menu.cpp ---- old/src/mbase/project/menu.cpp 2017-06-01 14:25:09.495468141 +0430 -+++ new/src/mbase/project/menu.cpp 2017-06-01 14:39:42.004331141 +0430 -@@ -166,7 +166,9 @@ - static std::string MakeObjectPath(int idx, const char* type) - { - ASSERT( idx != NO_HNDL ); -- return (str::stream() << type << "." << idx).str(); -+ str::stream ss; -+ ss << type << "." << idx; -+ return ss.str(); - } - - std::string GetMediaRef(MediaItem mi) -@@ -197,7 +199,9 @@ - void RefMaker::Visit(VideoChapterMD& obj) - { - refStr = GetMediaRef(obj.owner); -- refStr += (str::stream() << "." << ChapterPosInt(&obj)).str(); -+ str::stream ss; -+ ss << "." << ChapterPosInt(&obj); -+ refStr += ss.str(); - } - - std::string Media2Ref(MediaItem mi) -@@ -233,8 +237,9 @@ - - std::string ThrowBadIndex(const char* prefix, int idx) - { -- throw std::runtime_error( -- (str::stream() << prefix << idx).str() ); -+ str::stream ss; -+ ss << prefix << idx; -+ throw std::runtime_error(ss.str()); - } - - MediaItem TryGetMedia(int idx) -diff -ruN old/src/mbase/project/srl-common.cpp new/src/mbase/project/srl-common.cpp ---- old/src/mbase/project/srl-common.cpp 2017-06-01 14:25:09.495468141 +0430 -+++ new/src/mbase/project/srl-common.cpp 2017-06-01 14:40:56.524722225 +0430 -@@ -36,10 +36,12 @@ - std::string ToString(const RGBA::Pixel& pxl) - { - using Mpeg::set_hms; -- return (str::stream("#") << std::hex -- << set_hms() << (int)pxl.red -- << set_hms() << (int)pxl.green -- << set_hms() << (int)pxl.blue << (int)pxl.alpha).str(); -+ str::stream ss ("#"); -+ ss << std::hex -+ << set_hms() << (int)pxl.red -+ << set_hms() << (int)pxl.green -+ << set_hms() << (int)pxl.blue << (int)pxl.alpha; -+ return ss.str(); - } - - // как pango_color_parse() -diff -ruN old/src/mgui/author/render.cpp new/src/mgui/author/render.cpp ---- old/src/mgui/author/render.cpp 2017-06-01 14:25:09.498801438 +0430 -+++ new/src/mgui/author/render.cpp 2017-06-01 14:28:08.901379890 +0430 -@@ -1307,7 +1307,9 @@ - - bool RenderMainPicture(const std::string& out_dir, Menu mn, int i) - { -- Author::Info((str::stream() << "Rendering menu \"" << mn->mdName << "\" ...").str()); -+ str::stream ss; -+ ss << "Rendering menu \"" << mn->mdName << "\" ..."; -+ Author::Info(ss.str()); - const std::string mn_dir = MakeMenuPath(out_dir, mn, i); - - if( IsMotion(mn) ) -diff -ruN old/src/mgui/author/script.cpp new/src/mgui/author/script.cpp ---- old/src/mgui/author/script.cpp 2017-06-01 14:25:09.498801438 +0430 -+++ new/src/mgui/author/script.cpp 2017-06-01 14:31:23.248978018 +0430 -@@ -130,7 +130,9 @@ - { - VideoItem vi = IsVideo(mi); - ASSERT( vi ); -- str = (str::stream() << "title " << GetAuthorNumber(vi)).str(); -+ str::stream ss; -+ ss << "title " << GetAuthorNumber(vi); -+ str = ss.str(); - } - return str; - } -@@ -179,7 +181,9 @@ - // Потому: для удоства пользователей даем создавать нулевую главу, разрешая это здесь - // (однако доп. нулевые главы будут приводить к ошибке Cannot jump to chapter N ... only M exist) - int c_num = ChapterPosInt(&obj) + (owner->List()[0]->chpTime ? 2 : 1) ; -- res = (str::stream() << "jump title " << v_num << " chapter " << c_num << ";").str(); -+ str::stream ss; -+ ss << "jump title " << v_num << " chapter " << c_num << ";"; -+ res = ss.str(); - } - - static std::string MakeButtonJump(MediaItem mi, bool vts_domain) -@@ -204,7 +208,9 @@ - if( !fs::native(name) ) - name = "Menu"; - -- std::string fname = (str::stream() << idx+1 << "." << name).str(); -+ str::stream ss; -+ ss << idx+1 << "." << name; -+ std::string fname = ss.str(); - return cnv_from_utf8 ? ConvertPathFromUtf8(fname) : fname ; - } - -@@ -626,7 +632,9 @@ - void AuthorSectionInfo(const std::string& str) - { - Author::Info("\n#", false); -- Author::Info((str::stream() << "# " << str).str(), false); -+ str::stream ss; -+ ss << "# " << str; -+ Author::Info(ss.str(), false); - Author::Info("#\n", false); - } - -@@ -1082,7 +1090,9 @@ - - static void AuthorImpl(const std::string& out_dir) - { -- AuthorSectionInfo((str::stream() << "Build DVD-Video in folder: " << out_dir).str()); -+ str::stream ss; -+ ss << "Build DVD-Video in folder: " << out_dir; -+ AuthorSectionInfo(ss.str()); - IteratePendingEvents(); - - IndexVideosForAuthoring(); -diff -ruN old/src/mgui/project/add.cpp new/src/mgui/project/add.cpp ---- old/src/mgui/project/add.cpp 2017-06-01 14:25:09.498801438 +0430 -+++ new/src/mgui/project/add.cpp 2017-06-01 14:33:26.303387642 +0430 -@@ -86,7 +86,9 @@ - - static std::string FpsToStr(const Point& frate) - { -- return (str::stream() << (double)frate.x/frate.y).str(); -+ str::stream ss; -+ ss << (double)frate.x/frate.y; -+ return ss.str(); - } - - static std::string TVTypeStr(bool is_ntsc) -@@ -163,7 +165,9 @@ - // * - bool is_aspect_ok = vid.sarCode == af4_3 || vid.sarCode == af16_9; - Point aspect = vid.SizeAspect(); -- std::string aspect_str = (str::stream() << aspect.x << ':' << aspect.y).str(); -+ str::stream ss; -+ ss << aspect.x << ':' << aspect.y; -+ std::string aspect_str = ss.str(); - SetImportError(ed, is_aspect_ok, - std::string(_("Aspect ratio")) + ": \t" + MarkError(aspect_str, is_aspect_ok), - BF_(Descriptions[2]) % tv_type % bf::stop); -diff -ruN old/src/mgui/sdk/cairo_utils.cpp new/src/mgui/sdk/cairo_utils.cpp ---- old/src/mgui/sdk/cairo_utils.cpp 2017-06-01 14:25:09.498801438 +0430 -+++ new/src/mgui/sdk/cairo_utils.cpp 2017-06-01 14:35:20.831246046 +0430 -@@ -27,6 +27,8 @@ - std::string MakeSVGFilename(const char* prefix) - { - static int idx = 1; -- return (str::stream() << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg" ).str(); -+ str::stream ss; -+ ss << prefix << "-" << Mpeg::set_hms() << idx++ << ".svg"; -+ return ss.str(); - } - -diff -ruN old/src/mgui/timeline/layout.cpp new/src/mgui/timeline/layout.cpp ---- old/src/mgui/timeline/layout.cpp 2017-06-01 14:25:09.502134734 +0430 -+++ new/src/mgui/timeline/layout.cpp 2017-06-01 14:36:36.152095784 +0430 -@@ -600,8 +600,10 @@ - void FramesToTime(std::string& str, int cnt, double fps) - { - time4_t t4 = FramesToTime(cnt, fps); -- str = (str::stream() << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":" -- << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff).str(); -+ str::stream ss; -+ ss << Mpeg::set_hms() << t4.hh << ":" << Mpeg::set_hms() << t4.mm << ":" -+ << Mpeg::set_hms() << t4.ss << ";" << Mpeg::set_hms() << t4.ff; -+ str = ss.str(); - } - - } // namespace TimeLine -diff -ruN old/src/mgui/win_utils.cpp new/src/mgui/win_utils.cpp ---- old/src/mgui/win_utils.cpp 2017-06-01 14:25:09.498801438 +0430 -+++ new/src/mgui/win_utils.cpp 2017-06-01 14:26:50.898112082 +0430 -@@ -132,7 +132,9 @@ - - std::string ColorToString(const unsigned int rgba) - { -- return (str::stream() << std::hex << (rgba >> 8)).str(); -+ str::stream ss; -+ ss << std::hex << (rgba >> 8); -+ return ss.str(); - } - - CR::Color GetBGColor(Gtk::Widget& wdg) -diff -ruN old/src/mdemux/dvdread.cpp new/src/mdemux/dvdread.cpp ---- old/src/mdemux/dvdread.cpp 2017-06-01 14:48:30.110355679 +0430 -+++ new/src/mdemux/dvdread.cpp 2017-06-01 14:50:50.141065674 +0430 -@@ -35,8 +35,10 @@ - std::string VobFName(VobPos& pos, const std::string& suffix) - { - using Mpeg::set_hms; -- return (str::stream("Video") << set_hms() << int(pos.Vts()) -- << "-" << set_hms() << pos.VobId() << suffix << ".vob").str(); -+ str::stream ss ("Video"); -+ ss << set_hms() << int(pos.Vts()) -+ << "-" << set_hms() << pos.VobId() << suffix << ".vob"; -+ return ss.str(); - } - - typedef boost::function<void(int, double)> VobTimeFnr; -@@ -282,9 +284,11 @@ - static void TryDVDReadBlocks(dvd_file_t* file, int off, size_t cnt, char* buf) - { - int real_cnt = DVDReadBlocks(file, off, cnt, (unsigned char*)buf); -- if( (int)cnt != real_cnt ) -- throw std::runtime_error( (str::stream() << real_cnt << -- " != DVDReadBlocks(" << cnt << ")").str() ); -+ if( (int)cnt != real_cnt ) { -+ str::stream ss; -+ ss << real_cnt << " != DVDReadBlocks(" << cnt << ")"; -+ throw std::runtime_error( ss.str() ); -+ } - } - - // размер буфера должен соответствовать читаемому диапазону -diff -ruN old/src/mdemux/mpeg2demux.cpp new/src/mdemux/mpeg2demux.cpp ---- old/src/mdemux/mpeg2demux.cpp 2017-06-01 14:48:30.110355679 +0430 -+++ new/src/mdemux/mpeg2demux.cpp 2017-06-01 14:55:35.784165916 +0430 -@@ -71,7 +71,9 @@ - - static std::string MakePESKey(int id, const char* ext) - { -- return (str::stream() << id << "." << ext).str(); -+ str::stream ss; -+ ss << id << "." << ext; -+ return ss.str(); - } - - static bool ReadPart(io::stream& strm, uint8_t* buf, int sz, int& len) -@@ -110,7 +112,9 @@ - ASSERT(0); - } - -- std::string header_str = (str::stream() << sample_rate << ":" << channels << ":" << bps << ".lpcm").str(); -+ str::stream ss; -+ ss << sample_rate << ":" << channels << ":" << bps << ".lpcm"; -+ std::string header_str = ss.str(); - return MakePESKey(track, header_str.c_str()); - } - -diff -ruN old/src/mdemux/seek.cpp new/src/mdemux/seek.cpp ---- old/src/mdemux/seek.cpp 2017-06-01 14:48:30.110355679 +0430 -+++ new/src/mdemux/seek.cpp 2017-06-01 14:52:09.669280234 +0430 -@@ -37,8 +37,10 @@ - int hh = min / 60; - int mm = min - hh*60; - -- return (str::stream() << set_hms() << hh << ":" -- << set_hms() << mm << ":" << set_hms() << ss).str(); -+ str::stream strss; -+ strss << set_hms() << hh << ":" -+ << set_hms() << mm << ":" << set_hms() << ss; -+ return strss.str(); - } - - bool MediaInfo::InitBegin(VideoLine& vl) -diff -ruN old/src/mlib/sdk/misc.cpp new/src/mlib/sdk/misc.cpp ---- old/src/mlib/sdk/misc.cpp 2017-06-01 14:48:30.120355606 +0430 -+++ new/src/mlib/sdk/misc.cpp 2017-06-01 14:53:25.504549937 +0430 -@@ -173,12 +173,16 @@ - std::string Double2Str(double val) - { - //return boost::format("%1%") % val % bf::stop; -- return (str::stream() << val).str(); -+ str::stream ss; -+ ss << val; -+ return ss.str(); - } - - std::string Int2Str(int val) - { -- return (str::stream() << val).str(); -+ str::stream ss; -+ ss << val; -+ return ss.str(); - } - - static bool ICaseMatch(const std::string& str, const std::string& pat_str) -diff -ruN old/src/mlib/sdk/system.cpp new/src/mlib/sdk/system.cpp ---- old/src/mlib/sdk/system.cpp 2017-06-01 14:48:30.120355606 +0430 -+++ new/src/mlib/sdk/system.cpp 2017-06-01 14:54:13.980777662 +0430 -@@ -28,7 +28,9 @@ - int GetMemSize() - { - pid_t pid = getpid(); -- std::string str = (str::stream() << "/proc/" << pid << "/statm").str(); -+ str::stream ss; -+ ss << "/proc/" << pid << "/statm"; -+ std::string str = ss.str(); - - io::stream strm(str.c_str(), iof::in); - int mem; diff --git a/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch b/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch deleted file mode 100644 index 4999db1ca4..0000000000 --- a/multimedia/bombono-dvd/patches/fix_ptr2bool_cast.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN old/src/mgui/dvdimport.cpp new/src/mgui/dvdimport.cpp ---- old/src/mgui/dvdimport.cpp 2016-04-10 15:15:39.000000000 +0430 -+++ new/src/mgui/dvdimport.cpp 2016-06-18 10:52:35.713230871 +0430 -@@ -275,7 +275,7 @@ - id.errLbl.hide(); - - id.reader = rd; -- SetCurPageComplete(id.ast, id.reader); -+ SetCurPageComplete(id.ast, bool(id.reader)); - - return rd; - } - diff --git a/multimedia/bombono-dvd/patches/fix_throw_specifications.patch b/multimedia/bombono-dvd/patches/fix_throw_specifications.patch deleted file mode 100644 index f2f4c40d4f..0000000000 --- a/multimedia/bombono-dvd/patches/fix_throw_specifications.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN old/src/mbase/project/table.h new/src/mbase/project/table.h ---- old/src/mbase/project/table.h 2017-06-01 13:54:44.086895687 +0430 -+++ new/src/mbase/project/table.h 2017-06-01 13:55:58.089107253 +0430 -@@ -128,7 +128,7 @@ - void ClearSettings(); - - void Load(const std::string& fname, -- const std::string& cur_dir = std::string()) throw (std::exception); -+ const std::string& cur_dir = std::string()); - bool Save(); - - bool SaveAs(const std::string& fname, -diff -ruN old/src/mbase/project/srl-db.cpp new/src/mbase/project/srl-db.cpp ---- old/src/mbase/project/srl-db.cpp 2017-06-01 14:25:09.495468141 +0430 -+++ new/src/mbase/project/srl-db.cpp 2017-06-01 14:41:49.699901753 +0430 -@@ -102,7 +102,7 @@ - } - - void ADatabase::Load(const std::string& fname, -- const std::string& cur_dir) throw (std::exception) -+ const std::string& cur_dir) - { - try - { diff --git a/multimedia/bombono-dvd/patches/scons.diff b/multimedia/bombono-dvd/patches/scons.diff new file mode 100644 index 0000000000..d45d1d4d1f --- /dev/null +++ b/multimedia/bombono-dvd/patches/scons.diff @@ -0,0 +1,221 @@ +diff -Naur bombono-dvd-1.2.4/SConstruct bombono-dvd-1.2.4.patched/SConstruct +--- bombono-dvd-1.2.4/SConstruct 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/SConstruct 2022-02-15 13:53:32.444205004 -0500 +@@ -274,13 +274,13 @@ + # Config + + if os.path.exists( BV.CfgFile ): +- print "Using config file: " + BV.CfgFile ++ print("Using config file: " + BV.CfgFile) + + user_options = Variables(BV.CfgFile, BV.Args) + ParseVariables(user_options) + + else: +- print "Creating new config file: " + BV.CfgFile ++ print("Creating new config file: " + BV.CfgFile) + + user_options = Variables(None, BV.Args) + ParseVariables(user_options) +@@ -352,20 +352,19 @@ + + def GenerateBaseConfigH(target, source, env): + cfg_file = open(target[0].path, 'w') +- print >> cfg_file, "/* Generated by means of Autoconfig */" ++ print("/* Generated by means of Autoconfig */", file=cfg_file) + + config_dict = user_options_dict['CONFIGURATION'] +- key_list = config_dict.keys() +- key_list.sort() ++ key_list = sorted(config_dict) + + for key in key_list: + var = config_dict[key] + + text = var.get('text', None) + if text: +- print >> cfg_file ++ print("", file=cfg_file) + BV.AddComment(cfg_file, var) +- print >> cfg_file, text ++ print(text, file=cfg_file) + continue + + BV.AddDefine(cfg_file, key, **var) +diff -Naur bombono-dvd-1.2.4/libs/mpeg2dec/SConscript bombono-dvd-1.2.4.patched/libs/mpeg2dec/SConscript +--- bombono-dvd-1.2.4/libs/mpeg2dec/SConscript 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/libs/mpeg2dec/SConscript 2022-02-15 13:47:04.028766834 -0500 +@@ -69,9 +69,9 @@ + + def GenerateMpeg2DecCfg(target, source, env): + cfg_file = open(target[0].path, 'w') +- print >> cfg_file, "/* Auto-generated header */" +- print >> cfg_file +- print >> cfg_file, '#include <cfg/config.h>' ++ print("/* Auto-generated header */", file=cfg_file) ++ print("", file=cfg_file) ++ print('#include <cfg/config.h>', file=cfg_file) + + BuildVars.AddDefine(cfg_file, 'ACCEL_DETECT', is_on = 1, comment = "autodetect accelerations") + BuildVars.AddDefine(cfg_file, 'LIBVO_DX', is_on = 0, comment = "libvo DirectX support") +diff -Naur bombono-dvd-1.2.4/po/SConscript bombono-dvd-1.2.4.patched/po/SConscript +--- bombono-dvd-1.2.4/po/SConscript 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/po/SConscript 2022-02-15 13:47:04.028766834 -0500 +@@ -35,7 +35,7 @@ + str(source[0]), + str(source[1]), + ] +- print 'Updating ' + trgt ++ print('Updating ' + trgt) + return os.spawnvp(os.P_WAIT, 'msgmerge', args) + + po_bld = Builder (action = po_builder) +diff -Naur bombono-dvd-1.2.4/src/mgui/tests/SConscript bombono-dvd-1.2.4.patched/src/mgui/tests/SConscript +--- bombono-dvd-1.2.4/src/mgui/tests/SConscript 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/src/mgui/tests/SConscript 2022-02-15 13:47:04.028766834 -0500 +@@ -36,8 +36,8 @@ + bin_mgui_tests_env.Program(target=test_prg_name, source = source_files+lib_mgui_objs) + + import os +-if os.environ.has_key('DISPLAY'): ++if 'DISPLAY' in os.environ: + UnitTest(test_prg_name, bin_mgui_tests_env) + else: +- print "Warning: X Display is not found. GUI tests are disabled." ++ print("Warning: X Display is not found. GUI tests are disabled.") + +diff -Naur bombono-dvd-1.2.4/tools/scripts/BuildVars.py bombono-dvd-1.2.4.patched/tools/scripts/BuildVars.py +--- bombono-dvd-1.2.4/tools/scripts/BuildVars.py 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/tools/scripts/BuildVars.py 2022-02-15 13:47:54.476603032 -0500 +@@ -30,11 +30,11 @@ + + def PrintBright(is_end): + if not is_end: +- print +- print "****************************************************" ++ print() ++ print("****************************************************") + else: +- print "****************************************************" +- print ++ print("****************************************************") ++ print() + + def IsDebugCfg(): + return BuildCfg == 'debug' +@@ -68,10 +68,10 @@ + def CheckSettings(main_env): + global Cc, Cxx, BuildDir, Targets, RunTests, BuildTests + if RunTests : +- print 'Tests: on' ++ print('Tests: on') + else: + if BuildTests: +- print 'Tests: on (only building)' ++ print('Tests: on (only building)') + + def_env = GetDefEnv() + # for SCons =<0.96 we need to warn that just 'scons' is not enough: +@@ -92,9 +92,9 @@ + ( (len(BuildDir) >= 1 and BuildDir[0] == '/') or (len(BuildDir) >= 2 and BuildDir[0:2] == '..') ) and \ + (Targets == [] or Targets == ['.']) : + PrintBright(0) +- print 'Warning! "scons" or "scons ." detected while BUILD_DIR is outside "."!' +- print 'To build successfully with SCons <= v0.96.1 you may need to run something like ' +- print '\t"scons <...> ' + BuildDir + '".' ++ print('Warning! "scons" or "scons ." detected while BUILD_DIR is outside "."!') ++ print('To build successfully with SCons <= v0.96.1 you may need to run something like ') ++ print('\t"scons <...> ' + BuildDir + '".' ) + PrintBright(1) + + # we use TestSConscript() function instead of SConscript() +@@ -149,7 +149,7 @@ + SetBriefOutput(main_env) + + # to separate our output from SCons' +- print ++ print() + + # Non/Verbose output + def SetBriefOutput(env): +@@ -228,7 +228,7 @@ + + def ErrorAndExit(msg): + PrintBright(0) +- print msg ++ print(msg) + PrintBright(1) + + GetDefEnv().Exit(1) +@@ -383,20 +383,20 @@ + comment = MakeHeaderComment(var['ccomment'], var.get('val') == '1') + + if comment: +- print >> cfg_file, "/* " + comment + " */" ++ print("/* " + comment + " */", file=cfg_file) + + def AddDefine(cfg_file, key, **var): +- print >> cfg_file ++ print("", file=cfg_file) + AddComment(cfg_file, var) + + if var['is_on']: + str = var.get('val', None) + if str == None: +- print >> cfg_file, "#define %s" % key ++ print("#define %s" % key, file=cfg_file) + else: +- print >> cfg_file, "#define %s %s" % (key, var['val']) ++ print("#define %s %s" % (key, var['val']), file=cfg_file) + else: +- print >> cfg_file, "/* #undef %s */" % key ++ print("/* #undef %s */" % key, file=cfg_file) + + GenFunctionMap = {} + +@@ -495,7 +495,7 @@ + res = True + elif not IsReenter(IsToBuildQuick): + # warn once only +- print 'BUILD_QUICK=true is not supported for current compiler(%s)!' % Cc ++ print('BUILD_QUICK=true is not supported for current compiler(%s)!' % Cc) + + return res + +@@ -504,7 +504,7 @@ + + def CreateEnvVersion2(**kw): + tools = ['default', 'AuxTools'] +- if kw.has_key('tools'): ++ if 'tools' in kw: + tools += kw['tools'] + kw['tools'] = tools + +diff -Naur bombono-dvd-1.2.4/tools/scripts/copy_boost.py bombono-dvd-1.2.4.patched/tools/scripts/copy_boost.py +--- bombono-dvd-1.2.4/tools/scripts/copy_boost.py 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/tools/scripts/copy_boost.py 2022-02-15 13:47:04.029766851 -0500 +@@ -26,7 +26,7 @@ + for fname in os.listdir(boost_dst): + if not fname in lst: + fpath = os.path.join(boost_dst, fname) +- print 'rm', fpath ++ #print 'rm', fpath + o_p.del_any_fpath(fpath) + + cmd = '''%(bcp)s --boost=%(boost_src)s boost/smart_ptr.hpp boost/test boost/function.hpp boost/lambda boost/bind \ +diff -Naur bombono-dvd-1.2.4/tools/scripts/gch.py bombono-dvd-1.2.4.patched/tools/scripts/gch.py +--- bombono-dvd-1.2.4/tools/scripts/gch.py 2016-04-10 06:45:39.000000000 -0400 ++++ bombono-dvd-1.2.4.patched/tools/scripts/gch.py 2022-02-15 13:47:04.029766851 -0500 +@@ -78,10 +78,10 @@ + + + def SetPCHDependencies(target, source, env, gch_key): +- if env.has_key(gch_key) and env[gch_key]: ++ if gch_key in env and env[gch_key]: + gch_node = env[gch_key] + # Murav'jov - alternative variant +- if env.has_key('DepGch') and env['DepGch']: ++ if 'DepGch' in env and env['DepGch']: + env.Depends(target, gch_node) + else: + scanner = GetCScannerFunc() diff --git a/multimedia/cantata/cantata.SlackBuild b/multimedia/cantata/cantata.SlackBuild index a1554e16cb..e1bb6b57b8 100644 --- a/multimedia/cantata/cantata.SlackBuild +++ b/multimedia/cantata/cantata.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cantata -# Copyright 2014 - 2017 Ruben Schuller +# Copyright 2014 - 2022 Ruben Schuller # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cantata -VERSION=${VERSION:-2.4.1} +VERSION=${VERSION:-2.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/cantata/cantata.info b/multimedia/cantata/cantata.info index 7b0372b549..b5b9285735 100644 --- a/multimedia/cantata/cantata.info +++ b/multimedia/cantata/cantata.info @@ -1,8 +1,8 @@ PRGNAM="cantata" -VERSION="2.4.1" +VERSION="2.5.0" HOMEPAGE="https://github.com/CDrummond/cantata" -DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.4.1/cantata-2.4.1.tar.gz" -MD5SUM="c60dfdb23cfb4e6c2acca118e116f613" +DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.5.0/cantata-2.5.0.tar.gz" +MD5SUM="aca989aa520ce21adef5b44321b4dedd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/castnow/README b/multimedia/castnow/README index f38b2d7506..557646a3f9 100644 --- a/multimedia/castnow/README +++ b/multimedia/castnow/README @@ -1,3 +1,7 @@ castnow is a command-line utility that can be used to play back media files on your Chromecast device. It supports playback of local video files, videos on the web and torrents. + +Warning: This SlackBuild requires network access when it runs, meaning +it downloads files from the Internet with root access. You should +decide for yourself whether or not you think this is a good idea. diff --git a/multimedia/ccextractor/README b/multimedia/ccextractor/README index 6dccda83a4..8f1e782dc5 100644 --- a/multimedia/ccextractor/README +++ b/multimedia/ccextractor/README @@ -3,10 +3,4 @@ independent subtitle files from the closed captions data. CCExtractor is portable, small, and very fast. Notable features include the ability to extract subtitles in real-time, translate subtitles, extract closed captions from DVDs, and convert closed captions -to subtitles. - -By default only build the CLI version of ccextractor. If you would -like to also build the GUI version, then install glfw3 available -here at SBo and run the script like so - -GUI=yes ./ccextractor.SlackBuild +to subtitles. diff --git a/multimedia/ccextractor/ccextractor-0.88-fno-common.patch b/multimedia/ccextractor/ccextractor-0.88-fno-common.patch deleted file mode 100644 index 1f42132bf8..0000000000 --- a/multimedia/ccextractor/ccextractor-0.88-fno-common.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dfd25022e2a775a8b5eb03e4ad28bab6fe6a0658 Mon Sep 17 00:00:00 2001 -From: Ed Marshall <esm@logic.net> -Date: Sat, 1 Feb 2020 15:03:22 -0800 -Subject: [PATCH] Fix multiple definitions with new -fno-common default in GCC - 10 - ---- - ccextractor.c | 3 +++ - ccextractor.h | 4 ++-- - lib_ccx/ccx_decoders_708.h | 4 ++-- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/ccextractor.c b/ccextractor.c -index a2fb0a24f..8ed27936d 100644 ---- a/ccextractor.c -+++ b/ccextractor.c -@@ -9,6 +9,9 @@ License: GPL 2.0 - - volatile int terminate_asap = 0; - -+struct ccx_s_options ccx_options; -+struct lib_ccx_ctx *signal_ctx; -+ - void sigusr1_handler(int sig) - { - mprint("Caught SIGUSR1. Filename Change Requested\n"); -diff --git a/ccextractor.h b/ccextractor.h -index 4e9ae68f6..e5cde3055 100644 ---- a/ccextractor.h -+++ b/ccextractor.h -@@ -41,8 +41,8 @@ char * api_param(struct ccx_s_options* api_options, int count); - #endif - - --struct ccx_s_options ccx_options; --struct lib_ccx_ctx *signal_ctx; -+extern struct ccx_s_options ccx_options; -+extern struct lib_ccx_ctx *signal_ctx; - //volatile int terminate_asap = 0; - - struct ccx_s_options* api_init_options(); -diff --git a/lib_ccx/ccx_decoders_708.h b/lib_ccx/ccx_decoders_708.h -index 324f3890d..df52c6002 100644 ---- a/lib_ccx/ccx_decoders_708.h -+++ b/lib_ccx/ccx_decoders_708.h -@@ -371,7 +371,7 @@ void ccx_dtvcc_process_service_block(ccx_dtvcc_ctx *dtvcc, - unsigned char *data, - int data_length); - --ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; --ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; -+extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; -+extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; - - #endif diff --git a/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild index 7a211e2912..a7850354b9 100644 --- a/multimedia/ccextractor/ccextractor.SlackBuild +++ b/multimedia/ccextractor/ccextractor.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ccextractor -VERSION=${VERSION:-0.88} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.94} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,9 +50,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Pass GUI=yes if you want to build gui support -GUI=${GUI:-"no"} - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -67,13 +64,6 @@ else LIBDIRSUFFIX="" fi -if [ "${GUI:-yes}" = "yes" ]; then - gui="--with-gui" -else - gui="" -fi - - set -e rm -rf $PKG @@ -89,9 +79,6 @@ 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 {} \; -# Thanks gentoo for this patch! -( cd ../src ; patch -p1 < $CWD/ccextractor-0.88-fno-common.patch ) - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh @@ -102,7 +89,9 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --enable-static=no \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - $gui \ + --without-rust \ + --enable-hardsubx \ + --enable-ffmpeg \ --enable-ocr \ --build=$ARCH-slackware-linux diff --git a/multimedia/ccextractor/ccextractor.info b/multimedia/ccextractor/ccextractor.info index 2e5ee2b47c..07374db12e 100644 --- a/multimedia/ccextractor/ccextractor.info +++ b/multimedia/ccextractor/ccextractor.info @@ -1,10 +1,10 @@ PRGNAM="ccextractor" -VERSION="0.88" +VERSION="0.94" HOMEPAGE="https://www.ccextractor.org/" -DOWNLOAD="https://github.com/CCExtractor/ccextractor/archive/v0.88/ccextractor-0.88.tar.gz" -MD5SUM="914f8704251ce24dcbb756590cf39955" +DOWNLOAD="https://github.com/CCExtractor/ccextractor/archive/v0.94/ccextractor-0.94.tar.gz" +MD5SUM="218f8f4628294fa218f2aad162bf68c7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tesseract" MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" +EMAIL="matthewdinslage@gmail.com" diff --git a/multimedia/ccxstream/README b/multimedia/ccxstream/README index 053b4ee50a..8731d85230 100644 --- a/multimedia/ccxstream/README +++ b/multimedia/ccxstream/README @@ -1,2 +1,2 @@ -ccXStream streams media to XBMC via the XBMSP. This is a package implementing -a xbmsp streaming protocol server and a (test) client. +ccXStream streams media to XBMC via the XBMSP. This is a package +implementing a xbmsp streaming protocol server and a (test) client. diff --git a/multimedia/cfourcc/cfourcc.SlackBuild b/multimedia/cfourcc/cfourcc.SlackBuild index f5dda08912..fdc7556adb 100644 --- a/multimedia/cfourcc/cfourcc.SlackBuild +++ b/multimedia/cfourcc/cfourcc.SlackBuild @@ -12,7 +12,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -30,8 +30,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" diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild index 4c23f9c61f..1d88525bc0 100644 --- a/multimedia/cinelerra/cinelerra.SlackBuild +++ b/multimedia/cinelerra/cinelerra.SlackBuild @@ -22,6 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230126 bkw: Modified by SlackBuilds.org: +# - remove false imlib2 dependency from .info file (no script changes) + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cinelerra diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info index 4875e0f082..296f02857f 100644 --- a/multimedia/cinelerra/cinelerra.info +++ b/multimedia/cinelerra/cinelerra.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-gg-20210331_eabda9c.t MD5SUM="fd7a1f289192a8f1f77d0a494f8f204b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="faac faad2 imlib2 libavc1394 libdv libiec61883 mjpegtools x264" +REQUIRES="faac faad2 libavc1394 libdv libiec61883 mjpegtools x264" MAINTAINER="Danny Schmarsel" EMAIL="danny@schmarsel.de" diff --git a/multimedia/clamz/clamz.SlackBuild b/multimedia/clamz/clamz.SlackBuild index 08d30df24a..f6560c9811 100644 --- a/multimedia/clamz/clamz.SlackBuild +++ b/multimedia/clamz/clamz.SlackBuild @@ -14,7 +14,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -32,8 +32,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" diff --git a/multimedia/coriander/coriander.SlackBuild b/multimedia/coriander/coriander.SlackBuild index 811c40173f..3756283bee 100644 --- a/multimedia/coriander/coriander.SlackBuild +++ b/multimedia/coriander/coriander.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for coriander -# Copyright 2015-2021 Philip Lacroix <slackph at posteo dot de> +# Copyright 2015-2022 Philip Lacroix <slackph at posteo dot de> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=coriander VERSION=${VERSION:-2.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,11 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ +# We'll have to use -fcommon to work around some multiple definition errors +# that would prevent compilation using GCC versions >= 10, where -fno-common +# is now default. [Reference: https://gcc.gnu.org/gcc-10/porting_to.html] + +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --enable-static=no \ diff --git a/multimedia/cowbell/cowbell.SlackBuild b/multimedia/cowbell/cowbell.SlackBuild index f396c4fac4..e5827bb4fa 100644 --- a/multimedia/cowbell/cowbell.SlackBuild +++ b/multimedia/cowbell/cowbell.SlackBuild @@ -22,7 +22,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,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" diff --git a/multimedia/ctl/README b/multimedia/ctl/README index ed1def5185..ad67ec3ff4 100644 --- a/multimedia/ctl/README +++ b/multimedia/ctl/README @@ -6,10 +6,10 @@ different representations or color spaces. The Color Transformation Language, or CTL, is a small programming language that was designed to serve as a building block for digital color management systems. -CTL allows users to describe color transforms in a concise and unambiguous -way by expressing them as programs. In order to apply a given -transform to an image, the color management system instructs a CTL -interpreter to load and run the CTL program that describes the +CTL allows users to describe color transforms in a concise and +unambiguous way by expressing them as programs. In order to apply a +given transform to an image, the color management system instructs +a CTL interpreter to load and run the CTL program that describes the transform. The original and the transformed image constitute the CTL program's input and output. diff --git a/multimedia/ctl/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/multimedia/ctl/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch new file mode 100644 index 0000000000..e4fadf1aa0 --- /dev/null +++ b/multimedia/ctl/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch @@ -0,0 +1,399 @@ +From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 +From: Jonathan Scruggs <j.scruggs@gmail.com> +Date: Mon, 25 Sep 2017 17:41:26 +0100 +Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files + +* GNUInstallDirs are variables set by each distro and OS, so we + don't need to define them manually. They can also be set manually + during the configure phase. The code to define custom directories can + be removed and replaced with the equivalent GNUInstallDirs variable. +* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully + utilized everywhere. This makes Pkg-Config a hard dependency so that + the libraries and directories can be found easily. This will use the + correct libraries no matter how they are named, so this is compatible + with both pre-2.0 and post 2.0 naming schemes. +* The Pkg-Config files had several errors that are now fixed. + +Upstream PR: https://github.com/ampas/CTL/pull/67 +--- + CMakeLists.txt | 36 ++++++++--------------------- + OpenEXR_CTL/CMakeLists.txt | 2 +- + OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- + OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- + OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- + config/CTL.pc.in | 8 +++---- + config/OpenEXR_CTL.pc.in | 15 ++++++------- + configure.cmake | 41 ++++++++++++++++------------------ + ctlrender/CMakeLists.txt | 20 ++++++++--------- + doc/CMakeLists.txt | 2 +- + lib/IlmCtl/CMakeLists.txt | 4 ++-- + lib/IlmCtlMath/CMakeLists.txt | 4 ++-- + lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- + lib/IlmImfCtl/CMakeLists.txt | 6 ++--- + lib/dpx/CMakeLists.txt | 1 + + 15 files changed, 66 insertions(+), 89 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01f622c..35e9a48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,22 +1,14 @@ + cmake_minimum_required(VERSION 2.8) + project( CTL ) + ++INCLUDE ( GNUInstallDirs ) ++ + set( CTL_MAJOR_VERSION 1 ) + set( CTL_MINOR_VERSION 5 ) +-set( CTL_PATCH_VERSION 0 ) ++set( CTL_PATCH_VERSION 2 ) + set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) + +-## Make install directories overrideable +-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) +-set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) +-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) +-set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) +-if( WIN32 AND NOT CYGWIN ) +- set(DEF_INSTALL_CMAKE_DIR CMake) +-else() +- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) +-endif() +-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) ++set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" ) + + # use, i.e. don't skip the full RPATH for the build tree + SET(CMAKE_SKIP_BUILD_RPATH FALSE) +@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + # which point to directories outside the build tree to the install RPATH + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + # the RPATH to be used when installing, but only if it's not a system directory +-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) ++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) + IF("${isSystemDir}" STREQUAL "-1") +- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + ENDIF("${isSystemDir}" STREQUAL "-1") + +- +-## convert install paths to absolute +-foreach( p LIB BIN INCLUDE CMAKE DOC) +- set( var INSTALL_${p}_DIR ) +- if( NOT IS_ABSOLUTE "${${var}}" ) +- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) +- endif() +-endforeach() +- + option(ENABLE_SHARED "Enable Shared Libraries" ON) + + if ( ENABLE_SHARED ) +@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr + export(PACKAGE CTL) + + # Create a CTLBuildTreeSettings.cmake file for the use from the build tree +-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") ++file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) + configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) + configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) + + if ( PKG_CONFIG_FOUND ) + configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) +-install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) ++install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) + endif() + + install( FILES + "${PROJECT_BINARY_DIR}/CTLConfig.cmake" + "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" ++ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" + DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) +-install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION +- "${INSTALL_CMAKE_DIR}" COMPONENT dev) + +diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt +index c1ca53e..3f19dd4 100644 +--- a/OpenEXR_CTL/CMakeLists.txt ++++ b/OpenEXR_CTL/CMakeLists.txt +@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) + + if ( PKG_CONFIG_FOUND ) + configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) +-install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) ++install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) + endif() + + # TODO CMake config +diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt +index c63c22e..9c9e5b8 100644 +--- a/OpenEXR_CTL/CtlModules/CMakeLists.txt ++++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt +@@ -2,6 +2,6 @@ install( + FILES + utilities.ctl + DESTINATION +- ${INSTALL_LIB_DIR}/CTL ++ ${CMAKE_INSTALL_LIBDIR}/CTL + ) + +diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt +index e396ec5..1f0eea0 100644 +--- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt ++++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt +@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) + target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) + target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) + +-install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) ++install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) +diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt +index 50bd116..d9eadd8 100644 +--- a/OpenEXR_CTL/exrdpx/CMakeLists.txt ++++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt +@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) + target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) + target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) + +-install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) ++install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) + + +diff --git a/config/CTL.pc.in b/config/CTL.pc.in +index 6d6e732..9b212a4 100644 +--- a/config/CTL.pc.in ++++ b/config/CTL.pc.in +@@ -1,8 +1,6 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@INSTALL_BIN_DIR@ +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INCLUDE_DIR@ +-CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL + + Name: CTL + Description: CTL interpreter library +diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in +index 4cef5c6..39a1a3f 100644 +--- a/config/OpenEXR_CTL.pc.in ++++ b/config/OpenEXR_CTL.pc.in +@@ -1,11 +1,10 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +-OpenEXR_includedir=@includedir@/OpenEXR ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR + + Name: OpenEXR_CTL + Description: Simplified OpenEXR interface to CTL +-Version: @OPENEXR_CTL_VERSION@ +-Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ +-Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} ++Version: @CTL_VERSION@ ++Libs: -L${libdir} -lIlmImfCtl ++Cflags: -I${OpenEXR_includedir} ++Requires: CTL,OpenEXR +diff --git a/configure.cmake b/configure.cmake +index 1817071..eb7e14e 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -1,10 +1,7 @@ +-# Until we get some of these modules into the upstream packages, put them here +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") ++# Make Pkg-Config required. ++find_package( PkgConfig ) + +-find_package( PkgConfig QUIET ) +- +-find_package( IlmBase QUIET ) ++PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) + if(IlmBase_FOUND) + message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) + ### +@@ -13,11 +10,11 @@ if(IlmBase_FOUND) + ### + include_directories( ${IlmBase_INCLUDE_DIRS} ) + link_directories( ${IlmBase_LIBRARY_DIRS} ) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) ++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) + else() + message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) + endif() +@@ -39,20 +36,20 @@ else() + endif() + endif() + +-find_package( OpenEXR QUIET ) ++PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) + if (OpenEXR_FOUND) + message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) + else() + message( WARNING "Unable to find OpenEXR libraries, disabling" ) + endif() + +-find_package( AcesContainer ) +-if (AcesContainer_FOUND) +- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) +-else() +- if ( PKG_CONFIG_FOUND ) +- pkg_check_modules( AcesContainer AcesContainer ) +- else() +- message( WARNING "Unable to find AcesContainer libraries, disabling" ) +- endif() +-endif() ++find_package( AcesContainer ) ++ if (AcesContainer_FOUND) ++ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) ++ else() ++ if ( PKG_CONFIG_FOUND ) ++ pkg_check_modules( AcesContainer AcesContainer ) ++ else() ++ message( WARNING "Unable to find AcesContainer libraries, disabling" ) ++ endif() ++ endif() +diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt +index 9fced14..d97093d 100644 +--- a/ctlrender/CMakeLists.txt ++++ b/ctlrender/CMakeLists.txt +@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) + link_directories( ${OpenEXR_LIBRARY_DIRS} ) + endif() + +-if ( AcesContainer_FOUND ) +-add_definitions( -DHAVE_ACESFILE=1 ) +-include_directories( ${AcesContainer_INCLUDE_DIRS} ) +-link_directories( ${AcesContainer_LIBRARY_DIRS} ) +-endif() +- ++if ( AcesContainer_FOUND ) ++add_definitions( -DHAVE_ACESFILE=1 ) ++include_directories( ${AcesContainer_INCLUDE_DIRS} ) ++link_directories( ${AcesContainer_LIBRARY_DIRS} ) ++endif() ++ + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" ) + + add_executable( ctlrender +@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) + target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) + target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) + endif() +-if (AcesContainer_FOUND) +-target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) +-target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) ++if (AcesContainer_FOUND) ++target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) ++target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) + endif() + +-install( TARGETS ctlrender DESTINATION bin ) ++install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 0b123d0..9776205 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1 +1 @@ +-install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) ++install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) +diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt +index 3672a43..ef301bd 100644 +--- a/lib/IlmCtl/CMakeLists.txt ++++ b/lib/IlmCtl/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} + ) + + target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) +-target_link_libraries( IlmCtl Iex IlmThread Half ) ++target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) + + set_target_properties( IlmCtl PROPERTIES + VERSION ${CTL_VERSION} +@@ -50,4 +50,4 @@ install( FILES + CtlVersion.h + DESTINATION include/CTL ) + +-install( TARGETS IlmCtl DESTINATION lib ) ++install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt +index 96738cf..6997c74 100644 +--- a/lib/IlmCtlMath/CMakeLists.txt ++++ b/lib/IlmCtlMath/CMakeLists.txt +@@ -18,8 +18,8 @@ install( FILES + CtlLookupTable.h + CtlRbfInterpolator.h + CtlSparseMatrix.h +- DESTINATION include/CTL ) ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) + +-install( TARGETS IlmCtlMath DESTINATION lib ) ++install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) + + # TODO Add Imath and Iex libadd dependency and version info +diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt +index 2ba792a..5eaf87d 100644 +--- a/lib/IlmCtlSimd/CMakeLists.txt ++++ b/lib/IlmCtlSimd/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) + + add_executable( halfExpLogTable halfExpLogTable.cpp ) +-target_link_libraries( halfExpLogTable Half ) ++target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) + + add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" + COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" +@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES + SOVERSION ${CTL_VERSION} + ) + +-install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) ++install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) + +-install( TARGETS IlmCtlSimd DESTINATION lib ) ++install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt +index 47563df..784e27f 100644 +--- a/lib/IlmImfCtl/CMakeLists.txt ++++ b/lib/IlmImfCtl/CMakeLists.txt +@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} + ImfCtlCopyFunctionArg.cpp + ) + +-target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) ++target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) + +-install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) ++install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) + + export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) + +-install( TARGETS IlmImfCtl DESTINATION lib ) ++install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt +index c8be26e..918890e 100644 +--- a/lib/dpx/CMakeLists.txt ++++ b/lib/dpx/CMakeLists.txt +@@ -11,3 +11,4 @@ add_library( ctldpx + dpx_rw.cc + ) + ++target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) diff --git a/multimedia/ctl/ctl.SlackBuild b/multimedia/ctl/ctl.SlackBuild index 8db6239b97..b29fa6ede5 100644 --- a/multimedia/ctl/ctl.SlackBuild +++ b/multimedia/ctl/ctl.SlackBuild @@ -4,13 +4,16 @@ # Copyright 2016 Klaatu, Wellington NZ # All rights reserved. -# + +# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix build on 15.0. +# - move .doc and .pdf documentation to our doc dir. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ctl VERSION=${VERSION:-1.5.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -22,9 +25,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -59,9 +59,16 @@ cd CTL-$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 {} \+ || true + +# 20220223 bkw: patches comes from AUR and/or gentoo. +patch -p1 < $CWD/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch +patch -p1 < $CWD/ilmbase-2.3.0-compatibility.patch + +# 20220223 bkw: C++, the ever-moving target... +sed -i -e 's,std::istream::streampos,std::streampos,g' lib/dpx/dpx.hh PKG_CONFIG_PATH="$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig:$PKG_CONFIG_PATH" \ CFLAGS="$SLKCFLAGS" \ @@ -71,32 +78,19 @@ cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS="-lAcesContainer" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_CMAKE_DIR=/usr/lib${LIBDIRSUFFIX} \ -DINSTALL_LIB_DIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. make - make install DESTDIR=$PKG - - #brute force to conform to LIBDIRSUFFIX post facto - #installer as written hardcode some files to usr/lib - if [ -n "$LIBDIRSUFFIX" ]; then - mv $PKG/usr/lib/* $PKG/usr/lib${LIBDIRSUFFIX} - rmdir $PKG/usr/lib || false - fi - + make install/strip DESTDIR=$PKG cd .. -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 - -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS LICENSE CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/CTL/* $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/ctl/ilmbase-2.3.0-compatibility.patch b/multimedia/ctl/ilmbase-2.3.0-compatibility.patch new file mode 100644 index 0000000000..48555c17a6 --- /dev/null +++ b/multimedia/ctl/ilmbase-2.3.0-compatibility.patch @@ -0,0 +1,11 @@ +--- a/lib/IlmCtlSimd/CtlSimdInst.cpp.orig 2014-06-03 01:11:24 UTC ++++ b/lib/IlmCtlSimd/CtlSimdInst.cpp +@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas + REPLACE_EXC + (e, "\n" << + xcontext.fileName() << ":" << +- inst->lineNumber() << ": " << e); ++ inst->lineNumber() << ": " << e.what()); + + throw e; + } diff --git a/multimedia/cuetools/cuetools.SlackBuild b/multimedia/cuetools/cuetools.SlackBuild index cde233ee86..e464fe62d1 100644 --- a/multimedia/cuetools/cuetools.SlackBuild +++ b/multimedia/cuetools/cuetools.SlackBuild @@ -26,7 +26,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +44,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" diff --git a/multimedia/davs2/README b/multimedia/davs2/README new file mode 100644 index 0000000000..f91a5653fa --- /dev/null +++ b/multimedia/davs2/README @@ -0,0 +1,4 @@ +davs2 is an open-source decoder of +AVS2-P2/IEEE1857.4 video coding standard. + +davs2 is an optional dependency of FFmpeg. diff --git a/multimedia/davs2/davs2.SlackBuild b/multimedia/davs2/davs2.SlackBuild new file mode 100644 index 0000000000..f731aab2b8 --- /dev/null +++ b/multimedia/davs2/davs2.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/bash + +# Slackware build script for davs2 + +# Copyright 2022 Vijay Marcel + +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=davs2 +VERSION=${VERSION:-1.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 +trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +cd build/linux/ +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-shared \ + --system-libdavs2 \ + --enable-lto \ + --enable-strip \ + --bit-depth='8' \ + --chroma-format='all' + +make +make install DESTDIR=$PKG + +cd ../.. + +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 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/davs2/davs2.info b/multimedia/davs2/davs2.info new file mode 100644 index 0000000000..efb0d6d964 --- /dev/null +++ b/multimedia/davs2/davs2.info @@ -0,0 +1,10 @@ +PRGNAM="davs2" +VERSION="1.7" +HOMEPAGE="https://github.com/pkuvcl/davs2" +DOWNLOAD="https://github.com/pkuvcl/davs2/archive/1.7/davs2-1.7.tar.gz" +MD5SUM="d1558a5413b6691ad9c867cbd5c765aa" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/totem/slack-desc b/multimedia/davs2/slack-desc index 1694c2ebad..a3e946b9b3 100644 --- a/multimedia/totem/slack-desc +++ b/multimedia/davs2/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -totem: totem (GNOME Movie Player) -totem: -totem: Totem is the official movie player of the GNOME desktop environment -totem: based on GStreamer. It features a playlist, a full-screen mode, seek -totem: and volume controls, as well as keyboard navigation. -totem: -totem: homepage: http://projects.gnome.org/totem -totem: -totem: -totem: -totem: +davs2: davs2 (AVS2 Decoder) +davs2: +davs2: davs2 is an open source decoder of AVS2 Video decoding +davs2: standard +davs2: +davs2: Homepage: https//github.com/pkuvcl/davs2 +davs2: +davs2: +davs2: +davs2: +davs2: diff --git a/multimedia/dirac/README b/multimedia/dirac/README index e8f98707d4..989d416d04 100644 --- a/multimedia/dirac/README +++ b/multimedia/dirac/README @@ -1,3 +1,3 @@ -Dirac is a open and royalty free high quality codec developed by BBC Research. -The name Dirac is now mostly use to refer to the algorithm and specs while -dirac-research is the name of the implementation. +Dirac is a open and royalty free high quality codec developed by BBC +Research. The name Dirac is now mostly use to refer to the algorithm +and specs while dirac-research is the name of the implementation. diff --git a/multimedia/dirac/dirac.SlackBuild b/multimedia/dirac/dirac.SlackBuild index d57013a00f..0af0391e78 100644 --- a/multimedia/dirac/dirac.SlackBuild +++ b/multimedia/dirac/dirac.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dirac VERSION=${VERSION:-1.0.2} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -113,6 +113,8 @@ cp -a AUTHORS ChangeLog COPYING INSTALL \ NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/droidcam/Droidcam.desktop b/multimedia/droidcam/Droidcam.desktop deleted file mode 100644 index b8c1f92f9c..0000000000 --- a/multimedia/droidcam/Droidcam.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=DroidCam -Comment=Use your phone as a webcam -TryExec=/usr/bin/droidcam -Exec=/usr/bin/droidcam -Icon=icon2.png -Terminal=false -Type=Application -Categories=Video;AudioVideo; diff --git a/multimedia/droidcam/README b/multimedia/droidcam/README index 1c5059f484..354a218a76 100644 --- a/multimedia/droidcam/README +++ b/multimedia/droidcam/README @@ -1,17 +1,21 @@ DroidCam -DroidCam turns your phone/tablet into a webcam for your PC. -Use it with chat programs like Zoom, MS Teams, and Skype. +DroidCam turns your phone/tablet into a webcam for your PC. Use + it with chat programs like Zoom, MS Teams, and Skype. Main Features: -– Chat using “DroidCam Webcam” on your computer, including Sound and Picture. +– Chat using “DroidCam Webcam” on your computer, including Sound +and Picture. – Connect over WiFi or USB cable. – Unlimited free usage with standard definition. – Keep using your phone while DroidCam is in background (Android). -– Simple, safe, efficient, and trusted by millions of people worldwide. +– Simple, safe, efficient, and trusted by millions of people +worldwide. -The GNU/Linux client is a combination an executable app that connects to -the phone, and Video4Linux and ALSA loopback drivers. +The GNU/Linux client is a combination an executable app that +connects to the phone, and Video4Linux and ALSA loopback drivers. + +It’s assumed you are somewhat familiar with the system and how to +use the Terminal. Please keep in mind other posts on the site are +Windows oriented. -It’s assumed you are somewhat familiar with the system and how to use the -Terminal. Please keep in mind other posts on the site are Windows oriented. diff --git a/multimedia/droidcam/README.SLACKWARE b/multimedia/droidcam/README.SLACKWARE index c4c7f8ca08..a91a930ff9 100644 --- a/multimedia/droidcam/README.SLACKWARE +++ b/multimedia/droidcam/README.SLACKWARE @@ -1,41 +1,24 @@ Droidcam Slackware -After installing the package, a file to load the video audio modules will be -created in "/etc/rc.d" called "rc.droidcam", +Probably the camera and microphone modules of the cell +phone will not be loaded at startup, being necessary to +add the following lines in the file "rc.modules.local". -If the module responsible for functional the camera is not working the -file is already with execution permission, only need run. +/sbin/modprobe v4l2loopback-dc +/sbin/modprobe snd-aloop -chmod +x /etc/rc.d/rc.droidcam -/etc/rc.d/rc.droidcam start -Probably the camera and microphone modules of the cell phone will not be -loaded at startup, being necessary to add the -following lines in the file "rc.local". +It is important to install the dkms package because it +manages the v412loopback-dc video module. to compile the +module automatically when the kernel is updated. +Added this lines in rc.modules.local. -if [-x /etc/rc.d/rc.droidcam]; then - /etc/rc.d/rc.droidcam start &> / dev / null -fi - -If you prefer to add in rc.shutdown. +# Enable DKMS module rebuilding -if [-x /etc/rc.d/rc.droidcam]; then - /etc/rc.d/rc.droidcam stop &> / dev / null +if [ -x /usr/lib/dkms/dkms_autoinstaller ]; then + echo "Running DKMS autoinstaller" + /usr/lib/dkms/dkms_autoinstaller start fi -Whenever you upgrade the kernel you need to reinstall the package so that the -module is recompiled on the new kernel. - - -When you need to uninstall the package The camera video driver will still be -installed and you need to remove manually if you can. - -Login as root. - -rmmod -f v4l2loopback_dc -rm -f /lib/modules/`uname -r`/kernel/drivers/media/video/v4l2loopback-dc.ko - -For more informations. -https://www.dev47apps.com/droidcam/linux/ diff --git a/multimedia/droidcam/dkms.conf b/multimedia/droidcam/dkms.conf new file mode 100644 index 0000000000..6a926bc32c --- /dev/null +++ b/multimedia/droidcam/dkms.conf @@ -0,0 +1,5 @@ +PACKAGE_NAME="v4l2loopback-dc" +PACKAGE_VERSION="1.8.2" +BUILT_MODULE_NAME[0]="v4l2loopback-dc" +DEST_MODULE_LOCATION[0]="/kernel/drivers/media/video/v4l2loopback-dc" +AUTOINSTALL="yes"
\ No newline at end of file diff --git a/multimedia/droidcam/doinst.sh b/multimedia/droidcam/doinst.sh index 02d9e036da..4c9ca03538 100644 --- a/multimedia/droidcam/doinst.sh +++ b/multimedia/droidcam/doinst.sh @@ -1,3 +1,6 @@ +VERSION="1.8.2" +MODULE="v4l2loopback-dc" + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -6,10 +9,22 @@ if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi -if [ -d /opt/droidcam-1.7.2 ]; then - cd /opt/droidcam-1.7.2 && ./install-video >/dev/null 2>&1 -fi +_installModule(){ + + cp -r /tmp/SBo/$MODULE-$VERSION /usr/src/ + dkms add -m $MODULE -v $VERSION + dkms build -m $MODULE -v $VERSION + dkms install -m $MODULE -v $VERSION + /sbin/modprobe $MODULE + /sbin/modprobe snd-aloop +} + +if [ "lsmod | grep v4l2loopback_dc" ]; then + + _installModule + +else + + echo "Module v4l2loopback_dc installed" -if [ -d /opt/droidcam-1.7.2 ]; then - cd /opt/droidcam-1.7.2 && ./install-sound >/dev/null 2>&1 fi diff --git a/multimedia/droidcam/douninst.sh b/multimedia/droidcam/douninst.sh new file mode 100644 index 0000000000..4406ab4609 --- /dev/null +++ b/multimedia/droidcam/douninst.sh @@ -0,0 +1,7 @@ + + VERSION="1.8.2" + MODULE="v4l2loopback-dc" + +dkms remove -m $MODULE/$VERSION --all >/dev/null 2>&1 +rm -rf /usr/src/$MODULE-$VERSION >/dev/null 2>&1 +rmmod -f v4l2loopback-dc >/dev/null 2>&1 diff --git a/multimedia/droidcam/droidcam.SlackBuild b/multimedia/droidcam/droidcam.SlackBuild index e6f8c1a6c4..4c006de11f 100644 --- a/multimedia/droidcam/droidcam.SlackBuild +++ b/multimedia/droidcam/droidcam.SlackBuild @@ -23,10 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cd $(dirname $0) ; CWD=$(pwd) - PRGNAM=droidcam -VERSION=${VERSION:-1.7.2} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,6 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi + +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -84,32 +84,34 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ + +MODULE="v4l2loopback-dc" + #Prepare folder to install -mkdir -p $PKG/etc/modprobe.d +mkdir -p $PKG/usr/src/$MODULE-$VERSION +cp -r $TMP/$PRGNAM-$VERSION/v4l2loopback $TMP/$MODULE-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/share/icons mkdir -p $PKG/usr/share/applications mkdir -p $PKG/usr/bin -mkdir -p $PKG/opt -touch $PKG/etc/modprobe.d/$PRGNAM.conf -cp -r $TMP/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION -cat $TMP/$PRGNAM-$VERSION/uninstall > $PKG/opt/$PRGNAM-uninstall -cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM $PKG/usr/bin/$PRGNAM -cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM-cli $PKG/usr/bin/$PRGNAM-cli -cp -a $TMP/$PRGNAM-$VERSION/icon2.png $PKG/usr/share/icons/icon2.png -cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop +cat $CWD/dkms.conf > $TMP/$MODULE-$VERSION/dkms.conf +cp -a $TMP/$PRGNAM-$VERSION/$PRGNAM $PKG/usr/bin/$PRGNAM +strip -s $PKG/usr/bin/$PRGNAM +cp -a $TMP/$PRGNAM-$VERSION/icon2.png $PKG/usr/share/icons/droidcam.png +cp -a $TMP/$PRGNAM-$VERSION/droidcam.desktop $PKG/usr/share/applications/Droidcam.desktop + +sed -i "5,6s/local\///" $PKG/usr/share/applications/Droidcam.desktop +sed -i "7s/.*/Icon=\/usr\/share\/icons\/droidcam.png/" $PKG/usr/share/applications/Droidcam.desktop #Documentation cp -a $CWD/README* $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -#Script for run modules -cp $CWD/rc.$PRGNAM.new /etc/rc.d/rc.$PRGNAM - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/douninst.sh > $PKG/install/douninst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/droidcam/droidcam.info b/multimedia/droidcam/droidcam.info index 99a351fca8..3849af8446 100644 --- a/multimedia/droidcam/droidcam.info +++ b/multimedia/droidcam/droidcam.info @@ -1,10 +1,10 @@ PRGNAM="droidcam" -VERSION="1.7.2" +VERSION="1.8.2" HOMEPAGE="https://www.dev47apps.com/" -DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.7.2.zip" -MD5SUM="fada5d691f7f358cd66182ae2214b25f" +DOWNLOAD="https://files.dev47apps.net/linux/droidcam_1.8.2.zip" +MD5SUM="af019ca66198c501e2ffa813d1c81471" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="android-tools" -MAINTAINER="Andreo F. Rissardo" +REQUIRES="android-tools dkms" +MAINTAINER="Andreo Rissardo" EMAIL="andreotec@gmail.com" diff --git a/multimedia/droidcam/rc.droidcam.new b/multimedia/droidcam/rc.droidcam.new deleted file mode 100644 index e6d244fece..0000000000 --- a/multimedia/droidcam/rc.droidcam.new +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - - - - - - -case $1 in -start) - modprobe snd-aloop && modprobe v4l2loopback_dc - - -;; - -stop) - rmmod -f snd-aloop && rmmod -f v4l2loopback_dc - -;; - - - -restart) - - $0 stop - - - $0 start -;; - - -*) - echo 'Run only "/etc/rc.d/rc.droidcam start | stop| restart"' - ;; -esac diff --git a/multimedia/droidcam/slack-desc b/multimedia/droidcam/slack-desc index fb7c41ae03..52ffa083b1 100644 --- a/multimedia/droidcam/slack-desc +++ b/multimedia/droidcam/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -droidcam: droicam (Use your phone as a webcam!) +droidcam: droidcam (Use your phone as a webcam!) droidcam: droidcam: DroidCam turns your phone/tablet into a webcam for your PC. Use it droidcam: with chat programs like Zoom, MS Teams, and Skype. The app works with droidcam: a PC Client component that installs the webcam drivers, and connects droidcam: the computer to your mobile. -droidcam: -droidcam: +droidcam: +droidcam: droidcam: droidcam: https://www.dev47apps.com/ droidcam: diff --git a/multimedia/dsmidiwifi/README b/multimedia/dsmidiwifi/README index 4fcb4e5a8c..83f9efa07f 100644 --- a/multimedia/dsmidiwifi/README +++ b/multimedia/dsmidiwifi/README @@ -1,8 +1,8 @@ -An application that runs on the computer and forwards the MIDI messages received -via Wifi to MIDI applications. +An application that runs on the computer and forwards the MIDI +messages received via Wifi to MIDI applications. -Mini howto: Start jack and dsmidiwifi. Then start a (dsmi) wifimidi program on -another network device (like midimonitor on iPad) +Mini howto: Start jack and dsmidiwifi. Then start a (dsmi) wifimidi +program on another network device (like midimonitor on iPad) Optional runtime dependencies (for easy routing of dsmidiwifi) are jack and qjackctl diff --git a/multimedia/dsmidiwifi/dsmidiwifi.SlackBuild b/multimedia/dsmidiwifi/dsmidiwifi.SlackBuild index b5ba8238d3..fae8646fc6 100644 --- a/multimedia/dsmidiwifi/dsmidiwifi.SlackBuild +++ b/multimedia/dsmidiwifi/dsmidiwifi.SlackBuild @@ -13,15 +13,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -31,8 +28,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" @@ -57,13 +54,13 @@ cd $PRGNAM-$VERSION/source 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -qmake +qmake-qt4 make # manual cp the files and canonicalize diff --git a/multimedia/dsmidiwifi/dsmidiwifi.info b/multimedia/dsmidiwifi/dsmidiwifi.info index 4a1ceceea3..f043849032 100644 --- a/multimedia/dsmidiwifi/dsmidiwifi.info +++ b/multimedia/dsmidiwifi/dsmidiwifi.info @@ -5,6 +5,6 @@ DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.g MD5SUM="e45703b1a37602d6326916d2ce1b404c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt4" MAINTAINER="Michales Michaloudes" EMAIL="korgie@gmail.com" diff --git a/multimedia/dssi/README b/multimedia/dssi/README index 9daa911de7..8db4cda608 100644 --- a/multimedia/dssi/README +++ b/multimedia/dssi/README @@ -1,6 +1,11 @@ -DSSI (pronounced "dizzy") is an API for audio processing plugins, particularly -useful for software synthesis plugins with user interfaces. +DSSI (pronounced "dizzy") is an API for audio processing plugins, +particularly useful for software synthesis plugins with user +interfaces. -DSSI is an open and well-documented specification developed for use in Linux -audio applications, although portable to other platforms. It may be thought of -as LADSPA-for-instruments, or something comparable to VSTi. +DSSI is an open and well-documented specification developed for use +in Linux audio applications, although portable to other platforms. It +may be thought of as LADSPA-for-instruments, or something comparable +to VSTi. + +qt4 is an optional dependency. If found, the package will include a +qt-based 'trivial_sampler_qt' plugin. diff --git a/multimedia/dssi/dssi.SlackBuild b/multimedia/dssi/dssi.SlackBuild index 3e3c961b09..ee3849c3ed 100644 --- a/multimedia/dssi/dssi.SlackBuild +++ b/multimedia/dssi/dssi.SlackBuild @@ -14,15 +14,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -32,8 +29,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" @@ -57,9 +54,9 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/dvblast/README b/multimedia/dvblast/README index 11aa28453f..476d34d17b 100644 --- a/multimedia/dvblast/README +++ b/multimedia/dvblast/README @@ -1 +1,2 @@ -DVBlast is a simple and powerful MPEG-2/TS demux and streaming application. +DVBlast is a simple and powerful MPEG-2/TS demux and streaming +application. diff --git a/multimedia/dvd-slideshow/dvd-slideshow.SlackBuild b/multimedia/dvd-slideshow/dvd-slideshow.SlackBuild index 6b719ff826..41214889eb 100644 --- a/multimedia/dvd-slideshow/dvd-slideshow.SlackBuild +++ b/multimedia/dvd-slideshow/dvd-slideshow.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dvd-slideshow -VERSION=${VERSION:-0.8.4_2} +VERSION=${VERSION:-0.8.6_1} SRCVER=$(echo $VERSION | tr _ -) ARCH=noarch BUILD=${BUILD:-1} diff --git a/multimedia/dvd-slideshow/dvd-slideshow.info b/multimedia/dvd-slideshow/dvd-slideshow.info index 1045c88e75..3eebd16237 100644 --- a/multimedia/dvd-slideshow/dvd-slideshow.info +++ b/multimedia/dvd-slideshow/dvd-slideshow.info @@ -1,8 +1,8 @@ PRGNAM="dvd-slideshow" -VERSION="0.8.4_2" +VERSION="0.8.6_1" HOMEPAGE="http://dvd-slideshow.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/dvd-slideshow/files/dvd-slideshow/0.8.4-2/dvd-slideshow-0.8.4-2.tar.gz" -MD5SUM="ec9527a7afc11f6a05f499b590aa849a" +DOWNLOAD="http://sourceforge.net/projects/dvd-slideshow/files/dvd-slideshow/0.8.6-1/dvd-slideshow-0.8.6-1.tar.gz" +MD5SUM="6fce4f2ae9dd30fb2b19c39336ea4046" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="oggvideotools" diff --git a/multimedia/dvdbackup/dvdbackup.SlackBuild b/multimedia/dvdbackup/dvdbackup.SlackBuild index 81035bd807..49033887db 100644 --- a/multimedia/dvdbackup/dvdbackup.SlackBuild +++ b/multimedia/dvdbackup/dvdbackup.SlackBuild @@ -51,8 +51,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" diff --git a/multimedia/dvdrip/README b/multimedia/dvdrip/README index 637a299ff4..296e3e9a93 100644 --- a/multimedia/dvdrip/README +++ b/multimedia/dvdrip/README @@ -1,7 +1,8 @@ -dvd::rip is a full featured DVD copy program written in Perl. It provides an -easy to use but feature-rich Gtk+ GUI to control almost all aspects of the -ipping and transcoding process. It uses the widely known video processing -swissknife transcode and many other Open Source tools. +dvd::rip is a full featured DVD copy program written in Perl. +It provides an easy to use but feature-rich Gtk+ GUI to control almost +all aspects of the ipping and transcoding process. It uses the widely +known video processing swissknife transcode and many other Open Source +tools. -ffmpeg, lsdvd, ogmtools, mjpegtools, xvid4conf, subtitleripper, fping and rar -are optional dependencies. +ffmpeg, lsdvd, ogmtools, mjpegtools, xvid4conf, subtitleripper, fping, +and rar are optional dependencies. diff --git a/multimedia/dvdrip/dvdrip.SlackBuild b/multimedia/dvdrip/dvdrip.SlackBuild index 6a8c0233c2..6dda301a07 100644 --- a/multimedia/dvdrip/dvdrip.SlackBuild +++ b/multimedia/dvdrip/dvdrip.SlackBuild @@ -14,15 +14,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -32,8 +29,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" @@ -57,17 +54,17 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ INSTALLVENDORMAN1DIR=/usr/man/man1 \ INSTALLVENDORMAN3DIR=/usr/man/man3 -make -make install DESTDIR=$PKG +make -j1 +make -j1 install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/multimedia/emoc/emoc.SlackBuild b/multimedia/emoc/emoc.SlackBuild index 744788a225..106dba34c3 100644 --- a/multimedia/emoc/emoc.SlackBuild +++ b/multimedia/emoc/emoc.SlackBuild @@ -14,15 +14,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -32,8 +29,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" @@ -57,11 +54,11 @@ cd $PRGNAM 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ -qmake +qmake-qt4 make clean make diff --git a/multimedia/emoc/emoc.info b/multimedia/emoc/emoc.info index e559cbd38f..a4fae0dc83 100644 --- a/multimedia/emoc/emoc.info +++ b/multimedia/emoc/emoc.info @@ -5,6 +5,6 @@ DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/emoc/emo MD5SUM="94b9aad7155e93a7ea69b72a573cf2b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt4" MAINTAINER="otzy_007" EMAIL="oz@oprod.net" diff --git a/multimedia/exaile/README b/multimedia/exaile/README index 459eb3e91b..75a40ce440 100644 --- a/multimedia/exaile/README +++ b/multimedia/exaile/README @@ -1,9 +1,8 @@ Exaile is a music manager and player for GTK+ written in Python. It -incorporates automatic fetching of album art, handling of large libraries, -lyrics fetching, artist/album information via Wikipedia, and Last.fm -submission support. +incorporates automatic fetching of album art, handling of large +libraries, lyrics fetching, artist/album information via Wikipedia, +and Last.fm submission support. -Optional dependencies are gst0-plugins-ugly (for mp3 support), cddb-py (for -audio CD playback), gst0-gnome-vfs (for SHOUTcast support), -pywebkitgtk (for contextual informations about the track) and streamripper -(to record streams). +Optional dependencies are pylast (Last.FM integration), lxml +(Lyrics), musicbrainzngs (Musicbrainz covers), streamripper (to +record streams), and Sphinx plus sphinx_rtd_theme (Documentation). diff --git a/multimedia/exaile/exaile.SlackBuild b/multimedia/exaile/exaile.SlackBuild index bafe2f6d50..8aad122a24 100644 --- a/multimedia/exaile/exaile.SlackBuild +++ b/multimedia/exaile/exaile.SlackBuild @@ -3,6 +3,7 @@ # Written by Marco Cecchetti (mrc.ildp@gmail.com) # Update by Diogo Leal (diogo@diogoleal.com) +# Copyright 2022 fourtysixandtwo <fourtysixandtwo@sliderr.net> # Copyright 2017 Ekin Akoglu, Erdemli, Mersin, Turkey | ekinakoglu@gmail.com # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org @@ -24,10 +25,12 @@ # along with this program (most likely, a file named COPYING). If # not, see <http://www.gnu.org/licenses/>. +# 20221021 46and2: Updated version, new maintainer. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=exaile -VERSION=${VERSION:-3.4.5} +VERSION=${VERSION:-4.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,12 +56,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" 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 @@ -77,22 +84,25 @@ 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 {} \; -## Fix manpage location. -sed -i -e 's|share/man|man|g' Makefile - +PREFIX=/usr make -PREFIX=/usr \ -LIBINSTALLDIR=/lib${LIBDIRSUFFIX} \ -make install DESTDIR=$PKG +make install \ + PREFIX=${PREFIX} \ + LIBINSTALLDIR=${PREFIX}/lib${LIBDIRSUFFIX} \ + MANPREFIX=${PREFIX}/ \ + DESTDIR=$PKG mv $PKG/etc/xdg/exaile/settings.ini $PKG/etc/xdg/exaile/settings.ini.new 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 +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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING DEPS INSTALL README \ + COPYING DEPS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/exaile/exaile.info b/multimedia/exaile/exaile.info index 044881d47d..0f65d0cb9c 100644 --- a/multimedia/exaile/exaile.info +++ b/multimedia/exaile/exaile.info @@ -1,10 +1,10 @@ PRGNAM="exaile" -VERSION="3.4.5" +VERSION="4.1.2" HOMEPAGE="https://www.exaile.org/" -DOWNLOAD="https://github.com/exaile/exaile/releases/download/3.4.5/exaile-3.4.5.tar.gz" -MD5SUM="2c72d8dc8dc68fd6a9d129a154a5af3c" +DOWNLOAD="https://github.com/exaile/exaile/releases/download/4.1.2/exaile-4.1.2.tar.gz" +MD5SUM="ff59fc1a6fbd3967338479d570ba3f51" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gst0-python mutagen" -MAINTAINER="Ekin Akoglu" -EMAIL="ekinakoglu@gmail.com" +REQUIRES="bsddb3 gst-python mutagen feedparser" +MAINTAINER="fourtysixandtwo" +EMAIL="fourtysixandtwo@sliderr.net" diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild index 9ab7fa91bf..f6b8079dfb 100644 --- a/multimedia/farsight2/farsight2.SlackBuild +++ b/multimedia/farsight2/farsight2.SlackBuild @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -75,9 +72,9 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ patch -p1 < $CWD/make-4.3.patch @@ -108,6 +105,8 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/fdkaac/README b/multimedia/fdkaac/README index a502e54324..9241c082b8 100644 --- a/multimedia/fdkaac/README +++ b/multimedia/fdkaac/README @@ -1,4 +1,2 @@ -fdkaac is command line encoder frontend for libfdk-aac, -(also available from SBo) which currently produces the -highest quality aac sound from any Linux application or -library. +fdkaac is a command-line encoder frontend for libfdk-aac, +(also available from SBo) to convert a sound file to AAC. diff --git a/multimedia/fdkaac/fdkaac.SlackBuild b/multimedia/fdkaac/fdkaac.SlackBuild index 457c9aeafc..8697675e54 100644 --- a/multimedia/fdkaac/fdkaac.SlackBuild +++ b/multimedia/fdkaac/fdkaac.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fdkaac -# Klaatu | Wellington, NZ | klaatu@member.fsf.org +# Klaatu | Lawrence, NZ | klaatu@member.fsf.org # Copyright 2015 Andrew Strong, Blue Mountains Australia. # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fdkaac -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/fdkaac/fdkaac.info b/multimedia/fdkaac/fdkaac.info index d5805dc951..99136c71a3 100644 --- a/multimedia/fdkaac/fdkaac.info +++ b/multimedia/fdkaac/fdkaac.info @@ -1,8 +1,8 @@ PRGNAM="fdkaac" -VERSION="1.0.0" +VERSION="1.0.2" HOMEPAGE="https://github.com/nu774/fdkaac" -DOWNLOAD="https://github.com/nu774/fdkaac/archive/1.0.0/fdkaac-1.0.0.tar.gz" -MD5SUM="f9eabdada9f1469721ef508360d7c3a3" +DOWNLOAD="https://github.com/nu774/fdkaac/archive/refs/tags/v1.0.2/fdkaac-1.0.2.tar.gz" +MD5SUM="e2d844fd705faef00a09e5f29a88acda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfdk-aac" diff --git a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild index 05918b2523..f74f241404 100644 --- a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild +++ b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="ffmpeg2theora" VERSION=${VERSION:-0.30} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,9 @@ find -L . \ # thanks to Debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768674 patch -p1 < $CWD/link-libm.patch +# thanks arch maintainers +zcat $CWD/scons-python3.patch.gz | patch -p1 + scons install APPEND_CCFLAGS="$SLKCFLAGS" prefix=/usr destdir=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/multimedia/ffmpeg2theora/scons-python3.patch.gz b/multimedia/ffmpeg2theora/scons-python3.patch.gz Binary files differnew file mode 100644 index 0000000000..9302739d1d --- /dev/null +++ b/multimedia/ffmpeg2theora/scons-python3.patch.gz diff --git a/multimedia/ffmpegfs/README b/multimedia/ffmpegfs/README new file mode 100644 index 0000000000..12bb228bc3 --- /dev/null +++ b/multimedia/ffmpegfs/README @@ -0,0 +1,20 @@ +FFmpegfs is a read-only FUSE file system which transcodes +various audio and video formats to mp4, WebM and many more +on the fly when opened and read using the ffmpeg library +thus supporting a multitude of input formats and a variety +of common output formats. + +By default only root has access to this filesystem +for other users, uncomment user_allow_other in +/etc/fuse.conf + +fop is an optional dependency needed for genetating +pdf documents. To generate pdf docs run +make help-pdf and copy the pdf to the doc dir by +customizing the slackbuild + +Example: + +ffmpegs --desttype=mp4 input_dir output_dir -o allow_other,rw + +It is licensed under GPLv3 diff --git a/multimedia/ffmpegfs/ffmpegfs.SlackBuild b/multimedia/ffmpegfs/ffmpegfs.SlackBuild new file mode 100644 index 0000000000..5cb47e3e6d --- /dev/null +++ b/multimedia/ffmpegfs/ffmpegfs.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/bash + +# Slackware build script for ffmpegfs + +# Copyright 2022 Vijay Marcel +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=ffmpegfs +VERSION=${VERSION:-2.10} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then +case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; +esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 +trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ + +./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --htmldir=/usr/doc/$PRGNAM-$VERSION/html/ \ + --build=$ARCH-slackware-linux + +make +make help-html +make install DESTDIR=$PKG + +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 + +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 + +mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/html +cp -a COPYING ChangeLog HISTORY.md README.md NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -r ffmpegfs.1.htmlhelp/* $PKG/usr/doc/$PRGNAM-$VERSION/html +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/ffmpegfs/ffmpegfs.info b/multimedia/ffmpegfs/ffmpegfs.info new file mode 100644 index 0000000000..217edc8995 --- /dev/null +++ b/multimedia/ffmpegfs/ffmpegfs.info @@ -0,0 +1,10 @@ +PRGNAM="ffmpegfs" +VERSION="2.10" +HOMEPAGE="https://nschlia.github.io/ffmpegfs/html/index.html" +DOWNLOAD="https://github.com/nschlia/ffmpegfs/releases/download/v2.10/ffmpegfs-2.10.tar.gz" +MD5SUM="9332f10ca23af57364b91955ca887020" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="w3m graphviz libchardet chromaprint" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/ffmpegfs/slack-desc b/multimedia/ffmpegfs/slack-desc new file mode 100644 index 0000000000..b2c8cc7a19 --- /dev/null +++ b/multimedia/ffmpegfs/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +ffmpegfs: ffmpegfs (Fuse based transcoding File System) +ffmpegfs: +ffmpegfs: FFmpegfs is a read-only FUSE file system which transcodes +ffmpegfs: various audio and video formats to mp4, WebM and many more +ffmpegfs: on the fly when opened and read using the ffmpeg library +ffmpegfs: thus supporting a multitude of input formats and a variety +ffmpegfs: of common output formats. +ffmpegfs: +ffmpegfs: Homepage:https://nschlia.github.io/ffmpegfs/ +ffmpegfs: +ffmpegfs: diff --git a/multimedia/filebot/filebot.info b/multimedia/filebot/filebot.info index 2378337d9f..d93775eed7 100644 --- a/multimedia/filebot/filebot.info +++ b/multimedia/filebot/filebot.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_4.7.9 MD5SUM="ab14c92e18b961068a5b850748aea379" DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_4.7.9/filebot_4.7.9_amd64.deb" MD5SUM_x86_64="8e4aa7163bd4ddd8017459fb77e4e0ee" -REQUIRES="jdk chromaprint libmediainfo" +REQUIRES="zulu-openjdk8 chromaprint libmediainfo" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" diff --git a/multimedia/flowblade/flowblade.SlackBuild b/multimedia/flowblade/flowblade.SlackBuild index ed11fd5307..fa833c97f7 100644 --- a/multimedia/flowblade/flowblade.SlackBuild +++ b/multimedia/flowblade/flowblade.SlackBuild @@ -11,7 +11,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=flowblade -VERSION=${VERSION:-1.16} +VERSION=${VERSION:-24564a} +SRCVERSION=${SRCVERSION:-24564ae0899af9ee92ad31bd884ba804a3137d3b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,7 +51,7 @@ else LIBDIRSUFFIX="" fi -PYTHONDIR=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')") +PYTHONDIR=$(python3 -c "import sys, os; print(os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages'))") set -e @@ -58,8 +59,12 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +mkdir $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz --strip-components=1 \ + -C $PRGNAM-$VERSION +mv $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/$PRGNAM-trunk cd $PRGNAM-$VERSION/$PRGNAM-trunk + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -67,10 +72,11 @@ 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 -p2 < $CWD/495a10c83b7d209bfdb1577efaf718e031ec6f25.patch +# this has been submitted upstream but for now patch it here +patch -p2 < $CWD/mlt7.patch # install -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG # replace PY path in main script sed -i "s|/usr/share/pyshared|$PYTHONDIR|" $PKG/usr/bin/$PRGNAM @@ -91,8 +97,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; # doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +echo `pwd` cp -a \ - PKG-INFO README \ + AUTHORS COPYING README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/flowblade/flowblade.info b/multimedia/flowblade/flowblade.info index 4f18df68b9..0332497893 100644 --- a/multimedia/flowblade/flowblade.info +++ b/multimedia/flowblade/flowblade.info @@ -1,10 +1,10 @@ PRGNAM="flowblade" -VERSION="1.16" +VERSION="24564a" HOMEPAGE="https://github.com/jliljebl/flowblade/" -DOWNLOAD="https://github.com/jliljebl/flowblade/archive/v1.16/flowblade-1.16.tar.gz" -MD5SUM="71490e33fd7c2d44e96de5b59b88121f" +DOWNLOAD="https://github.com/jliljebl/flowblade/archive/24564a/flowblade-24564ae0899af9ee92ad31bd884ba804a3137d3b.tar.gz" +MD5SUM="ededb19439e16588f2490b2f77c66848" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gnome-python ladspa_sdk numpy" +REQUIRES="mlt-bindings" MAINTAINER="Klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/flowblade/mlt7.patch b/multimedia/flowblade/mlt7.patch new file mode 100644 index 0000000000..9f9a1e25b9 --- /dev/null +++ b/multimedia/flowblade/mlt7.patch @@ -0,0 +1,21 @@ +diff --git a/flowblade-trunk/flowblade b/flowblade-trunk/flowblade +index 01f6d092..2cdfcedb 100755 +--- a/flowblade-trunk/flowblade ++++ b/flowblade-trunk/flowblade +@@ -58,11 +58,11 @@ sys.path.insert(0, modules_path) + # Check that we have MLT, missing is fatal. + try: + import mlt +- try: +- mlt_version = mlt.LIBMLT_VERSION +- print ("MLT found, version:", mlt_version) +- except: +- print ("MLT found but version info not available. MLT probably too old to work reliably...") ++except: ++ import mlt7 as mlt ++ ++try: ++ mlt_version = mlt.LIBMLT_VERSION + except Exception as err: + print ("MLT not found, exiting...") + print ("ERROR:", err) diff --git a/multimedia/flowblade/slack-desc b/multimedia/flowblade/slack-desc index 3dce6eeae7..990662a74c 100644 --- a/multimedia/flowblade/slack-desc +++ b/multimedia/flowblade/slack-desc @@ -14,6 +14,6 @@ flowblade: between two existing clips - when they are inserted on the timeline. flowblade: It is efficient, effective, and includes powerful tools to mix, flowblade: filter, and affect video and audio. flowblade: -flowblade: https://code.google.com/p/flowblade/ +flowblade: https://github.com/jliljebl/flowblade flowblade: flowblade: diff --git a/multimedia/flvtool2/README b/multimedia/flvtool2/README index 53e36308d2..aed16a12b2 100644 --- a/multimedia/flvtool2/README +++ b/multimedia/flvtool2/README @@ -1,4 +1,4 @@ -FLVTool2 is a manipulation tool for Macromedia Flash Video files (FLV). It -can calculate a lot of meta data, insert an onMetaData tag, cut FLV files, -add cue points (onCuePoint), show the FLV structure and print meta data -information in XML or YAML. +FLVTool2 is a manipulation tool for Macromedia Flash Video files +(FLV). It can calculate a lot of meta data, insert an onMetaData tag, +cut FLV files, add cue points (onCuePoint), show the FLV structure and +print meta data information in XML or YAML. diff --git a/multimedia/freetube/README b/multimedia/freetube/README new file mode 100644 index 0000000000..a8d9602149 --- /dev/null +++ b/multimedia/freetube/README @@ -0,0 +1,10 @@ +FreeTube (The Private YouTube Client) + +FreeTube is a YouTube client for Windows, Mac, and Linux built around +using YouTube more privately. You can enjoy your favorite content and +creators without your habits being tracked. All of your user data is +stored locally and never sent or published to the internet. FreeTube +grabs data by scraping the information it needs (with either local +methods or by optionally utilizing the Invidious API). With many +features similar to YouTube, FreeTube has become one of the best +methods to watch YouTube privately on desktop. diff --git a/multimedia/freetube/doinst.sh b/multimedia/freetube/doinst.sh new file mode 100644 index 0000000000..ea6e67c7b9 --- /dev/null +++ b/multimedia/freetube/doinst.sh @@ -0,0 +1,11 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 +fi diff --git a/multimedia/freetube/freetube.SlackBuild b/multimedia/freetube/freetube.SlackBuild new file mode 100644 index 0000000000..500217ed4b --- /dev/null +++ b/multimedia/freetube/freetube.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/bash + +# Slackware build script for freetube + +# Copyright 2022 Andreo Rissardo <andreotec@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=freetube +VERSION=${VERSION:-0.18.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} +DEBBUILD=${DEBBUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +# Abort build if architecture is not 64-bit. +if [ "$ARCH" != "x86_64" ]; then + echo "$ARCH is not supported." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir -p $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +rpm2cpio < $CWD/${PRGNAM}_${VERSION}_amd64.rpm | cpio -imdv +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 \ +\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ +-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# freetube has its own symlinks from opt to bin +cp -vr {opt,usr} $PKG/ + +#Binary link +( + mkdir -p $PKG/usr/bin + ln -s /opt/FreeTube/$PRGNAM $PKG/usr/bin/$PRGNAM +) + +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 +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/freetube/freetube.info b/multimedia/freetube/freetube.info new file mode 100644 index 0000000000..7071f71f7e --- /dev/null +++ b/multimedia/freetube/freetube.info @@ -0,0 +1,10 @@ +PRGNAM="freetube" +VERSION="0.18.0" +HOMEPAGE="https://freetubeapp.io" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/FreeTubeApp/FreeTube/releases/download/v0.18.0-beta/freetube_0.18.0_amd64.rpm" +MD5SUM_x86_64="946775bbe8742fb9da6a50b5d584697a" +REQUIRES="" +MAINTAINER="Andreo Rissardo" +EMAIL="andreofr@proton.me" diff --git a/multimedia/freetube/slack-desc b/multimedia/freetube/slack-desc new file mode 100644 index 0000000000..e45dc08de8 --- /dev/null +++ b/multimedia/freetube/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +freetube: freetube (The Private YouTube Client) +freetube: +freetube: FreeTube is a YouTube client for Windows, Mac, and Linux built around +freetube: using YouTube more privately. You can enjoy your favorite content and +freetube: creators without your habits being tracked. +freetube: +freetube: +freetube: +freetube: +freetube: Homepage: https://freetubeapp.io/ +freetube: diff --git a/multimedia/freshplayerplugin/README b/multimedia/freshplayerplugin/README deleted file mode 100644 index d41c86d6f7..0000000000 --- a/multimedia/freshplayerplugin/README +++ /dev/null @@ -1,14 +0,0 @@ -The main goal of this project is to get PPAPI (Pepper) Flash player -working in Firefox. This is done by impementing a wrapper, some kind -of adapter which will look like browser to PPAPI plugin and look like -NPAPI plugin for browser. - -When loaded by browser it will search for libpepflashplayer.so in a -directory where it can be: if you have google-chrome from /extra or -chromium-pepperflash-plugin from Alien Bob installed it can use also -those versions. If for any reason it doesn't find your installed -version of the plugin, specify the full path in -~/.config/freshwrapper.conf. -You may find a sample configuration file in the docs folder of the -resulting package to copy in the above location: check it also to -enable hardware acceleration (disabled by default). diff --git a/multimedia/freshplayerplugin/freshplayerplugin.info b/multimedia/freshplayerplugin/freshplayerplugin.info deleted file mode 100644 index 745e89b027..0000000000 --- a/multimedia/freshplayerplugin/freshplayerplugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="freshplayerplugin" -VERSION="0.3.11" -HOMEPAGE="https://github.com/i-rinat/freshplayerplugin" -DOWNLOAD="https://github.com/i-rinat/freshplayerplugin/archive/v0.3.11/freshplayerplugin-0.3.11.tar.gz" -MD5SUM="c34383e281135b7d40e29444af189d34" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="pepperflash-plugin ragel uriparser" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/freshplayerplugin/slack-desc b/multimedia/freshplayerplugin/slack-desc deleted file mode 100644 index 605a9702fe..0000000000 --- a/multimedia/freshplayerplugin/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -freshplayerplugin: freshplayerplugin (PPAPI-host NPAPI-plugin adapter) -freshplayerplugin: -freshplayerplugin: The main goal of this project is to get PPAPI (Pepper) Flash player -freshplayerplugin: working in Firefox. This is done by impementing a wrapper, some kind -freshplayerplugin: of adapter which will look like browser to PPAPI plugin and look like -freshplayerplugin: NPAPI plugin for browser. -freshplayerplugin: -freshplayerplugin: homepage: https://github.com/i-rinat/freshplayerplugin -freshplayerplugin: -freshplayerplugin: -freshplayerplugin: diff --git a/multimedia/gaupol/README b/multimedia/gaupol/README index 3129a19804..c04861dbc5 100644 --- a/multimedia/gaupol/README +++ b/multimedia/gaupol/README @@ -1,20 +1,15 @@ -Gaupol is an editor for text-based subtitle files. It supports multiple -subtitle file formats and provides means of correcting texts and timing -subtitles to match video. The user interface is designed with attention -to batch processing of multiple documents and convenience of translating. - -Gaupol should run on all Unix-like (GNU/Linux, *BSD, etc.) operating systems -and on Windows. Technically, it should run on Mac as well, but that has not -been tested nor made convenient. Gaupol's user interface is based on the -GTK+ toolkit and has been designed to best fit the GNOME desktop environment. +Gaupol is an editor for text-based subtitle files. It supports +multiple subtitle file formats and provides means of correcting +texts and timing subtitles to match video. The user interface is +designed with attention to batch processing of multiple documents and +convenience of translating. + +Gaupol should run on all Unix-like (GNU/Linux, *BSD, etc.) operating +systems and on Windows. Technically, it should run on Mac as well, but +that has not been tested nor made convenient. Gaupol's user interface +is based on the GTK+ toolkit and has been designed to best fit the +GNOME desktop environment. Optional dependencies are: -- pyenchant 1.1.3 or greater is required for spell-checking. - Additionally, spell-checking requires a dictionary, any of Aspell/Pspell, - Ispell, MySpell, Uspell, Hspell or AppleSpell. - -- iso-codes, if available, will be used to translate script, language and - country names. - -- MPlayer or VLC is recommended for preview. +- MPlayer, mpv, or VLC is recommended for preview. diff --git a/multimedia/gaupol/gaupol.SlackBuild b/multimedia/gaupol/gaupol.SlackBuild index d87b1e7788..55bd732345 100644 --- a/multimedia/gaupol/gaupol.SlackBuild +++ b/multimedia/gaupol/gaupol.SlackBuild @@ -2,29 +2,33 @@ # Slackware build script for gaupol +# Copyright 2022-23 fourtysixandtwo <fourtysixandtwo@sliderr.net> # Written by Andre Barboza <bmg.andre@gmail.com> - +# All rights reserved. +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +# 20220922 46and2: Updated version, new maintainer. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gaupol -VERSION=${VERSION:-0.19.2} +VERSION=${VERSION:-1.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -37,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -49,6 +50,20 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 rm -rf $PKG @@ -59,20 +74,19 @@ 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 \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -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 {} \+ -mkdir -p $PKG/usr -python setup.py clean install --prefix=/usr --root=$PKG +python3 setup.py install --root=$PKG mv $PKG/usr/share/man $PKG/usr 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING CREDITS INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS.md COPYING NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/gaupol/gaupol.info b/multimedia/gaupol/gaupol.info index a7e9d5efc9..49be173130 100644 --- a/multimedia/gaupol/gaupol.info +++ b/multimedia/gaupol/gaupol.info @@ -1,10 +1,10 @@ PRGNAM="gaupol" -VERSION="0.19.2" +VERSION="1.12" HOMEPAGE="https://github.com/otsaloma/gaupol" -DOWNLOAD="https://github.com/otsaloma/gaupol/archive/0.19.2/gaupol-0.19.2.tar.gz" -MD5SUM="bdebf0abcdd3ee6f22c9608c13dc1dc8" +DOWNLOAD="https://github.com/otsaloma/gaupol/archive/1.12/gaupol-1.12.tar.gz" +MD5SUM="f221585f9f6c6d5b267657bff7ef85aa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andre Barboza" -EMAIL="bmg.andre@gmail.com" +REQUIRES="gspell" +MAINTAINER="fourtysixandtwo" +EMAIL="fourtysixandtwo@sliderr.net" diff --git a/multimedia/gecko-mediaplayer/README b/multimedia/gecko-mediaplayer/README deleted file mode 100644 index e7443054be..0000000000 --- a/multimedia/gecko-mediaplayer/README +++ /dev/null @@ -1,6 +0,0 @@ -Gecko Mediaplayer is the modern replacement for the mplayerplug-in -application. - -It is a browser plugin that uses GNOME MPlayer to play media in a browser. -It should work with most browsers (not Chrome) on Unix-ish systems -(Linux, BSD, Solaris) and uses the NS4 API (Mozilla, Firefox, Opera, etc.). diff --git a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild b/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild deleted file mode 100644 index 1530bf7e24..0000000000 --- a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for gecko-mediaplayer -# Written by Phillip Warner <pc_warner@yahoo.com> - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gecko-mediaplayer -VERSION=${VERSION:-1.0.8} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -std=c++11" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -std=c++11" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2 -std=c++11" - LIBDIRSUFFIX="" -fi - -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 -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 \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ - -o -perm 400 \) -exec chmod 644 {} \; - -# Fix for -current (20150722 dbs) -# This patch comes from Debian's 1.0.9-2 package (thanks!) -patch -p1 < $CWD/np_loadds.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-schemas-install \ - --build=$ARCH-slackware-linux - -make libdir=/usr/lib${LIBDIRSUFFIX} force_arch="$ARCH" -make libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG install - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/gecko-mediaplayer/gecko-mediaplayer.info b/multimedia/gecko-mediaplayer/gecko-mediaplayer.info deleted file mode 100644 index 190ce75cb6..0000000000 --- a/multimedia/gecko-mediaplayer/gecko-mediaplayer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gecko-mediaplayer" -VERSION="1.0.8" -HOMEPAGE="http://sites.google.com/site/kdekorte2/gecko-mediaplayer" -DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gecko-mediaplayer/gecko-mediaplayer-1.0.8.tar.gz" -MD5SUM="d13303664fcbb7f3b1273be4b1aa1b1e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gnome-mplayer" -MAINTAINER="Phillip Warner" -EMAIL="pc_warner@yahoo.com" diff --git a/multimedia/gecko-mediaplayer/np_loadds.patch b/multimedia/gecko-mediaplayer/np_loadds.patch deleted file mode 100644 index de406963fa..0000000000 --- a/multimedia/gecko-mediaplayer/np_loadds.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Define NP_LOADDS if it doesn't exist -Author: Sebastian Ramacher <sramacher@debian.org> -Last-Update: 2014-06-14 - ---- gecko-mediaplayer-1.0.9.orig/src/npupp.h -+++ gecko-mediaplayer-1.0.9/src/npupp.h -@@ -63,6 +63,9 @@ - - #include "npruntime.h" - -+#ifndef NP_LOADDS -+#define NP_LOADDS -+#endif - - /****************************************************************************************** - plug-in function table macros diff --git a/multimedia/gecko-mediaplayer/slack-desc b/multimedia/gecko-mediaplayer/slack-desc deleted file mode 100644 index 0a7ca16280..0000000000 --- a/multimedia/gecko-mediaplayer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gecko-mediaplayer: gecko-mediaplayer (Browser media plugin) -gecko-mediaplayer: -gecko-mediaplayer: Gecko Mediaplayer is the modern replacement for mplayerplug-in. -gecko-mediaplayer: It is a browser plugin that uses GNOME MPlayer to play media in a -gecko-mediaplayer: browser. -gecko-mediaplayer: -gecko-mediaplayer: Homepage: http://sites.google.com/site/kdekorte2/gecko-mediaplayer -gecko-mediaplayer: -gecko-mediaplayer: -gecko-mediaplayer: -gecko-mediaplayer: diff --git a/multimedia/genpuid/README b/multimedia/genpuid/README index 31c55172b0..62ca597351 100644 --- a/multimedia/genpuid/README +++ b/multimedia/genpuid/README @@ -1,12 +1,13 @@ -GenPUID is a MusicIP (now known as AmpliFIND Music Services) proprietary closed -source command line utility for performing music analysis and audio -fingerprinting of music files. GenPUID runs under Linux, Mac OS X, and Windows. +GenPUID is a MusicIP (now known as AmpliFIND Music Services) +proprietary closed source command line utility for performing music +analysis and audio fingerprinting of music files. GenPUID runs under +Linux, Mac OS X, and Windows. -If MusicBrainz Picard can not find a PUID for a file, it may need to be run -through GenPUID to be analyzed first. +If MusicBrainz Picard can not find a PUID for a file, it may need to +be run through GenPUID to be analyzed first. -Having problems with Unicode files? -Instead of using genpuid dns-key * to scan Unicode files you will need to use -genpuid dns-key -r . as a workaround. +Having problems with Unicode filenames? +Instead of using 'genpuid dns-key *' to scan Unicode files, use +'genpuid dns-key -r .' as a workaround. -This only works on x86 there are no x86_64 binaries. +This only works on x86: there are no x86_64 binaries. diff --git a/multimedia/get_iplayer/get_iplayer.SlackBuild b/multimedia/get_iplayer/get_iplayer.SlackBuild index 5f2dade86d..4445be9f86 100644 --- a/multimedia/get_iplayer/get_iplayer.SlackBuild +++ b/multimedia/get_iplayer/get_iplayer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for get_iplayer. # -# Copyright 2012-2021 Gregory J. L. Tourte <artourter@gmail.com> +# Copyright 2012-2023 Gregory J. L. Tourte <artourter@gmail.com> # Copyright 2012 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=get_iplayer -VERSION=${VERSION:-3.27} +VERSION=${VERSION:-3.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/multimedia/get_iplayer/get_iplayer.info b/multimedia/get_iplayer/get_iplayer.info index e1ff6d3a1b..9b47d64ad6 100644 --- a/multimedia/get_iplayer/get_iplayer.info +++ b/multimedia/get_iplayer/get_iplayer.info @@ -1,8 +1,8 @@ PRGNAM="get_iplayer" -VERSION="3.27" +VERSION="3.31" HOMEPAGE="http://www.infradead.org/get_iplayer/html/get_iplayer.html" -DOWNLOAD="https://github.com/get-iplayer/get_iplayer/archive/v3.27/get_iplayer-3.27.tar.gz" -MD5SUM="279f101d658b912a8d2cfd6bb3539551" +DOWNLOAD="https://github.com/get-iplayer/get_iplayer/archive/v3.31/get_iplayer-3.31.tar.gz" +MD5SUM="bdcdf8c916bab325c5794606962ddcbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-LWP-Protocol-https perl-JSON perl-xml-libxml perl-Mojolicious AtomicParsley" diff --git a/multimedia/gigedit/gigedit.SlackBuild b/multimedia/gigedit/gigedit.SlackBuild index 80e95e9f23..9dcaa44a0e 100644 --- a/multimedia/gigedit/gigedit.SlackBuild +++ b/multimedia/gigedit/gigedit.SlackBuild @@ -13,7 +13,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -31,8 +31,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" diff --git a/multimedia/glyr/glyr.SlackBuild b/multimedia/glyr/glyr.SlackBuild index 71ec056a88..5fcf893946 100644 --- a/multimedia/glyr/glyr.SlackBuild +++ b/multimedia/glyr/glyr.SlackBuild @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Now maintained by B. Watson <yalhcru@gmail.com> +# Now maintained by B. Watson <urchlay@slackware.uk> # 20180904 bkw: BUILD=2, fix lyricswiki # 20170302 bkw: use long-format github URL diff --git a/multimedia/glyr/glyr.info b/multimedia/glyr/glyr.info index e676437483..79fc857963 100644 --- a/multimedia/glyr/glyr.info +++ b/multimedia/glyr/glyr.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" diff --git a/multimedia/gmidimonitor/README b/multimedia/gmidimonitor/README index 58612c98e1..13fa7f3b95 100644 --- a/multimedia/gmidimonitor/README +++ b/multimedia/gmidimonitor/README @@ -1,3 +1,4 @@ -GMIDImonitor is GTK+ application that shows MIDI events via ALSA or JACK. +GMIDImonitor is GTK+ application that shows MIDI events via ALSA or +JACK. Optional dependencies: jack, lash diff --git a/multimedia/gmtp/README b/multimedia/gmtp/README index 004b92a906..4f6e7c6e8d 100644 --- a/multimedia/gmtp/README +++ b/multimedia/gmtp/README @@ -4,13 +4,14 @@ Supports MTP devices including those with multiple storage devices (typically mobile phones). Supports Drag'n'Drop interface for upload/download of files. -This Doesnt pick up my Device(Droid Ultra) as normal user, so I use gksu -to launch it and it works great. Xfsudo works as well. It may or may not -detect your device as normal user, I have no idea and I make no promises. +This doesn't pick up my device (Droid Ultra) as a normal user, so I +use gksu to launch it and it works great. Xfsudo works as well. It may +or may not detect your device as a normal user, I have no idea and I +make no promises. This package is built with gtk2 but the default is gtk3, if you would like gtk3, simply delete or comment out the line ---with-gtk2 + --with-gtk2 from within the SlackBuild script under the configure flags. There is a FAQ inside the source tarball in the README. diff --git a/multimedia/gmtp/gmtp.SlackBuild b/multimedia/gmtp/gmtp.SlackBuild index 2afe872a85..7dc3a05def 100644 --- a/multimedia/gmtp/gmtp.SlackBuild +++ b/multimedia/gmtp/gmtp.SlackBuild @@ -85,6 +85,7 @@ 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 {} \; +SLKCFLAGS+=" -fcommon" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/gnash/README b/multimedia/gnash/README index 9e034fc885..8f15693bf8 100644 --- a/multimedia/gnash/README +++ b/multimedia/gnash/README @@ -4,3 +4,4 @@ desktop or an embedded device, as well as a plugin for several browsers. Plugins are now disabled by default due to browsers removing support. Optional but recommended deps are gst0-ffmpeg and gst0-plugins-ugly. +Another optional dependency is qt4. diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild index 40b8e1aa90..7c43910dd9 100644 --- a/multimedia/gnash/gnash.SlackBuild +++ b/multimedia/gnash/gnash.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnash -# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com> +# Copyright 2012-2022 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnash VERSION=${VERSION:-0.8.11dev_20190130} SRCVER=${SRCVER:-583ccbc1275c7701dc4843ec12142ff86bb305b4} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -51,12 +48,9 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} -DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO" +DOCS="AUTHORS COPYING ChangeLog NEWS README* TODO" -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -70,13 +64,6 @@ else LIBDIRSUFFIX="" fi -# Set $NPAPI to "yes" to enable the Mozilla plugin. Requires xulrunner. -if [ "${NPAPI:-no}" != "no" ]; then - NPAPI_OPT="--enable-write" # This option no longer does anything? -else - NPAPI_OPT="--disable-npapi" -fi - # TODO: Test the KPARTS3 plugin with KDE3/Trinity. if [ "${KPARTS3:-no}" != "no" ]; then KPARTS3_OPT="" @@ -140,11 +127,11 @@ autoreconf -vif --enable-ssl \ --without-gconf \ --with-plugins-install=system \ - $NPAPI_OPT \ + --disable-npapi \ $KPARTS3_OPT \ $KPARTS4_OPT \ CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS -std=c++14" \ make make install-strip install-plugins DESTDIR=$PKG diff --git a/multimedia/gnome-mplayer/README b/multimedia/gnome-mplayer/README index d058d941a4..227c9b604e 100644 --- a/multimedia/gnome-mplayer/README +++ b/multimedia/gnome-mplayer/README @@ -1,22 +1,22 @@ -A GTK2/GTK3 interface to MPlayer. The power of MPlayer combined with a -friendly interface for your desktop; You can play all your multimedia -(audio, video, CD, DVDs, and VCDs, streams etc.), organize, sort and -create playlists, take screenshots while playing videos, be notified -about media changes. Full DVD and MKV chapter support, when supported by -Mplayer. Subtitle support with the ability to specify preferred audio -and subtitle languages if the media supports it. Support for cover art -retrieval from Amazon.com for audio media files with artist and/or album -information contained in the file. +A GTK2/GTK3 interface to MPlayer. The power of MPlayer combined with a +friendly interface for your desktop; You can play all your multimedia +(audio, video, CD, DVDs, and VCDs, streams etc.), organize, sort and +create playlists, take screenshots while playing videos, be notified +about media changes. Full DVD and MKV chapter support, when supported +by Mplayer. Subtitle support with the ability to specify preferred +audio and subtitle languages if the media supports it. Support for +cover art retrieval from Amazon.com for audio media files with artist +and/or album information contained in the file. -The player can be used to play media on websites from your browser when -used with Gecko Mediaplayer and is the modern replacement for the +The player can be used to play media on websites from your browser +when used with Gecko Mediaplayer and is the modern replacement for the mplayerplug-in application. Gnome MPlayer has a rich API that is exposed via DBus. Using DBus you can control a single or multiple instances of GNOME MPlayer from a single command. -Gnome MPlayer is not dependent on any Gnome libraries. However, the look -and feel of the application is based on the Gnome HIG. +Gnome MPlayer is not dependent on any Gnome libraries. However, the +look and feel of the application is based on the Gnome HIG. libmusicbrainz3 is an optional dependency. diff --git a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild index 5c8bc5d24e..b1af974558 100644 --- a/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild +++ b/multimedia/gnome-mplayer/gnome-mplayer.SlackBuild @@ -13,7 +13,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -31,8 +31,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" @@ -60,7 +60,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/gnupod/README b/multimedia/gnupod/README index 374f6f719c..9a9ec1056b 100644 --- a/multimedia/gnupod/README +++ b/multimedia/gnupod/README @@ -1,5 +1,6 @@ GNUpod is a collection of tools which allow you to use your iPod with -Linux and other UNIX-like operating systems. All iPod-models are supported. +Linux and other UNIX-like operating systems. All iPod-models are +supported. Optional dependencies include: faac, ffmpeg, TiMidity++, perl-Audio-FLAC-Header, perl-Date-Manip, and diff --git a/multimedia/gnupod/gnupod.SlackBuild b/multimedia/gnupod/gnupod.SlackBuild index 76acf1d268..a841205e7d 100644 --- a/multimedia/gnupod/gnupod.SlackBuild +++ b/multimedia/gnupod/gnupod.SlackBuild @@ -14,7 +14,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -32,8 +32,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" diff --git a/multimedia/google-talkplugin/README b/multimedia/google-talkplugin/README deleted file mode 100644 index 64751c0bd4..0000000000 --- a/multimedia/google-talkplugin/README +++ /dev/null @@ -1,4 +0,0 @@ -Google TalkPlugin - -This script will repackage the debian binary. Google doesn't version -their downloads, so the MD5SUM and VERSION numbers might not match. diff --git a/multimedia/google-talkplugin/google-talkplugin.SlackBuild b/multimedia/google-talkplugin/google-talkplugin.SlackBuild deleted file mode 100644 index 53577d8d3c..0000000000 --- a/multimedia/google-talkplugin/google-talkplugin.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash - -# Slackware build script for Google Voice (talkplugin) - -# Copyright 2010-2014 Erik Hanson, Minneapolis, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=google-talkplugin -VERSION=${VERSION:-5.41.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i386 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -case "$ARCH" in - i?86) DEBARCH="i386" ;; - x86_64) DEBARCH="amd64" ;; - *) echo "Not supported" ; exit 1 ;; -esac - -# Get the real version, thanks to Fred Richards. -REAL_VER=$(ar p google-talkplugin_current_${DEBARCH}.deb control.tar.gz | tar zxO ./control | grep Version | awk '{print $2}' | cut -d- -f1) - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$REAL_VER-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $PKG -ar p $CWD/google-talkplugin_current_${DEBARCH}.deb data.tar.gz | tar xvz -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 \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -chmod 0755 $PKG # Put this back. -rm -rf etc/ opt/google/talkplugin/cron # The cron job is debian/ubuntu only. - -# These just aren't necessary, mozilla/plugins/ covers all bases. -for s in firefox iceape iceweasel midbrowser xulrunner xulrunner-addons ; do - rm -rf $PKG/usr/lib/${s} -done - -mv ${PKG}/usr/lib/chromium-browser ${PKG}/usr/lib/chromium - -if [ "$DEBARCH" = "amd64" ] ; then mv $PKG/usr/lib $PKG/usr/lib64 ; fi - -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$REAL_VER -rmdir $PKG/usr/share/doc $PKG/usr/share -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$REAL_VER/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$REAL_VER-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/google-talkplugin/google-talkplugin.info b/multimedia/google-talkplugin/google-talkplugin.info deleted file mode 100644 index 2937d8c212..0000000000 --- a/multimedia/google-talkplugin/google-talkplugin.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="google-talkplugin" -VERSION="5.41.0.0" -HOMEPAGE="http://www.google.com/chrome/" -DOWNLOAD="http://dl.google.com/linux/direct/google-talkplugin_current_i386.deb" -MD5SUM="915f51a1407488efbcda2af06c2ad6c1" -DOWNLOAD_x86_64="http://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb" -MD5SUM_x86_64="7bfeea18335d2ab7aab2dc40dd67355d" -REQUIRES="" -MAINTAINER="Erik Hanson" -EMAIL="erik@slackbuilds.org" diff --git a/multimedia/google-talkplugin/slack-desc b/multimedia/google-talkplugin/slack-desc deleted file mode 100644 index 521e6e0493..0000000000 --- a/multimedia/google-talkplugin/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -google-talkplugin: google-talkplugin (Google Voice and Video Browser Plugin) -google-talkplugin: -google-talkplugin: Google TalkPlugin enables Voice and Video chat right from Gmail, -google-talkplugin: iGoogle, and orkut. -google-talkplugin: -google-talkplugin: This is a binary repackage. -google-talkplugin: -google-talkplugin: -google-talkplugin: -google-talkplugin: -google-talkplugin: diff --git a/multimedia/goom/README b/multimedia/goom/README new file mode 100644 index 0000000000..3460c6674e --- /dev/null +++ b/multimedia/goom/README @@ -0,0 +1,3 @@ +Visualization plugin for XMMS audio player. +After installation you can enable goom +Visualization from settings. diff --git a/multimedia/goom/goom.SlackBuild b/multimedia/goom/goom.SlackBuild new file mode 100644 index 0000000000..6989ca16b9 --- /dev/null +++ b/multimedia/goom/goom.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/bash + +# Slackware build script for goom + +# Copyright 2023 Vijay Marcel +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. +# +# Modified by slackbuilds.org + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=goom +VERSION=${VERSION:-2k4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} +SRCNAM=${SRCNAM:-$PRGNAM-$VERSION-0-src} + +if [ -z "$ARCH" ]; then +case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; +esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +HARDENING="-fexceptions -fstack-protector-strong -fstack-clash-protection -mindirect-branch=thunk -mfunction-return=thunk" + +SLDFLAGS="-Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack" + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -march=i586 -mtune=i686 -pipe -O2 -fPIC $HARDENING" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -march=i686 -mtune=i686 -pipe -O2 -fPIC $HARDENING" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -march=x86-64 -mtune=native -pipe -O2 -fPIC $HARDENING" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM.tar.gz +mv -v $TMP/${PRGNAM}$VERSION-0 $TMP/$PRGNAM-$VERSION +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="$SLDFLAGS" \ +./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux \ + --with-xmms-prefix=/usr \ + --with-sdl-prefix=/usr \ + --enable-shared \ + --with-gnu-ld + +make +make install DESTDIR=$PKG + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +rm -f $PKG/usr/lib$LIBDIRSUFFIX/xmms/Visualization/libxmmsgoom2.la + +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 +cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/goom/goom.info b/multimedia/goom/goom.info new file mode 100644 index 0000000000..f966e10e30 --- /dev/null +++ b/multimedia/goom/goom.info @@ -0,0 +1,10 @@ +PRGNAM="goom" +VERSION="2k4" +HOMEPAGE="https://downloads.sourceforge.net/project/goom/" +DOWNLOAD="https://downloads.sourceforge.net/sourceforge/goom/goom2k4/0/goom-2k4-0-src.tar.gz" +MD5SUM="8100dd07e0c6784fdf079eeaa53a5c7f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/miro/slack-desc b/multimedia/goom/slack-desc index 13298f7abb..4bf44836b2 100644 --- a/multimedia/miro/slack-desc +++ b/multimedia/goom/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -miro: miro (Online media aggregator) -miro: -miro: Miro is a free Internet television application for the online -miro: Democracy Network. -miro: -miro: Homepage: http://www.getmiro.com/ -miro: -miro: -miro: -miro: -miro: +goom: goom (GOOM Visualization Plugin) +goom: +goom: Goom is Visualization plugin for XMMS audio player. +goom: +goom: +goom: +goom: Homepage:https://downloads.sourceforge.net/project/goom/ +goom: +goom: +goom: +goom: diff --git a/multimedia/gpac/README b/multimedia/gpac/README index cadc77b6f0..1e7c8f82a2 100644 --- a/multimedia/gpac/README +++ b/multimedia/gpac/README @@ -1,6 +1,6 @@ -GPAC is mainly used to package multimedia content for local or streaming -playback. GPAC includes MP4Box utility which lets packaging of -various audio and video codecs into mp4 container. +GPAC is mainly used to package multimedia content for local or +streaming playback. GPAC includes MP4Box utility which lets packaging +of various audio and video codecs into mp4 container. -Optional dependencies include the following: wxPython, js, faad2, ffmpeg, -xvidcore, jack, xulrunner and xmlrpc-c. +Optional dependencies include the following: wxPython, js, faad2, +ffmpeg, xvidcore, jack, xulrunner and xmlrpc-c. diff --git a/multimedia/gst-plugins-bad-nonfree/README b/multimedia/gst-plugins-bad-nonfree/README new file mode 100644 index 0000000000..038ef30548 --- /dev/null +++ b/multimedia/gst-plugins-bad-nonfree/README @@ -0,0 +1,24 @@ +gst-plugins-bad-nonfree (encumbered set of GStreamer plugins) + +GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par +compared to the rest. They might be close to being good quality, +but they're missing something - be it a good code review, some +documentation, a set of tests, a real live maintainer, or some actual +wide use. + +Since gst-plugins-bad-free is part of Slackware, this package only +includes the plugins that are not already in gst-plugins-bad-free. + +This optionally depends on TiMidity++, aom, amrnb, amrwb, celt, +chromaprint, DirectFB, faac, faad2, flite, gsm, ladspa_sdk, libass, +libcdaudio, libdc1394, libdca, libfdk-aac, libkate, liblrdf, libmimic, +libmodplug, libmusicbrainz, libofa, libquicktime, libsrtp, lv2, +musepack-tools, rtmpdump, schroedinger, srt, soundtouch, swfdec, +xvidcore, and nvidia*driver. And probably a few more that we've +missed. + +Note that if you have any version of the nvidia drivers installed +the script would autodetect them and will try to build its nvdec +support, requiring the presence on the system of cudatoolkit too: as +cudatoolkit is *huge*, cuda support is disabled by default but it can +be explicitly enabled passing the script the variable CUDA=yes diff --git a/multimedia/gst-plugins-bad-nonfree/README_docs.txt b/multimedia/gst-plugins-bad-nonfree/README_docs.txt new file mode 100644 index 0000000000..8ee8bceee9 --- /dev/null +++ b/multimedia/gst-plugins-bad-nonfree/README_docs.txt @@ -0,0 +1,3 @@ +If you're looking for the documentation, see: + +/usr/doc/gst-plugins-bad-free-*/ diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild new file mode 100644 index 0000000000..5fdcb0305a --- /dev/null +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild @@ -0,0 +1,236 @@ +#!/bin/bash + +# Slackware build script for gst-plugins-bad-nonfree + +# Copyright 2013-2021 Robby Workman, Tuscaloosa, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +# 20220307 bkw: this is a rename and rework of the old SBo +# gst-plugins-bad. Here we build only the portions of gst-plugins-bad +# that are missing from Slackware's gst-plugins-bad-free. Despite +# the -nonfree in the name, not all of these are encumbered (some +# just aren't included in Slackware because it lacks the optional +# dependencies). + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=gst-plugins-bad-nonfree +VERSION=${VERSION:-1.18.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +SRCNAM=gst-plugins-bad + +# 20220307 bkw: libsrtp is disabled by default because it currently breaks +# the build. +[ "${SRTP:-no}" = "no" ] && SRTPOPT="-Dsrtp=disabled" + +# 20220307 bkw: nvcodec is disabled by default, per Robby's README. +[ "${CUDA:-no}" = "no" ] && CUDAOPT="-Dnvcodec=disabled" + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.xz +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# 20220307 bkw: the massive list of -Dfoo=disabled below took a minute +# to put together. Notice that shm is *not* in the list, though it +# should be. This is because the build fails with -Dshm=disabled. +# So we build it, then remove it from $PKG after it's installed. + +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dexamples=disabled \ + -Dopencv=disabled \ + $SRTPOPT \ + $CUDAOPT \ + -Daccurip=disabled \ + -Dadpcmdec=disabled \ + -Dadpcmenc=disabled \ + -Daiff=disabled \ + -Dasfmux=disabled \ + -Daudiobuffersplit=disabled \ + -Daudiofxbad=disabled \ + -Daudiomixmatrix=disabled \ + -Daudiolatency=disabled \ + -Daudiovisualizers=disabled \ + -Dautoconvert=disabled \ + -Dbayer=disabled \ + -Dcamerabin2=disabled \ + -Dcoloreffects=disabled \ + -Ddebugutils=disabled \ + -Ddvbsubenc=disabled \ + -Dfaceoverlay=disabled \ + -Dfestival=disabled \ + -Dfieldanalysis=disabled \ + -Dfreeverb=disabled \ + -Dfrei0r=disabled \ + -Dgaudieffects=disabled \ + -Dgdp=disabled \ + -Dgeometrictransform=disabled \ + -Did3tag=disabled \ + -Dinter=disabled \ + -Dinterlace=disabled \ + -Divfparse=disabled \ + -Divtc=disabled \ + -Djp2kdecimator=disabled \ + -Djpegformat=disabled \ + -Dlibrfb=disabled \ + -Dmidi=disabled \ + -Dmpegdemux=disabled \ + -Dmpegpsmux=disabled \ + -Dmpegtsdemux=disabled \ + -Dmpegtsmux=disabled \ + -Dmxf=disabled \ + -Dnetsim=disabled \ + -Drtp=disabled \ + -Dpcapparse=disabled \ + -Dpnm=disabled \ + -Dproxy=disabled \ + -Drawparse=disabled \ + -Dremovesilence=disabled \ + -Drist=disabled \ + -Drtmp2=disabled \ + -Drtp=disabled \ + -Dsdp=disabled \ + -Dsegmentclip=disabled \ + -Dsmooth=disabled \ + -Dspeed=disabled \ + -Dsubenc=disabled \ + -Dswitchbin=disabled \ + -Dtimecode=disabled \ + -Dvideoframe_audiolevel=disabled \ + -Dvideofilters=disabled \ + -Dvideoparsers=disabled \ + -Dvideosignal=disabled \ + -Dvmnc=disabled \ + -Dy4m=disabled \ + -Dbluez=disabled \ + -Ddecklink=disabled \ + -Ddvb=disabled \ + -Dfbdev=disabled \ + -Dipcpipeline=disabled \ + -Dkms=disabled \ + -Duvch264=disabled \ + -Dv4l2codecs=disabled \ + -Dva=disabled \ + -Dbz2=disabled \ + -Dclosedcaption=disabled \ + -Dcolormanagement=disabled \ + -Dcurl=disabled \ + -Ddash=disabled \ + -Ddtls=disabled \ + -Dfluidsynth=disabled \ + -Dhls=disabled \ + -Dneon=disabled \ + -Donvif=disabled \ + -Dopenal=disabled \ + -Dopencv=disabled \ + -Dopenexr=disabled \ + -Dopenjpeg=disabled \ + -Dopus=disabled \ + -Dresindvd=disabled \ + -Drsvg=disabled \ + -Dsbc=disabled \ + -Dsctp=disabled \ + -Dsmoothstreaming=disabled \ + -Dsndfile=disabled \ + -Dttml=disabled \ + -Dtranscode=disabled \ + -Dvulkan=disabled \ + -Dwayland=disabled \ + -Dwebrtc=disabled \ + -Dwebp=disabled + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + +# 20220307 bkw: remove all the things that already exist in Slackware. +rm -rf $PKG/usr/lib*/gstreamer-*/libgstshm.so \ + $PKG/usr/lib*/*.so* \ + $PKG/usr/lib*/girepository* \ + $PKG/usr/lib*/pkgconfig \ + $PKG/usr/share \ + $PKG/usr/include \ + $PKG/usr/bin + +strip $PKG/usr/lib*/gstreamer-*/*.so + +# 20220308 bkw: don't even include the docs. they already exist in Pat's +# gst-plugins-bad-free package. +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cat $CWD/README_docs.txt > $PKGDOC/README_docs.txt +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info index b20ac599c2..43340d39f2 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.info +++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info @@ -1,4 +1,4 @@ -PRGNAM="gst-plugins-bad" +PRGNAM="gst-plugins-bad-nonfree" VERSION="1.18.5" HOMEPAGE="https://gstreamer.freedesktop.org/" DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz" diff --git a/multimedia/gst-plugins-bad-nonfree/slack-desc b/multimedia/gst-plugins-bad-nonfree/slack-desc new file mode 100644 index 0000000000..da73b3c0b2 --- /dev/null +++ b/multimedia/gst-plugins-bad-nonfree/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +gst-plugins-bad-nonfree: gst-plugins-bad-nonfree (encumbered set of GStreamer plugins) +gst-plugins-bad-nonfree: +gst-plugins-bad-nonfree: GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par +gst-plugins-bad-nonfree: compared to the rest. They might be close to being good quality, +gst-plugins-bad-nonfree: but they're missing something - be it a good code review, some +gst-plugins-bad-nonfree: documentation, a set of tests, a real live maintainer, or some actual +gst-plugins-bad-nonfree: wide use. +gst-plugins-bad-nonfree: +gst-plugins-bad-nonfree: Since gst-plugins-bad-free is part of Slackware, this package only +gst-plugins-bad-nonfree: includes the plugins that are not already in gst-plugins-bad-free. +gst-plugins-bad-nonfree: diff --git a/multimedia/gst-plugins-bad/README b/multimedia/gst-plugins-bad/README deleted file mode 100644 index 662fadc1bc..0000000000 --- a/multimedia/gst-plugins-bad/README +++ /dev/null @@ -1,16 +0,0 @@ -GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared -to the rest. They might be close to being good quality, but they're missing -something - be it a good code review, some documentation, a set of tests, -a real live maintainer, or some actual wide use. - -This optionally depends on TiMidity++, aom, amrnb, amrwb, celt, faac, faad2 -flite, gsm, libass, libcdaudio, libdc1394, libdca, libfdk-aac, libkate, -liblrdf, libmimic, libmodplug, libmusicbrainz, libofa, libquicktime, -lv2, musepack-tools, rtmpdump, schroedinger, soundtouch, swfdec, xvidcore, -and nvidia*driver. - -Note that if you have any version of the nvidia drivers installed the -script will autodetect them and will try to build its nvdec support, -requiring the presence on the system of cudatoolkit too: as cudatoolkit -is *huge*, cuda support is disabled by default but it can be explicitly -enabled passing the script the variable CUDA=yes diff --git a/multimedia/gst-plugins-bad/slack-desc b/multimedia/gst-plugins-bad/slack-desc deleted file mode 100644 index b8e30f8f13..0000000000 --- a/multimedia/gst-plugins-bad/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gst-plugins-bad: gst-plugins-bad (bad set of GStreamer plugins) -gst-plugins-bad: -gst-plugins-bad: GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par -gst-plugins-bad: compared to the rest. They might be close to being good quality, -gst-plugins-bad: but they're missing something - be it a good code review, some -gst-plugins-bad: documentation, a set of tests, a real live maintainer, or some -gst-plugins-bad: actual wide use. -gst-plugins-bad: -gst-plugins-bad: -gst-plugins-bad: -gst-plugins-bad: diff --git a/multimedia/gst-plugins-ugly/README b/multimedia/gst-plugins-ugly/README index 41aca06c64..2d2ab19fcf 100644 --- a/multimedia/gst-plugins-ugly/README +++ b/multimedia/gst-plugins-ugly/README @@ -1,7 +1,8 @@ -GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and -correct functionality, but distributing them might pose problems. The -license on either the plug-ins or the supporting libraries might not be -how we'd like. The code might be widely known to present patent problems. +GStreamer Ugly Plug-ins is a set of plug-ins that have good quality +and correct functionality, but distributing them might pose problems. +The license on either the plug-ins or the supporting libraries might +not be how we'd like. The code might be widely known to present patent +problems. This optionally depends on opencore-amr, libdvdcss, libmpeg2, twolame, and x264. diff --git a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild index c65b2a7fb8..33c398cd84 100644 --- a/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild +++ b/multimedia/gst0-ffmpeg/gst0-ffmpeg.SlackBuild @@ -34,7 +34,7 @@ SRCNAM=gst-ffmpeg if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -52,8 +52,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" diff --git a/multimedia/gst0-plugins-ugly/README b/multimedia/gst0-plugins-ugly/README index 6fb0d527e4..09169028c2 100644 --- a/multimedia/gst0-plugins-ugly/README +++ b/multimedia/gst0-plugins-ugly/README @@ -1,6 +1,7 @@ -GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and -correct functionality, but distributing them might pose problems. The -license on either the plug-ins or the supporting libraries might not be -how we'd like. The code might be widely known to present patent problems. +GStreamer Ugly Plug-ins is a set of plug-ins that have good quality +and correct functionality, but distributing them might pose problems. +The license on either the plug-ins or the supporting libraries might +not be how we'd like. The code might be widely known to present patent +problems. This optionally depends on opencore-amr, libmpeg2, twolame, and x264. diff --git a/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.SlackBuild b/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.SlackBuild index 78187c5609..67d800a315 100644 --- a/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.SlackBuild +++ b/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.SlackBuild @@ -36,7 +36,7 @@ SRCNAM=gst-plugins-ugly if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -54,8 +54,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" diff --git a/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.info b/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.info index 7f4f1e8f51..b4d52bfee3 100644 --- a/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.info +++ b/multimedia/gst0-plugins-ugly/gst0-plugins-ugly.info @@ -5,6 +5,6 @@ DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugl MD5SUM="1d81c593e22a6cdf0f2b4f57eae93df2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="gst0-plugins-base" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" diff --git a/multimedia/gstreamer0/gstreamer0.SlackBuild b/multimedia/gstreamer0/gstreamer0.SlackBuild index 0c71ad4a89..2a3f35b5ee 100644 --- a/multimedia/gstreamer0/gstreamer0.SlackBuild +++ b/multimedia/gstreamer0/gstreamer0.SlackBuild @@ -86,6 +86,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/gstreamer-0.10.36-bison3.patch || exit 1 +sed -e 's/static volatile gsize gonce_data/static gsize gonce_data/g' -i gst/gstutils.h CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/gstreamer0/slack-desc b/multimedia/gstreamer0/slack-desc index 31bcf2128f..2609b28210 100644 --- a/multimedia/gstreamer0/slack-desc +++ b/multimedia/gstreamer0/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| gstreamer0: gstreamer0 (streaming multimedia framework, v0) -gstreamer0: +gstreamer0: gstreamer0: GStreamer is a library that allows the construction of graphs of a gstreamer0: media-handling components, ranging from simple Ogg/Vorbis playback gstreamer0: to complex audio (mixing) and video (non-linear editing) processing. gstreamer0: Applications can take advantage of advances in codec and filter gstreamer0: technology transparently. Developers can add new codecs and filters gstreamer0: by writing a simple plugin with a clean, generic interface. -gstreamer0: +gstreamer0: gstreamer0: GStreamer is released under the LGPL. -gstreamer0: +gstreamer0: diff --git a/multimedia/gtick/gtick.SlackBuild b/multimedia/gtick/gtick.SlackBuild index 987d362338..fc877f0da6 100644 --- a/multimedia/gtick/gtick.SlackBuild +++ b/multimedia/gtick/gtick.SlackBuild @@ -32,7 +32,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -50,8 +50,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" @@ -75,9 +75,11 @@ 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 {} \+ + +SLKCFLAGS+=" -fcommon" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/gtk-recordmydesktop/gtk-recordmydesktop.SlackBuild b/multimedia/gtk-recordmydesktop/gtk-recordmydesktop.SlackBuild index 4541845b52..75cad4b1c8 100644 --- a/multimedia/gtk-recordmydesktop/gtk-recordmydesktop.SlackBuild +++ b/multimedia/gtk-recordmydesktop/gtk-recordmydesktop.SlackBuild @@ -13,7 +13,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -31,8 +31,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" diff --git a/multimedia/guvcview/guvcview.SlackBuild b/multimedia/guvcview/guvcview.SlackBuild index 5253626c78..4a29e6cccd 100644 --- a/multimedia/guvcview/guvcview.SlackBuild +++ b/multimedia/guvcview/guvcview.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=guvcview -VERSION=${VERSION:-2.0.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.0.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -72,7 +69,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-src-$VERSION -tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz +mkdir -p $PRGNAM-src-$VERSION +tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2 cd $PRGNAM-src-$VERSION chown -R root:root . find -L . \ diff --git a/multimedia/guvcview/guvcview.info b/multimedia/guvcview/guvcview.info index 7a409ff5ae..9dc34454d5 100644 --- a/multimedia/guvcview/guvcview.info +++ b/multimedia/guvcview/guvcview.info @@ -1,8 +1,8 @@ PRGNAM="guvcview" -VERSION="2.0.6" +VERSION="2.0.8" HOMEPAGE="http://guvcview.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/guvcview/source/guvcview-src-2.0.6.tar.gz" -MD5SUM="ea35acb3a97952ceca26d92478b6e7ea" +DOWNLOAD="http://downloads.sourceforge.net/project/guvcview/source/guvcview-src-2.0.8.tar.bz2" +MD5SUM="45c387500a258ace63e75ac4d4c001da" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="portaudio" diff --git a/multimedia/haruna/README b/multimedia/haruna/README new file mode 100644 index 0000000000..ebd6b7398c --- /dev/null +++ b/multimedia/haruna/README @@ -0,0 +1,13 @@ +Haruna Video Player + +Haruna is an open source video player built with Qt/QML and libmpv + +Features +these are just some features that set Haruna apart from others players + +- play online videos, through yt-dlp +- toggle playlist with mouse-over, playlist overlays the video +- auto skip chapter containing certain words +- configurable shortcuts and mouse buttons +- quick jump to next chapter by middle click on progress bar + diff --git a/multimedia/haruna/doinst.sh b/multimedia/haruna/doinst.sh new file mode 100644 index 0000000000..be52e823bf --- /dev/null +++ b/multimedia/haruna/doinst.sh @@ -0,0 +1,11 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + +# If other icon themes are installed, then add to/modify this as needed +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/multimedia/haruna/haruna.SlackBuild b/multimedia/haruna/haruna.SlackBuild new file mode 100644 index 0000000000..287297d267 --- /dev/null +++ b/multimedia/haruna/haruna.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/bash + +# Copyright 2022 marav, Paris, FR +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=haruna +VERSION=${VERSION:-0.10.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1 +cd $PRGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir build +cd build + cmake \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +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 +cp -a \ + LICENSES/* \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf $PKG/usr/share/doc + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/haruna/haruna.info b/multimedia/haruna/haruna.info new file mode 100644 index 0000000000..412a3c77ad --- /dev/null +++ b/multimedia/haruna/haruna.info @@ -0,0 +1,10 @@ +PRGNAM="haruna" +VERSION="0.10.3" +HOMEPAGE="https://apps.kde.org/haruna/" +DOWNLOAD="https://download.kde.org/stable/haruna/haruna-0.10.3.tar.xz" +MD5SUM="eac0b46f119f2af38f557fcce6a5f378" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="mpv yt-dlp" +MAINTAINER="marav" +EMAIL="marav8@free.fr" diff --git a/multimedia/haruna/slack-desc b/multimedia/haruna/slack-desc new file mode 100644 index 0000000000..56792f5c1e --- /dev/null +++ b/multimedia/haruna/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +haruna: haruna (Video Player) +haruna: +haruna: haruna is an open source video player built with Qt/QML +haruna: and libmpv +haruna: +haruna: +haruna: +haruna: Homepage: https://apps.kde.org/haruna/ +haruna: +haruna: +haruna: diff --git a/multimedia/hexter/hexter.SlackBuild b/multimedia/hexter/hexter.SlackBuild index ff3bb6d193..243c0c9d2a 100644 --- a/multimedia/hexter/hexter.SlackBuild +++ b/multimedia/hexter/hexter.SlackBuild @@ -18,9 +18,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -56,9 +53,11 @@ 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 {} \+ + +SLKCFLAGS+=" -lm" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/multimedia/huludesktop/huludesktop.info b/multimedia/huludesktop/huludesktop.info index 9a9099b27b..44f005053e 100644 --- a/multimedia/huludesktop/huludesktop.info +++ b/multimedia/huludesktop/huludesktop.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/huludesktop_i386.deb" MD5SUM="d9b27d1837ab86526100964e80c3cdd1" DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/huludesktop_amd64.deb" MD5SUM_x86_64="bccc94d7f327989dab2653d254f40869" -REQUIRES="flashplayer-plugin" +REQUIRES="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/multimedia/iat/README b/multimedia/iat/README index c290afd127..d65061d502 100644 --- a/multimedia/iat/README +++ b/multimedia/iat/README @@ -1,5 +1,5 @@ -IAT (Iso9660 Analyzer Tool is a tool for detecting the structure of many types -of CD/DVD images and is part of iGnus Project. +IAT (Iso9660 Analyzer Tool is a tool for detecting the structure of +many types of CD/DVD images and is part of iGnus Project. With Iso9660 Analyzer Tool you can: * Create Cuesheet file from image CD/DVD diff --git a/multimedia/imagination/imagination.SlackBuild b/multimedia/imagination/imagination.SlackBuild index 17ec502713..b18dd1920d 100644 --- a/multimedia/imagination/imagination.SlackBuild +++ b/multimedia/imagination/imagination.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for imagination -# Maintained by Klaatu @member.fsf.org +# Maintained by Klaatu <klaatu@member.fsf.org> | Lawrence NZ # Copyright 2011 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br> # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=imagination -VERSION=${VERSION:-3.1} +VERSION=${VERSION:-3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -102,7 +102,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ + AUTHORS COPYING ChangeLog INSTALL README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/imagination/imagination.info b/multimedia/imagination/imagination.info index b90682b52e..36c50e9fb8 100644 --- a/multimedia/imagination/imagination.info +++ b/multimedia/imagination/imagination.info @@ -1,8 +1,8 @@ PRGNAM="imagination" -VERSION="3.1" +VERSION="3.6" HOMEPAGE="http://imagination.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/imagination/imagination-3.1.tar.bz2" -MD5SUM="0c430f90a58cbd6c9fcebf1f8385d777" +DOWNLOAD="https://sourceforge.net/projects/imagination/files/imagination-3.6.tar.gz" +MD5SUM="798bcb72a939f5c6c48801fd0442f1b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/inputstream.adaptive/README b/multimedia/inputstream.adaptive/README new file mode 100644 index 0000000000..923b804ff6 --- /dev/null +++ b/multimedia/inputstream.adaptive/README @@ -0,0 +1,16 @@ +InputStream Adaptive (inputstream.adaptive) is a binary kodi addon +that acts as a demuxer for segmented, multi-bitrate internet streams. +On Kodi, InputStream Adaptive serves as a client for adaptive streams +and can even play DRM content using an external library. + +It is an essential component for many popular video addons including +Hummingbird, Netflix, YouTube, Disney Plus, Amazon Prime Video and SGK +Live-Portal. + +NOTE: Many, if not all, players using inputstream.adaptive will +require downloading and installing the Widevine Content Decryption +Module (CDM). Widevine CDM is DRM licensing and encryption technology +that is owned and maintained by Google. + +Kodi will prompt you to agree to download and install it the first +time Widevine CDM is requested for use. diff --git a/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild b/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild new file mode 100644 index 0000000000..31c09c9308 --- /dev/null +++ b/multimedia/inputstream.adaptive/inputstream.adaptive.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/bash + +# Slackware build script for inputstream.adaptive + +# Copyright 2022 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=inputstream.adaptive +CODNAM=Matrix +VERSION=${VERSION:-19.0.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-$CODNAM +tar xvf $CWD/$PRGNAM-$VERSION-$CODNAM.tar.gz +cd $PRGNAM-$VERSION-$CODNAM +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 +cp -a \ + LICENSE.GPL README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/inputstream.adaptive/inputstream.adaptive.info b/multimedia/inputstream.adaptive/inputstream.adaptive.info new file mode 100644 index 0000000000..f6e585c9b3 --- /dev/null +++ b/multimedia/inputstream.adaptive/inputstream.adaptive.info @@ -0,0 +1,10 @@ +PRGNAM="inputstream.adaptive" +VERSION="19.0.7" +HOMEPAGE="https://github.com/xbmc/inputstream.adaptive/" +DOWNLOAD="https://github.com/xbmc/inputstream.adaptive/archive/19.0.7-Matrix/inputstream.adaptive-19.0.7-Matrix.tar.gz" +MD5SUM="679d70dbca94e14360dfcf0261cfe032" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="kodi pycryptodomex" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo@gmail.com" diff --git a/multimedia/inputstream.adaptive/slack-desc b/multimedia/inputstream.adaptive/slack-desc new file mode 100644 index 0000000000..6db0c57095 --- /dev/null +++ b/multimedia/inputstream.adaptive/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +inputstream.adaptive: inputstream.adaptive (kodi addon for adaptive streams) +inputstream.adaptive: +inputstream.adaptive: InputStream Adaptive (inputstream.adaptive) is a binary kodi addon +inputstream.adaptive: that acts as a demuxer for segmented, multi-bitrate internet streams. +inputstream.adaptive: On Kodi, InputStream Adaptive serves as a client for adaptive streams +inputstream.adaptive: and can even play DRM content using an external library. +inputstream.adaptive: +inputstream.adaptive: It is an essential component for many popular video addons including +inputstream.adaptive: Hummingbird, Netflix, YouTube, Disney Plus, Amazon Prime Video and SGK +inputstream.adaptive: Live-Portal. +inputstream.adaptive: diff --git a/multimedia/intel-gmmlib/README b/multimedia/intel-gmmlib/README new file mode 100644 index 0000000000..c0ef0fe205 --- /dev/null +++ b/multimedia/intel-gmmlib/README @@ -0,0 +1,3 @@ +The Intel(R) Graphics Memory Management Library provides device specific +and buffer management for the Intel(R) Graphics Compute Runtime for +OpenCL(TM) and the Intel(R) Media Driver for VAAPI. diff --git a/multimedia/simpleburn/simpleburn.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild index 728ef119ef..0d62385bcf 100644 --- a/multimedia/simpleburn/simpleburn.SlackBuild +++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# -# Slackware build script for simpleburn -# -# Copyright 2017 Marek Srejma (sam_web@yahoo.de) + +# Slackware build script for intel-gmmlib + +# Copyright 2021 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,27 +11,27 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. - -# Updated 2017-08-08 by Marek Srejma +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=simpleburn -VERSION=${VERSION:-1.8.3.1} +PRGNAM=intel-gmmlib +VERSION=${VERSION:-21.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +SRCNAM=gmmlib-$PRGNAM + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -71,9 +68,9 @@ 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 $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,19 +78,29 @@ 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 {} \; -cmake -DCMAKE_INSTALL_PREFIX=/usr [-DGTK3=ON] . -make -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la 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 +cp -a LICENSE.md README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info new file mode 100644 index 0000000000..56c6e5218b --- /dev/null +++ b/multimedia/intel-gmmlib/intel-gmmlib.info @@ -0,0 +1,10 @@ +PRGNAM="intel-gmmlib" +VERSION="21.3.1" +HOMEPAGE="https://github.com/intel/gmmlib/" +DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz" +MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/multimedia/intel-gmmlib/slack-desc b/multimedia/intel-gmmlib/slack-desc new file mode 100644 index 0000000000..1dbed8d8b5 --- /dev/null +++ b/multimedia/intel-gmmlib/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +intel-gmmlib: intel-gmmlib (The Intel(R) Graphics Memory Management Library) +intel-gmmlib: +intel-gmmlib: The Intel(R) Graphics Memory Management Library provides device +intel-gmmlib: specific and buffer management for the Intel(R) Graphics Compute +intel-gmmlib: Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI. +intel-gmmlib: +intel-gmmlib: +intel-gmmlib: +intel-gmmlib: +intel-gmmlib: +intel-gmmlib: diff --git a/multimedia/intel-media-driver/README b/multimedia/intel-media-driver/README new file mode 100644 index 0000000000..874e5090d1 --- /dev/null +++ b/multimedia/intel-media-driver/README @@ -0,0 +1,3 @@ +The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration +API) user mode driver supporting hardware accelerated decoding, +encoding, and video post processing for GEN based graphics hardware. diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild new file mode 100644 index 0000000000..dfb1b3b30b --- /dev/null +++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/bash + +# Slackware build script for intel-media-driver + +# Copyright 2021 Mario Preksavec, Zagreb, Croatia +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=intel-media-driver +VERSION=${VERSION:-21.3.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=intel-media + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf media-driver-$SRCNAM-$VERSION +tar xvf $CWD/media-driver-$SRCNAM-$VERSION.tar.gz +cd media-driver-$SRCNAM-$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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 +cp -a CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info new file mode 100644 index 0000000000..1967da2f92 --- /dev/null +++ b/multimedia/intel-media-driver/intel-media-driver.info @@ -0,0 +1,10 @@ +PRGNAM="intel-media-driver" +VERSION="21.3.5" +HOMEPAGE="https://github.com/intel/media-driver/" +DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz" +MD5SUM="3ace8aec373b3990acb1e3270e4a9e0b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="intel-gmmlib" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/multimedia/pepperflash-plugin/slack-desc b/multimedia/intel-media-driver/slack-desc index 0b2ccd490b..797217d89e 100644 --- a/multimedia/pepperflash-plugin/slack-desc +++ b/multimedia/intel-media-driver/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -pepperflash-plugin: pepperflash-plugin (flash PPAPI plugin) -pepperflash-plugin: -pepperflash-plugin: This package contains Adobe's PPAPI Flash Plugin. -pepperflash-plugin: -pepperflash-plugin: You will have to accept the bundled license file if you want to use -pepperflash-plugin: this closed-source plugin. -pepperflash-plugin: -pepperflash-plugin: homepage: https://get.adobe.com/flashplayer/otherversions/ -pepperflash-plugin: -pepperflash-plugin: -pepperflash-plugin: +intel-media-driver: intel-media-driver (The Intel(R) Media Driver for VAAPI) +intel-media-driver: +intel-media-driver: The Intel(R) Media Driver for VAAPI is a new VA-API (Video +intel-media-driver: Acceleration API) user mode driver supporting hardware accelerated +intel-media-driver: decoding, encoding, and video post processing for GEN based graphics +intel-media-driver: hardware. +intel-media-driver: +intel-media-driver: +intel-media-driver: +intel-media-driver: +intel-media-driver: diff --git a/multimedia/intel-media-sdk/README b/multimedia/intel-media-sdk/README new file mode 100644 index 0000000000..5456e3ed25 --- /dev/null +++ b/multimedia/intel-media-sdk/README @@ -0,0 +1,11 @@ +Intel(R) Media SDK provides a plain C API to access hardware-accelerated +video decode, encode and filtering on Intel(R) Gen graphics hardware +platforms. Implementation written in C++ 11 with parts in C-for-Media +(CM). + +Supported video encoders: HEVC, AVC, MPEG-2, JPEG, VP9 + +Supported video decoders: HEVC, AVC, VP8, VP9, MPEG-2, VC1, JPEG, AV1 + +Supported video pre-processing filters: Color Conversion, Deinterlace, +Denoise, Resize, Rotate, Composition diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild new file mode 100644 index 0000000000..2c3f1e67bf --- /dev/null +++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/bash + +# Slackware build script for intel-media-sdk + +# Copyright 2021 Mario Preksavec, Zagreb, Croatia +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=intel-media-sdk +VERSION=${VERSION:-21.3.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +SRCNAM=intel-mediasdk + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf MediaSDK-$SRCNAM-$VERSION +tar xvf $CWD/MediaSDK-$SRCNAM-$VERSION.tar.gz +cd MediaSDK-$SRCNAM-$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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_TOOLS:BOOL="ON" \ + -DENABLE_OPENCL:BOOL="OFF" \ + -DENABLE_X11_DRI3:BOOL="ON" \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 +cp -a \ + CHANGELOG.md CODEOWNERS CONTRIBUTING.md LICENSE README.rst \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info new file mode 100644 index 0000000000..8ac23ebd28 --- /dev/null +++ b/multimedia/intel-media-sdk/intel-media-sdk.info @@ -0,0 +1,10 @@ +PRGNAM="intel-media-sdk" +VERSION="21.3.5" +HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/" +DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz" +MD5SUM="7a71beb6def13ab71348785a8880dd0a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/multimedia/intel-media-sdk/slack-desc b/multimedia/intel-media-sdk/slack-desc new file mode 100644 index 0000000000..977888fe5b --- /dev/null +++ b/multimedia/intel-media-sdk/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +intel-media-sdk: intel-media-sdk (Intel(R) Media SDK) +intel-media-sdk: +intel-media-sdk: Intel(R) Media SDK provides a plain C API to access +intel-media-sdk: hardware-accelerated video decode, encode and filtering on Intel(R) +intel-media-sdk: Gen graphics hardware platforms. Implementation written in C++ 11 +intel-media-sdk: with parts in C-for-Media (CM). +intel-media-sdk: +intel-media-sdk: +intel-media-sdk: +intel-media-sdk: +intel-media-sdk: diff --git a/multimedia/ivtv-utils/README b/multimedia/ivtv-utils/README index f151532b6b..68bf7f3334 100644 --- a/multimedia/ivtv-utils/README +++ b/multimedia/ivtv-utils/README @@ -1,8 +1,8 @@ Userspace utilities and firmware for Hauppauge PVR cards. Note that the header files ivtv.h and ivtvfb.h included in the source -tarball are already provided by the Linux kernel headers, so the included -build script removes these. +tarball are already provided by the Linux kernel headers, so the +included build script removes these. Similarly, two binaries v4l2-ctl and ivtv-ctl are provided by v4l-utils (assuming you did a full Slackware installation) and therefore the in- diff --git a/multimedia/jellyfin-media-player/README b/multimedia/jellyfin-media-player/README new file mode 100644 index 0000000000..7c0a0352e6 --- /dev/null +++ b/multimedia/jellyfin-media-player/README @@ -0,0 +1,8 @@ +Desktop client using jellyfin-web with embedded MPV player. Supports +Windows, Mac OS, and Linux. Media plays within the same window using the +jellyfin-web interface unlike Jellyfin Desktop. Supports audio +passthrough. Based on Plex Media Player. + +OPptional dependecies: + - libcec for HDMI CEC support + - lirc for Linux IR handling diff --git a/multimedia/plex-home-theater/doinst.sh b/multimedia/jellyfin-media-player/doinst.sh index 65c7e2eeb9..55ca305770 100644 --- a/multimedia/plex-home-theater/doinst.sh +++ b/multimedia/jellyfin-media-player/doinst.sh @@ -1,3 +1,4 @@ + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/multimedia/jellyfin-media-player/jellyfin-media-player.SlackBuild b/multimedia/jellyfin-media-player/jellyfin-media-player.SlackBuild new file mode 100644 index 0000000000..5e1f73f125 --- /dev/null +++ b/multimedia/jellyfin-media-player/jellyfin-media-player.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/bash + +# Slackware build script for jellyfin-media-player + +# Copyright 2022 Ozan Türkyılmaz Istanbul +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=jellyfin-media-player +WCPRGNAM=jellyfin-web-jmp +VERSION=${VERSION:-1.7.1} +WCVERSION=${WCVERSION:-jwc-10.8.1} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + #We unzip webclient here + unzip $CWD/dist.zip + cmake .. \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DOpenGL_GL_PREFERENCE=GLVND \ + -DCMAKE_SKIP_RPATH=1 \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 +cp -a \ + LICENSE README.md \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/jellyfin-media-player/jellyfin-media-player.info b/multimedia/jellyfin-media-player/jellyfin-media-player.info new file mode 100644 index 0000000000..417fd8f02b --- /dev/null +++ b/multimedia/jellyfin-media-player/jellyfin-media-player.info @@ -0,0 +1,10 @@ +PRGNAM="jellyfin-media-player" +VERSION="1.7.1" +HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" +DOWNLOAD="https://github.com/jellyfin/jellyfin-media-player/archive/v1.7.1/jellyfin-media-player-1.7.1.tar.gz https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.8.1/dist.zip" +MD5SUM="7189d8ab9c4750042ca49fcefef405c4 72e280fda9ef4e7489a738e613414424" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="lua mpv" +MAINTAINER="Ozan Turkyilmaz" +EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/multimedia/jellyfin-media-player/slack-desc b/multimedia/jellyfin-media-player/slack-desc new file mode 100644 index 0000000000..bb5d310b85 --- /dev/null +++ b/multimedia/jellyfin-media-player/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +jellyfin-media-player: jellyfin-media-player (Jellyfin Desktop Client) +jellyfin-media-player: +jellyfin-media-player: Desktop client using jellyfin-web with embedded MPV player. Supports +jellyfin-media-player: Windows, Mac OS, and Linux. Media plays within the same window using +jellyfin-media-player: the jellyfin-web interface. +jellyfin-media-player: +jellyfin-media-player: https://github.com/jellyfin/jellyfin-media-player +jellyfin-media-player: +jellyfin-media-player: +jellyfin-media-player: +jellyfin-media-player: diff --git a/multimedia/jlscp/README b/multimedia/jlscp/README index 6a80be4413..880c0c69b6 100644 --- a/multimedia/jlscp/README +++ b/multimedia/jlscp/README @@ -4,7 +4,7 @@ This library provides client API for retrieving information and configuring running LinuxSampler instance according to the LinuxSampler control protocol version 1.4 -For more information about LinuxSampler visit http://www.linuxsampler.org +For more information about LinuxSampler, see http://www.linuxsampler.org Homepage: http://sourceforge.net/projects/jlscp/ See also: http://www.linuxsampler.org/downloads.html diff --git a/multimedia/jlscp/jlscp.SlackBuild b/multimedia/jlscp/jlscp.SlackBuild index 816ea50d78..804f822e34 100644 --- a/multimedia/jlscp/jlscp.SlackBuild +++ b/multimedia/jlscp/jlscp.SlackBuild @@ -4,6 +4,10 @@ # Written by klaatu@member.fsf.org +# 20220331 bkw: Modified by SlackBuilds.org: fail if JAVA_HOME not set +# and can't be set from profile.d script. This avoid creating a /jre +# in the package root. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jlscp @@ -13,9 +17,6 @@ TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -36,9 +37,21 @@ 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +if [ -z "$JAVA_HOME" ]; then + source /etc/profile.d/zulu-openjdk8.sh +fi + +if [ -z "$JAVA_HOME" ]; then + cat <<EOF +*** No JDK found. Install zulu-openjdk8 or another *jdk package and +*** try again. +EOF + exit 1 +fi # here is the install, such as it is mkdir -p $PKG/$JAVA_HOME/jre/lib/ext diff --git a/multimedia/jlscp/jlscp.info b/multimedia/jlscp/jlscp.info index b8156a0e48..bdd77557c2 100644 --- a/multimedia/jlscp/jlscp.info +++ b/multimedia/jlscp/jlscp.info @@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/jlscp/jlscp-0.8.tar.bz2" MD5SUM="9a3a507b3e5359369c2be777e71b8232" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk linuxsampler" +REQUIRES="zulu-openjdk8 linuxsampler" MAINTAINER="Klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild b/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild index fee0b52a47..644189ac09 100644 --- a/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild +++ b/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild @@ -33,7 +33,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -51,8 +51,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" diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild index 105e57ba6e..68e42ef000 100644 --- a/multimedia/kaffeine/kaffeine.SlackBuild +++ b/multimedia/kaffeine/kaffeine.SlackBuild @@ -26,13 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kaffeine VERSION=${VERSION:-2.0.18} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -52,8 +52,8 @@ OUTPUT=${OUTPUT:-/tmp} SRC_VERSION=$(echo $VERSION | tr _ -) -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" @@ -98,6 +98,9 @@ cd - 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 +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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING* Changelog NOTES README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/kaffeine/slack-desc b/multimedia/kaffeine/slack-desc index ae3331a5f7..d47926bcf8 100644 --- a/multimedia/kaffeine/slack-desc +++ b/multimedia/kaffeine/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -kaffeine: Kaffeine (Multimedia player for KDE) +kaffeine: kaffeine (Multimedia player for KDE) kaffeine: kaffeine: Kaffeine is a media player. What makes it different from the others is kaffeine: its excellent support of digital TV (DVB). Kaffeine has user-friendly diff --git a/multimedia/kodi/README b/multimedia/kodi/README index fb2bf88043..80eef02c5b 100644 --- a/multimedia/kodi/README +++ b/multimedia/kodi/README @@ -5,24 +5,20 @@ viewing and playing a vast library of audio, video and image formats. Kodi has a sophisticated library management system that allows you to organize all your media to give you quick and immediate access. -Optional dependencies: libcec, libnfs, lirc, cwiid, pybluez, avahi, - shairplay, and openjdk - -Optional: libcrystalhd (not available at slackbuilds.org) - -Below are some paramaters that can be passed to the slackbuild to turn -on some optional components. - -WII=yes|no (Default is no), requires cwiid and pybluez -WEBSERVER=yes|no (Default is yes), requires libmicrohttpd +Optional autodetected dependencies: +avahi - Network discovery +cwiid - Controller support +dav1d - AV1 codec support +libcec - CEC support +libmicrohttpd - Web interface support +libnfs - Browse NFS shares +lirc - Remote support +shairplay - Airplay Support NOTE: -Kodi can be compiled with openjdk instead of jdk. - -Please remove or rename /etc/oss.conf if it exists on your system -prior to building this package or it will fail to build. +Kodi can be compiled with jdk11 instead of zulu-openjdk11. -Using the system ffmpeg in the Kodi slackbuild is currently not -supported. The option to build Kodi with system ffmpeg is still -available in the slackbuild but it won't be supported by the -maintainer. +ADDITIONAL NOTE: +If you are having issues with addons crashing, please ensure you're +upgraded to at least python3-3.9.14 or later from the patches/ +directory on your favorite mirror. 3.9.12 and earlier had issues. diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index a954a733eb..0fdcff9779 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for kodi # Copyright 2009-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2022-2023 Jeremy Hansen <jebrhansen+SBo@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,9 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kodi SRCNAM=xbmc -CODNAM=Krypton -VERSION=${VERSION:-17.6} -FFMPEGVER=${FFMPEGVER:-3.1.11} +CODNAM=Matrix +VERSION=${VERSION:-19.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -72,12 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION-$CODNAM +rm -rf $SRCNAM-$VERSION-$CODNAM $PRGNAM-build tar xvf $CWD/$SRCNAM-$VERSION-$CODNAM.tar.gz cd $SRCNAM-$VERSION-$CODNAM -# Don't have the Makefile download ffmpeg during install. -ln -s $CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz \ - tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}-17.5.tar.gz chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -85,89 +79,77 @@ 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 {} \; -# No need to show Git: "Version" in a release build. -sed -i '/Git:/s|.*| return GetVersionShort();|' $SRCNAM/utils/SystemInfo.cpp - -# Patch for Samba 4.0. -patch -p1 < $CWD/patches/xbmc-Krypton-samba-4.0.patch - -# Fix static linking for Texturepacker. Thanks to Gentoo. -# Issue: http://forum.kodi.tv/showthread.php?tid=220407 -patch -p0 < $CWD/patches/kodi-texturepacker.patch - -# The version of ffmpeg on SBo is too old to compile kodi. -# Optional ffmpeg is still available but not turned on by -# default. -if [ "${FFMPEG:-no}" == "yes" ]; then - OPT_DEPS="--with-ffmpeg=shared" -else - OPT_DEPS="" -fi - -# Build webserver. Requires libmicrohttpd. -if [ "${WEBSERVER:-yes}" == "yes" ]; then - OPT_DEPS="$OPT_DEPS --enable-webserver" -else - OPT_DEPS="$OPT_DEPS --disable-webserver" -fi - -export PATH="$PATH:$PWD/tools/depends/native/JsonSchemaBuilder/bin" - -./bootstrap - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-silent-rules \ - --enable-static=no \ - --disable-debug \ - --enable-gl \ - --enable-mid \ - --enable-alsa \ - --enable-texturepacker \ - --enable-pulse \ - $OPT_DEPS \ - --build=$ARCH-slackware-linux - -make VERBOSE=1 - -# Wii controller usage. Default is no. -if ! [ "${WII:-no}" = "no" ]; then - make eventclients DESTDIR=$PKG WII_EXTRA_OPTS="-DCWIID_OLD" - find $PKG/usr/lib${LIBDIRSUFFIX}/python* -iname "*\.py" -exec chmod 0644 '{}' \; - # Create byte-compiled python files. - python -m compileall $PKG/usr/lib${LIBDIRSUFFIX}/python*/site-packages/$PRGNAM 2>/dev/null -fi - -make install DESTDIR=$PKG -python -m compileall $PKG/usr/share/$PRGNAM/addons/service.xbmc.versioncheck - -install -m 0755 tools/TexturePacker/TexturePacker $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +# Autodetection of "optional" dependencies sucks. It does not work and +# compilation will fail on each of these if not explicitly disabled. +# Figured I'd implement my own autodetection instead of requiring +# passing a bunch of annoying flags :) +if pkg-config --exists avahi-core ; then AVAHI=ON; else AVAHI=OFF; fi +if pkg-config --exists cwiid ; then CWIID=ON; else CWIID=OFF; fi +if pkg-config --exists dav1d ; then DAV1D=ON; else DAV1D=OFF; fi +if pkg-config --exists libmicrohttpd ; then WEBSERVER=ON; else WEBSERVER=OFF; fi +if pkg-config --exists libcec ; then CEC=ON; else CEC=OFF; fi +if pkg-config --exists libnfs ; then NFS=ON; else NFS=OFF; fi +if pkg-config --exists lirc ; then LIRC=ON; else LIRC=OFF; fi +if [ -f /usr/bin/shairplay ] ; then AIRPLAY=ON; else AIRPLAY=OFF; fi + +mkdir -p $TMP/$PRGNAM-build +cd $TMP/$PRGNAM-build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DAPP_RENDER_SYSTEM=gl \ + -DCORE_PLATFORM_NAME="x11" \ + -DENABLE_INTERNAL_FSTRCMP=ON \ + -DENABLE_INTERNAL_UDFREAD=ON \ + -DENABLE_AIRTUNES=$AIRPLAY \ + -DENABLE_AVAHI=$AVAHI \ + -DENABLE_CEC=$CEC \ + -DENABLE_DAV1D=$DAV1D \ + -DENABLE_EVENTCLIENTS=$CWIID \ + -DENABLE_LIRCCLIENT=$LIRC \ + -DENABLE_MICROHTTPD=$WEBSERVER \ + -DENABLE_NFS=$NFS \ + -Dlibdvdcss_URL=$CWD/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \ + -Dlibdvdnav_URL=$CWD/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \ + -Dlibdvdread_URL=$CWD/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \ + -DCROSSGUID_URL=$CWD/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \ + -DFSTRCMP_URL=$CWD/fstrcmp-0.7.D001.tar.gz \ + -DUDFREAD_URL=$CWD/libudfread-1.1.0.tar.gz \ + -DCMAKE_BUILD_TYPE=Release ../$SRCNAM-$VERSION-$CODNAM + make + make install/strip DESTDIR=$PKG +cd .. 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 -# Install manpages. +# Install manpages mkdir -p $PKG/usr/man/man1 -for i in $PRGNAM.bin.1 $PRGNAM.1 $PRGNAM-standalone.1; do - install -m 0644 docs/manpages/$i $PKG/usr/man/man1/$i +for i in {$PRGNAM{,.bin,-standalone},TexturePacker}.1; do + install -m 0644 $SRCNAM-$VERSION-$CODNAM/docs/manpages/$i $PKG/usr/man/man1/$i done -if ! [ "${WII:-no}" = "no" ]; then - for i in $PRGNAM-ps3remote.1 $PRGNAM-send.1 $PRGNAM-wiiremote.1; do - install -m 0644 docs/manpages/$i $PKG/usr/man/man1/$i +# Install Event Control manpages if enabled +if [ $CWIID == "ON" ]; then + for i in $PRGNAM{-ps3remote,-wiiremote,-send}.1; do + install -m 0644 $SRCNAM-$VERSION-$CODNAM/docs/manpages/$i $PKG/usr/man/man1/$i done fi -gzip -9 $PKG/usr/man/man?/*.? - -cp -a tools/EventClients/README.txt $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Final clean up. -find $PKG \( -name "Makefile*" -o -name "*cmake*" -o -name "*\.in" \) -exec rm -f '{}' \; +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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +( + cd $SRCNAM-$VERSION-$CODNAM + cp -a README.md privacy-policy.txt version.txt docs/MANIFESTO.md $PKG/usr/doc/$PRGNAM-$VERSION + if [ $CWIID == "ON" ]; then + cat tools/EventClients/README.txt > $PKG/usr/doc/$PRGNAM-$VERSION/Event-Client-README.txt + fi + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index 0124fc7167..db3339db14 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -1,12 +1,22 @@ PRGNAM="kodi" -VERSION="17.6" +VERSION="19.5" HOMEPAGE="https://kodi.tv/" -DOWNLOAD="https://github.com/xbmc/xbmc/archive/17.6-Krypton/xbmc-17.6-Krypton.tar.gz \ - https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5/FFmpeg-3.1.11-Krypton.tar.gz" -MD5SUM="a64c2fc56ddc41b9b0dded55eaabf170 \ - 6cf2d25e2a38fd274d9fb37a7bb4f953" +DOWNLOAD="https://github.com/xbmc/xbmc/archive/19.5-Matrix/xbmc-19.5-Matrix.tar.gz \ + https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.2-Leia-Beta-5/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \ + https://github.com/xbmc/libdvdnav/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \ + https://github.com/xbmc/libdvdread/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \ + https://github.com/xbmc/crossguid/archive/8f399e8/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \ + https://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz \ + https://code.videolan.org/videolan/libudfread/-/archive/1.1.0/libudfread-1.1.0.tar.gz" +MD5SUM="44f78712d1752af1c9c3d43dd5a56a17 \ + fb2824210a4eab2efeef36e7501e4979 \ + 2aec5f8c790449126118abc6bb3cb5cd \ + f3244e7b002d37f91cc6a77461c4f619 \ + 696a6573286d6fdbfde18686aa9f6489 \ + 9c440bbdfcad9fd22e38f2388715b0cc \ + cb71fa46a29183e01692e9fe738ec373" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk libass crossguid yajl tinyxml libmicrohttpd" -MAINTAINER="Larry Hajali" -EMAIL="larryhaja[at]gmail[dot]com" +REQUIRES="zulu-openjdk11 libass flatbuffers fmt rapidjson spdlog tinyxml gtest" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo@gmail.com" diff --git a/multimedia/kodi/patches/kodi-texturepacker.patch b/multimedia/kodi/patches/kodi-texturepacker.patch deleted file mode 100644 index fe3dcdcf7a..0000000000 --- a/multimedia/kodi/patches/kodi-texturepacker.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- tools/depends/native/TexturePacker/Makefile.old 2015-03-17 22:29:18.880029509 +0100 -+++ tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 -@@ -9,14 +9,10 @@ - - ifeq ($(NATIVEPLATFORM),) - PLATFORM = native -- EXTRA_CONFIGURE = --enable-static - else - PLATFORM = $(NATIVEPLATFORM) - endif - --ifeq ($(NATIVE_OS), linux) -- EXTRA_CONFIGURE = --enable-static --endif - ifeq ($(NATIVE_OS), android) - EXTRA_CONFIGURE = --enable-static - endif diff --git a/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch b/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch deleted file mode 100644 index 6916ead2ce..0000000000 --- a/multimedia/kodi/patches/xbmc-Krypton-samba-4.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBDirectory.cpp xbmc-17.1-Krypton/xbmc/filesystem/SMBDirectory.cpp ---- xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBDirectory.cpp 2017-03-20 16:17:49.000000000 +0000 -+++ xbmc-17.1-Krypton/xbmc/filesystem/SMBDirectory.cpp 2017-03-20 23:01:52.444160749 +0000 -@@ -45,7 +45,7 @@ - #include "linux/XTimeUtils.h" - #endif - --#include <libsmbclient.h> -+#include <samba-4.0/libsmbclient.h> - - struct CachedDirEntry - { -diff -Naur xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBFile.cpp xbmc-17.1-Krypton/xbmc/filesystem/SMBFile.cpp ---- xbmc-17.1-Krypton.orig/xbmc/filesystem/SMBFile.cpp 2017-03-20 16:17:49.000000000 +0000 -+++ xbmc-17.1-Krypton/xbmc/filesystem/SMBFile.cpp 2017-03-20 23:00:17.355154034 +0000 -@@ -26,7 +26,7 @@ - #include "SMBFile.h" - #include "PasswordManager.h" - #include "SMBDirectory.h" --#include <libsmbclient.h> -+#include <samba-4.0/libsmbclient.h> - #include "filesystem/SpecialProtocol.h" - #include "settings/AdvancedSettings.h" - #include "settings/Settings.h" diff --git a/multimedia/kvazaar/README b/multimedia/kvazaar/README new file mode 100644 index 0000000000..b934216004 --- /dev/null +++ b/multimedia/kvazaar/README @@ -0,0 +1,6 @@ +Kvazaar is an open source HEVCC encoder. It is still +under development and does not implement all the +features of HEVC. Performance will increase as more coding +tools are added. + +This is an optional dependency of FFmpeg. diff --git a/multimedia/totem/totem.SlackBuild b/multimedia/kvazaar/kvazaar.SlackBuild index 21be078943..4ab1520926 100644 --- a/multimedia/totem/totem.SlackBuild +++ b/multimedia/kvazaar/kvazaar.SlackBuild @@ -1,9 +1,8 @@ #!/bin/bash -# Slackware build script for totem +# Slackware build script for kvazaar -# Copyright 2010,2011 Robby Workman, Northport, Alabama, USA -# Copyright 2011-2012 byteframe +# Copyright 2022 Vijay Marcel # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,37 +11,37 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=totem -VERSION=${VERSION:-2.32.0} +PRGNAM=kvazaar +VERSION=${VERSION:-2.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then - case "$( uname -m )" in +case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac + *) ARCH=$( uname -m ) ;; +esac fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information # could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi @@ -66,48 +65,56 @@ else fi set -e +trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +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 \ \( -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" \ +autoreconf -fiv ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --bindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-scrollkeeper \ + --enable-shared=yes \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -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 +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +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 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 +find $PKG -name perllocal.pod \ + -o -name ".packlist" -o -name "*.bs" \ + | xargs rm -f + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CREDITS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/kvazaar/kvazaar.info b/multimedia/kvazaar/kvazaar.info new file mode 100644 index 0000000000..45ff8b1c86 --- /dev/null +++ b/multimedia/kvazaar/kvazaar.info @@ -0,0 +1,10 @@ +PRGNAM="kvazaar" +VERSION="2.1.0" +HOMEPAGE="https://github.com/ultravideo/kvazaar" +DOWNLOAD="https://github.com/ultravideo/kvazaar/archive/v2.1.0/kvazaar-2.1.0.tar.gz" +MD5SUM="3a133dbb009605748606f279615378e4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Vijay Marcel" +EMAIL="vijaymarcel@outlook.com" diff --git a/multimedia/kvazaar/slack-desc b/multimedia/kvazaar/slack-desc new file mode 100644 index 0000000000..63946b9846 --- /dev/null +++ b/multimedia/kvazaar/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +kvazaar: kvazaar (Open Source HEVC Encoder) +kvazaar: +kvazaar: Kvazaar is an open source HEVCC encoder. It is still +kvazaar: under development and does not implement all the +kvazaar: features of HEVC. Performance will increase as more coding +kvazaar: tools are added. +kvazaar: +kvazaar: Homepage: https://github.com/ultravideo/kvazaar +kvazaar: +kvazaar: +kvazaar: diff --git a/multimedia/l-smash/l-smash.SlackBuild b/multimedia/l-smash/l-smash.SlackBuild index 07c3386d59..11fe8248e9 100644 --- a/multimedia/l-smash/l-smash.SlackBuild +++ b/multimedia/l-smash/l-smash.SlackBuild @@ -22,8 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Now maintained by B. Watson <yalhcru@gmail.com> +# Now maintained by B. Watson <urchlay@slackware.uk> +# 20220411 bkw: BUILD=3, put README in right place (not /install!) # 20210910 bkw: include our own README since there are no docs # 20180215 bkw: update for 2.14.5 # 20170302 bkw: use long-format github URL @@ -38,7 +39,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=l-smash VERSION=${VERSION:-2.14.5} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -103,10 +104,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # 20210910 bkw: upstream didn't bother with any docs other than --help # messages. Include our own README, which at least tells the user the -# names of the binaries (hint: none of them are called -lsmash!), and +# names of the binaries (hint: none of them are called l-smash!), and # tells him to use the --help option. +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README + mkdir -p $PKG/install -cat $CWD/README > $PKG/install/README cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/multimedia/l-smash/l-smash.info b/multimedia/l-smash/l-smash.info index 1743bbac6d..c10a5715a1 100644 --- a/multimedia/l-smash/l-smash.info +++ b/multimedia/l-smash/l-smash.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" diff --git a/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild index db9663e5e0..44ba888365 100644 --- a/multimedia/lives/lives.SlackBuild +++ b/multimedia/lives/lives.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lives SRCNAM=LiVES VERSION=${VERSION:-3.2.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -124,6 +124,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cd $PKG/usr/bin && rm -f lives && ln -s lives-exe lives ) +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/multimedia/lives/lives.info b/multimedia/lives/lives.info index 90a8c09951..027b93b218 100644 --- a/multimedia/lives/lives.info +++ b/multimedia/lives/lives.info @@ -1,6 +1,6 @@ PRGNAM="lives" VERSION="3.2.0" -HOMEPAGE="https://lives.sourceforge.net" +HOMEPAGE="http://lives-video.com/" DOWNLOAD="http://lives-video.com/releases/LiVES-3.2.0.tar.bz2" MD5SUM="5d7bd0ad41d3189b62c002e518fb94c8" DOWNLOAD_x86_64="" diff --git a/multimedia/lsdvd/lsdvd.SlackBuild b/multimedia/lsdvd/lsdvd.SlackBuild index a0097570a0..e72f2caa01 100644 --- a/multimedia/lsdvd/lsdvd.SlackBuild +++ b/multimedia/lsdvd/lsdvd.SlackBuild @@ -2,15 +2,17 @@ # Slackware build script for lsdvd -# Written by B. Watson (yalhcru@gmail.com) +# Written by B. Watson (urchlay@slackware.uk) # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20230103 bkw: BUILD=2, remove useless INSTALL from doc dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lsdvd VERSION=${VERSION:-0.17} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,9 +73,10 @@ make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man1/$PRGNAM.1 -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp ChangeLog AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp ChangeLog AUTHORS COPYING README $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/multimedia/lsdvd/lsdvd.info b/multimedia/lsdvd/lsdvd.info index 816dc24d8e..8abfa26d91 100644 --- a/multimedia/lsdvd/lsdvd.info +++ b/multimedia/lsdvd/lsdvd.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" diff --git a/multimedia/lwks/README b/multimedia/lwks/README deleted file mode 100644 index dc1dc94403..0000000000 --- a/multimedia/lwks/README +++ /dev/null @@ -1,39 +0,0 @@ -lightworks (professional non-linear editing system) - -Lightworks is a cross-platform industry-grade NLE, having been used -for films including Pulp Fiction, Hugo, and The King's Speech. It is -free to use, but for additional codec support and technical support, -you can purchase a variety of licenses from http://lwks.com - -Using Lightworks requires registration on lwks.com. It is free, but -you must register in order to use the application. You can register in -advance or after you launch Lightworks. - -Lightworks will work with Nvidia or AMD graphic cards, but Nvidia is -recommended. Lightworks requires proprietary Nvidia drivers. - -Lightworks is 64bit only. - -System Recommendations: ------------------------ - -From lwks.com: - -- Intel i7 chipset or faster, fast AMD chipset -- 3GB RAM or higher -- Two high-resolution displays (1920 x1080) or above -- PCI Express graphics card (NVIDIA or ATI) with 1GB or higher -- Separate media and system drives (these can be internal or external - as long as the the interface is suitably fast) -- Compatible sound card -- 200MB Disk space for Lightworks installation -- (Optional) a Lightworks Console. -- (Optional) a Lightworks keyboard. - -From Klaatu: - -I run this on two machines: -- AMD FX-6300 / 8gb RAM / Nvidia GeForce GT 630 (proprietary drivers) -- Intel i7 / 16gb RAM / Intel HD Mobile 4000 (laptop) - -Both edit HD footage without a problem. Your mileage may vary. diff --git a/multimedia/lwks/lwks.SlackBuild b/multimedia/lwks/lwks.SlackBuild deleted file mode 100644 index e9edc4bf53..0000000000 --- a/multimedia/lwks/lwks.SlackBuild +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# Slackware build script for lwks - -# Copyright 2015 Klaatu Wellington NZ -# GNU All-Permissive License -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=lwks -VERSION=${VERSION:-14.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -ARCH=amd64 - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-x86_64-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $PKG -ar p $CWD/$PRGNAM-$VERSION-$ARCH.deb data.tar.xz | tar xJv -cd $PKG -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 \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -## install -mkdir -p $PKG/usr/bin $PKG/usr/lib64 $PKG/usr/share/fonts/TTF -cp -v $TMP/usr/bin/lightworks $PKG/usr/bin/ -cp -rv $TMP/usr/lib/* $PKG/usr/lib64/ -cp -rv $TMP/usr/share/applications $PKG/usr/share/ -cp -rv $TMP/usr/share/fonts/truetype/lw3.ttf $PKG/usr/share/fonts/TTF/ -cp -rv $TMP/usr/share/lightworks $PKG/usr/share/ - -# patch thanks to Christoph Willing -sed -i 's|/usr/lib/lightworks/ntcardvt|/usr/lib64/lightworks/ntcardvt|' \ - $PKG/usr/bin/lightworks - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# editshare controller udev rules. -# more thanks to Christoph Willing -mkdir -p $PKG/etc/udev/rules.d -cp -rv $TMP/lib/udev/rules.d/* $PKG/etc/udev/rules.d/ - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-x86_64-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/lwks/lwks.info b/multimedia/lwks/lwks.info deleted file mode 100644 index 3a1a0bbf29..0000000000 --- a/multimedia/lwks/lwks.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lwks" -VERSION="14.0.0" -HOMEPAGE="http://lwks.com" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb" -MD5SUM_x86_64="17a60e8c2956f65dd578a14cf673b0d4" -REQUIRES="nvidia-cg-toolkit" -MAINTAINER="klaatu" -EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/mediainfo/mediainfo.SlackBuild b/multimedia/mediainfo/mediainfo.SlackBuild index 35fd7f7873..29a2277f0e 100644 --- a/multimedia/mediainfo/mediainfo.SlackBuild +++ b/multimedia/mediainfo/mediainfo.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2010-2012 Binh Nguyen <binhvng@gmail.com> # Copyright 2012-2017 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org -# Copyright 2017-2020 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2017-2023 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mediainfo -VERSION=${VERSION:-20.09} +VERSION=${VERSION:-22.12} SRCNAM=MediaInfo BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/mediainfo/mediainfo.info b/multimedia/mediainfo/mediainfo.info index a7713afba0..6fa52ec300 100644 --- a/multimedia/mediainfo/mediainfo.info +++ b/multimedia/mediainfo/mediainfo.info @@ -1,8 +1,8 @@ PRGNAM="mediainfo" -VERSION="20.09" +VERSION="22.12" HOMEPAGE="https://mediaarea.net/MediaInfo/" -DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v20.09/MediaInfo-20.09.tar.gz" -MD5SUM="5814d9ed34be0719cc71a7d90967bc16" +DOWNLOAD="https://github.com/MediaArea/MediaInfo/archive/v22.12/MediaInfo-22.12.tar.gz" +MD5SUM="bac1f02a3537e09b95f95fa2ac6db990" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmediainfo" diff --git a/multimedia/mediainfo/remove-internal-libzen-support.patch b/multimedia/mediainfo/remove-internal-libzen-support.patch index e4e827f4b2..37c2afc0f1 100644 --- a/multimedia/mediainfo/remove-internal-libzen-support.patch +++ b/multimedia/mediainfo/remove-internal-libzen-support.patch @@ -1,8 +1,8 @@ diff --git a/Project/GNU/CLI/configure.ac b/Project/GNU/CLI/configure.ac -index 275c349..1ddeec0 100644 +index 062688e..6b0d3dd 100644 --- a/Project/GNU/CLI/configure.ac +++ b/Project/GNU/CLI/configure.ac -@@ -65,16 +65,10 @@ dnl ######################################################################### +@@ -66,16 +66,10 @@ dnl ######################################################################### dnl ------------------------------------------------------------------------- dnl Unicode dnl @@ -13,8 +13,8 @@ index 275c349..1ddeec0 100644 +if pkg-config --exists libzen; then + enable_unicode="$(pkg-config --variable=Unicode libzen)" else -- if pkg-config --exists libzen; then -- enable_unicode="$(pkg-config --variable=Unicode libzen)" +- if ${PKG_CONFIG:-pkg-config} --exists libzen; then +- enable_unicode="$(${PKG_CONFIG:-pkg-config} --variable=Unicode libzen)" - else - AC_MSG_ERROR([libzen configuration is not found]) - fi @@ -22,7 +22,7 @@ index 275c349..1ddeec0 100644 fi dnl ######################################################################### -@@ -198,41 +192,19 @@ fi +@@ -199,41 +193,18 @@ fi dnl ------------------------------------------------------------------------- dnl ZenLib dnl @@ -39,7 +39,6 @@ index 275c349..1ddeec0 100644 -elif test "$(libzen-config Exists)" = "yes" ; then - CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)" - MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(libzen-config CXXFLAGS)" -+ +if pkg-config --exists libzen; then + CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)" + MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)" @@ -53,16 +52,16 @@ index 275c349..1ddeec0 100644 + LIBS="$LIBS $(pkg-config --libs libzen)" fi else -- if pkg-config --exists libzen; then -- CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)" -- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)" +- if ${PKG_CONFIG:-pkg-config} --exists libzen; then +- CXXFLAGS="$CXXFLAGS $(${PKG_CONFIG:-pkg-config} --cflags libzen)" +- MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(${PKG_CONFIG:-pkg-config} --cflags libzen)" - if test "$enable_staticlibs" = "yes"; then - with_zenlib="system (static)" -- LIBS="$LIBS $(pkg-config --variable=Libs_Static libzen)" -- LIBS="$LIBS $(pkg-config --static --libs libzen)" +- LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --variable=Libs_Static libzen)" +- LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --static --libs libzen)" - else - with_zenlib="system" -- LIBS="$LIBS $(pkg-config --libs libzen)" +- LIBS="$LIBS $(${PKG_CONFIG:-pkg-config} --libs libzen)" - fi - else - AC_MSG_ERROR([libzen configuration is not found]) @@ -71,11 +70,18 @@ index 275c349..1ddeec0 100644 fi dnl ######################################################################### +@@ -317,4 +288,4 @@ echo " Using libzen? $with_zenlib" + echo " Using libmediainfo? $with_mediainfolib" + echo "" + echo " CXXFLAGS: $CXXFLAGS" +-echo " LIBS: $LIBS" +\ No newline at end of file ++echo " LIBS: $LIBS" diff --git a/Project/GNU/GUI/configure.ac b/Project/GNU/GUI/configure.ac -index 78bdeff..ea9203d 100644 +index eaf7ebb..62833ca 100644 --- a/Project/GNU/GUI/configure.ac +++ b/Project/GNU/GUI/configure.ac -@@ -79,14 +79,10 @@ dnl ######################################################################### +@@ -80,14 +80,10 @@ dnl ######################################################################### dnl ------------------------------------------------------------------------- dnl Unicode dnl @@ -93,7 +99,7 @@ index 78bdeff..ea9203d 100644 fi dnl ######################################################################### -@@ -313,31 +309,19 @@ fi +@@ -314,31 +310,19 @@ fi dnl ------------------------------------------------------------------------- dnl ZenLib dnl diff --git a/multimedia/mimms/mimms.SlackBuild b/multimedia/mimms/mimms.SlackBuild index 69b456d992..ccc85a8a94 100644 --- a/multimedia/mimms/mimms.SlackBuild +++ b/multimedia/mimms/mimms.SlackBuild @@ -33,7 +33,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/multimedia/minidlna/README.SLACKWARE b/multimedia/minidlna/README.SLACKWARE new file mode 100644 index 0000000000..c2b1f929f4 --- /dev/null +++ b/multimedia/minidlna/README.SLACKWARE @@ -0,0 +1,22 @@ +An init script has been included for the daemon; to run at boot time, +add the following to /etc/rc.d/rc.local: + + if [ -x /etc/rc.d/rc.minidlna ]; then + /etc/rc.d/rc.minidlna start + fi + +You might also want to have the daemon shut down gracefully +on system halt or reboot; if so, add the following to +/etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.minidlna ]; then + /etc/rc.d/rc.minidlna stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown + +To check the daemon is running properly: + + /etc/rc.d/rc.minidlna status diff --git a/multimedia/minidlna/doinst.sh b/multimedia/minidlna/doinst.sh index 7626d3a507..15f3e3fff1 100644 --- a/multimedia/minidlna/doinst.sh +++ b/multimedia/minidlna/doinst.sh @@ -11,4 +11,17 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } +preserve_perms() { + NEW="$1" + OLD="$(dirname ${NEW})/$(basename ${NEW} .new)" + if [ -e ${OLD} ]; then + cp -a ${OLD} ${NEW}.incoming + cat ${NEW} > ${NEW}.incoming + mv ${NEW}.incoming ${NEW} + fi + mv ${NEW} ${OLD} +} + +preserve_perms etc/rc.d/rc.minidlna.new config etc/minidlna.conf.new +config etc/logrotate.d/minidlna.new diff --git a/multimedia/minidlna/minidlna.SlackBuild b/multimedia/minidlna/minidlna.SlackBuild index 29df867d25..64ffce800b 100644 --- a/multimedia/minidlna/minidlna.SlackBuild +++ b/multimedia/minidlna/minidlna.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for minidlna # Copyright 2011-2012 Niels Horn, Rio de Janeiro, RJ, Brazil -# Copyright 2015 Mario Preksavec, Zagreb, Croatia +# Copyright 2015, 2023 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=minidlna -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -99,14 +99,17 @@ make install DESTDIR=$PKG 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 -# Include the config file -mkdir -p $PKG/etc -cat $PRGNAM.conf > $PKG/etc/$PRGNAM.conf.new +# Include startup script and configs thanks to Andrew Isakov +install -D -m755 $CWD/rc.$PRGNAM -T $PKG/etc/rc.d/rc.$PRGNAM.new +install -D -m644 $CWD/${PRGNAM}.logrotate -T $PKG/etc/logrotate.d/${PRGNAM}.new +install -D -m644 $PRGNAM.conf -T $PKG/etc/$PRGNAM.conf.new + +# Create log and db cache directories +mkdir -p $PKG/var/{log,cache}/$PRGNAM # Include the manual pages -mkdir -p $PKG/usr/man/man{5,8} -cat minidlna.conf.5 > $PKG/usr/man/man5/minidlna.conf.5 -cat minidlnad.8 > $PKG/usr/man/man8/minidlnad.8 +install -D -m644 minidlna.conf.5 -t $PKG/usr/man/man5 +install -D -m644 minidlnad.8 -t $PKG/usr/man/man8 gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/minidlna/minidlna.info b/multimedia/minidlna/minidlna.info index 65b0e9f7b7..1a2714325e 100644 --- a/multimedia/minidlna/minidlna.info +++ b/multimedia/minidlna/minidlna.info @@ -1,8 +1,8 @@ PRGNAM="minidlna" -VERSION="1.3.0" +VERSION="1.3.2" HOMEPAGE="http://minidlna.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.3.0.tar.gz" -MD5SUM="89e92d1938ee3066631d4ca9fbf31507" +DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.3.2.tar.gz" +MD5SUM="9e4cc50a48b1b467a234b579b45457d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/multimedia/minidlna/minidlna.logrotate b/multimedia/minidlna/minidlna.logrotate new file mode 100644 index 0000000000..17bf172f49 --- /dev/null +++ b/multimedia/minidlna/minidlna.logrotate @@ -0,0 +1,6 @@ +/var/log/minidlna/minidlna.log { + sharedscripts + postrotate + /usr/bin/pkill -HUP -F /var/run/minidlna.pid 2>/dev/null || true + endscript +} diff --git a/multimedia/minidlna/rc.minidlna b/multimedia/minidlna/rc.minidlna new file mode 100644 index 0000000000..2651f3b636 --- /dev/null +++ b/multimedia/minidlna/rc.minidlna @@ -0,0 +1,132 @@ +#!/bin/sh +# +# /etc/rc.d/rc.minidlna +# +# start/stop/restart/status of the MiniDLNA server. +# +# To make MiniDLNA start automatically at boot, make this +# file executable: chmod 755 /etc/rc.d/rc.minidlna +# +# Written by Georgi D. Sotirov <gsotirov@gmail.com> +# Based on examples from Internet + +# Bash colors +C_GREEN=$'\e[32;01m' +C_YELLOW=$'\e[33;01m' +C_RED=$'\e[31;01m' +C_NORMAL=$'\e[0m' + +SNAME='MiniDLNA server' +NAME=minidlna +CMD="/usr/sbin/${NAME}d" +CONFILE="/etc/${NAME}.conf" +PIDFILE="/var/run/${NAME}.pid" +CMD_OPTS="-f $CONFILE -P $PIDFILE" + +ok() { + echo "${C_GREEN}Done${C_NORMAL}" +} + +fail() { + echo "${C_RED}Failure${C_NORMAL}" +} + +print_status() { + if [ $? != 0 ]; then + fail + else + ok + fi +} + +start() { + if [ -x $CMD ]; then + if [ ! -e $PIDFILE ]; then + echo -n "Starting $SNAME in $CMD... " + $CMD $CMD_OPTS + print_status + else + echo "Starting $SNAME: Already running with PID `cat $PIDFILE`!" + fi + fi +} + +stop() { + if [ -e $PIDFILE ]; then + echo -n "Stopping ${SNAME}... " + kill -15 `cat $PIDFILE` + print_status + else + echo "Stopping ${SNAME}: Not running!" + fi +} + +restart() { + stop + sleep 3 + start +} + +status() { + if [ -e $PIDFILE ]; then + echo "$SNAME running with PID `cat $PIDFILE`." + else + STAT=`ps -C $NAME -o pid= | wc -l` + if [ ${STAT} -ge 1 ]; then + echo "$SNAME is running" + else + echo "$SNAME is not running" + fi + fi +} + +db_clean() { + # If DB dir defined explicitly in log (i.e. not commented), then use it + DB_DIR_CONF=$(grep -E '^db_dir=' $CONFILE | awk -F'=' '{ print $2 }') + # else fallback to default + DB_DIR=${DB_DIR_CONF:-/var/cache/$NAME} + WAS_RUNNING=0 + + if [ -e $DB_DIR -a -d $DB_DIR ]; then + # Stop daemon if running + if [ -e $PIDFILE ]; then + WAS_RUNNING=1 + stop + sleep 3 + fi + + echo -n "Cleaning cache in ${DB_DIR}... " + rm -f ${DB_DIR}/files.db + rm -rf ${DB_DIR}art_cache + print_status + + # And restart daemon afterwards + if [ $WAS_RUNNING -ne 0 ]; then + start + fi + else + echo "Error: cache dir $DB_DIR does not exist or not a direcory!" + fi +} + +help() { + echo "$SNAME control" + echo "Usage: $0 start|stop|restart|status|clean" + echo +} + +case "$1" in + 'start') + start ;; + 'stop') + stop ;; + 'restart') + restart ;; + 'status') + status ;; + 'clean') + db_clean ;; + *) + help ;; +esac + diff --git a/multimedia/minitube/README b/multimedia/minitube/README index e8fd048258..9ddd0dd3e0 100644 --- a/multimedia/minitube/README +++ b/multimedia/minitube/README @@ -1,4 +1,5 @@ -Minitube is a YouTube desktop client. With it you can watch YouTube videos in -a new way: you type a keyword, Minitube gives you an endless video stream. -Minitube does not require the Flash Player. Minitube is not about cloning -the original YouTube web interface, it aims to create a new TV-like experience. +Minitube is a YouTube desktop client. With it you can watch YouTube +videos in a new way: you type a keyword, Minitube gives you an endless +video stream. Minitube does not require the Flash Player. Minitube +is not about cloning the original YouTube web interface, it aims to +create a new TV-like experience. diff --git a/multimedia/minitube/minitube-gcc47.patch b/multimedia/minitube/minitube-gcc47.patch deleted file mode 100644 index 6283b1fe99..0000000000 --- a/multimedia/minitube/minitube-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur minitube-20120813_338dac6.orig/src/qtsingleapplication/qtlocalpeer.cpp minitube-20120813_338dac6/src/qtsingleapplication/qtlocalpeer.cpp ---- minitube-20120813_338dac6.orig/src/qtsingleapplication/qtlocalpeer.cpp 2012-08-13 17:09:04.000000000 +0200 -+++ minitube-20120813_338dac6/src/qtsingleapplication/qtlocalpeer.cpp 2012-09-12 13:00:44.330889268 +0200 -@@ -58,6 +58,7 @@ - #endif - #if defined(Q_OS_UNIX) - #include <time.h> -+#include <unistd.h> - #endif - - namespace QtLP_Private { diff --git a/multimedia/minitube/minitube.SlackBuild b/multimedia/minitube/minitube.SlackBuild index 8309580504..d0b90056f5 100644 --- a/multimedia/minitube/minitube.SlackBuild +++ b/multimedia/minitube/minitube.SlackBuild @@ -2,7 +2,9 @@ # Slackware build script for minitube -# Copyright 2009 Mikhail Zotov < mikhail dot ru at gmail dot com > +# Copyright 2009 Mikhail Zotov +# Copyright 2021-2023 Johannes Schoepfer, Germany +# All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -21,27 +23,24 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Version number bumped by /dev/ammo42 +# 20220320 bkw: Modified by SlackBuilds.org: fix 32-bit build. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=minitube -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.9.3} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -51,14 +50,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 20220320 bkw: we need -fPIC even for 32-bit. +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -m64" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -71,18 +71,18 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix building with gcc-4.7.x -patch -p1 < $CWD/minitube-gcc47.patch + -exec chmod 644 {} \+ +# fix for mpv >= 0.35, thanks to Chris Willing +sed -i -e '/mpv_opengl_init_params/ s/, nullptr};/};/' \ + lib/media/src/mpv/mpvwidget.cpp qmake # Use our SLKCFLAGS plus the hardcoded ones from the Makefile make \ @@ -92,7 +92,7 @@ make install INSTALL_ROOT=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS CHANGES COPYING INSTALL TODO \ + AUTHORS CHANGES COPYING TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/minitube/minitube.info b/multimedia/minitube/minitube.info index ab76d9715c..91dd1670e2 100644 --- a/multimedia/minitube/minitube.info +++ b/multimedia/minitube/minitube.info @@ -1,10 +1,10 @@ PRGNAM="minitube" -VERSION="2.1.3" +VERSION="3.9.3" HOMEPAGE="https://flavio.tordini.org/minitube" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/minitube-2.1.3.tar.xz" -MD5SUM="3f0d44da75b275b442fde4a21af2f115" +DOWNLOAD="https://github.com/flaviotordini/minitube/releases/download/3.9.3/minitube-3.9.3.tar.bz2" +MD5SUM="f6eddbba90988051bf62339df73481a6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="mpv" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds@schoepfer.info" +EMAIL="slackbuilds at schoepfer dot info" diff --git a/multimedia/mirage2iso/README b/multimedia/mirage2iso/README new file mode 100644 index 0000000000..309575ed89 --- /dev/null +++ b/multimedia/mirage2iso/README @@ -0,0 +1,4 @@ +mirage2iso (extract iso images from CD images) + +mirage2iso is a simple tool to convert various CD/DVD image formats into +.iso images through use of libmirage (same one as used by cdemu). diff --git a/multimedia/mirage2iso/mirage2iso.1 b/multimedia/mirage2iso/mirage2iso.1 new file mode 100644 index 0000000000..0d669013a7 --- /dev/null +++ b/multimedia/mirage2iso/mirage2iso.1 @@ -0,0 +1,109 @@ +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "MIRAGE2ISO" 1 "2022-01-25" "0.4.2" "SlackBuilds.org" +.SH NAME +mirage2iso \- convert various CD/DVD image formats to ISO +.\" RST source for mirage2iso(1) man page. Convert with: +. +.\" rst2man.py mirage2iso.rst > mirage2iso.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +mirage2iso [\fI\-options\fP] \fIinput\-file\fP [\fIoutput.iso\fP] +.SH DESCRIPTION +.sp +\fBmirage2iso\fP extracts an ISO\-9660 image from a CD/DVD image in any +format supported by \fBlibmirage\fP\&. This includes \fIbin/cue\fP, \fInrg\fP +(Nero), \fImds\fP (Alcohol 120%), and many more; see the libmirage +documentation for the full list. +.sp +The \fIinput\-file\fP argument is required, and there\(aqs no way to read +from standard input. For multi\-file formats (\fIbin/cue\fP, \fIbin/toc\fP, +etc), the \fIinput\-file\fP must be the one containing the table of +contents (the \fIcue\fP or \fItoc\fP file, which will also be the smallest +file of the set). +.sp +With no \fIoutput.iso\fP argument, the output filename is "guessed" |
