diff options
Diffstat (limited to 'audio')
62 files changed, 1119 insertions, 518 deletions
diff --git a/audio/aacgain/aacgain.SlackBuild b/audio/aacgain/aacgain.SlackBuild index 2a138e95c9..cabdf16c33 100644 --- a/audio/aacgain/aacgain.SlackBuild +++ b/audio/aacgain/aacgain.SlackBuild @@ -120,7 +120,7 @@ cd ../mp4v2 patch -p2 -i ../$PRGNAM/mp4v2.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --build=$ARCH-slackware-linux diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild index 60c79fccb5..088d4c44dd 100644 --- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild +++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild @@ -31,7 +31,7 @@ TARNAM=ams if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,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" @@ -72,6 +72,9 @@ 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 {} \; +export CC=clang +export CXX=clang++ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LIBS="-ldl" \ diff --git a/audio/ardour/README b/audio/ardour/README index 7894f96b66..3fe7f11121 100644 --- a/audio/ardour/README +++ b/audio/ardour/README @@ -1,3 +1,5 @@ Ardour is an application to fit the needs of musicians under Linux. It is designed to be a fully functional professional audio application, that uses the professional sound server jack for sound i/o. + +cppunit and suil are optional dependencies. diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 8eefcb3953..80e5ccc6ee 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ardour -VERSION=${VERSION:-4.7.0} +VERSION=${VERSION:-5.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -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="" TARGET="i386" elif [ "$ARCH" = "i686" ]; then @@ -106,10 +106,10 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh # Let's not clobber config files -cd $PKG/etc/ardour4 +cd $PKG/etc/ardour5 for i in $(find . -type f) ; do mv $i $i.new - echo "config etc/ardour4/$i.new" >> $PKG/install/doinst.sh + echo "config etc/ardour5/$i.new" >> $PKG/install/doinst.sh done cd - diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index afb7049ee1..5387fa5b06 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,8 +1,8 @@ PRGNAM="ardour" -VERSION="4.7.0" +VERSION="5.10.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="http://www.liwjatan.at/files/src/ardour/Ardour-4.7.0.tar.bz2" -MD5SUM="60b7b889beb3727b55264513fd93af3b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/Ardour-5.10.0.tar.bz2" +MD5SUM="fee09577683747a9b9ef1445c8b3f4a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="aubio jack-audio-connection-kit liblo liblrdf vamp-plugin-sdk rubberband lv2 cwiid lilv" diff --git a/audio/audacious-aac/audacious-aac.SlackBuild b/audio/audacious-aac/audacious-aac.SlackBuild index fa61144a3d..686aee386c 100644 --- a/audio/audacious-aac/audacious-aac.SlackBuild +++ b/audio/audacious-aac/audacious-aac.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-aac -VERSION=${VERSION:-3.7.2} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,7 +31,7 @@ SRCNAM=audacious-plugins if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,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="" ARCHOPTS="--disable-sse2" elif [ "$ARCH" = "i686" ]; then diff --git a/audio/audacious-aac/audacious-aac.info b/audio/audacious-aac/audacious-aac.info index 574bc34f88..2a903ffb9a 100644 --- a/audio/audacious-aac/audacious-aac.info +++ b/audio/audacious-aac/audacious-aac.info @@ -1,8 +1,8 @@ PRGNAM="audacious-aac" -VERSION="3.7.2" +VERSION="3.8.2" HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2" +MD5SUM="20710cd19fa08c4bffb6cb33002872df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faad2" diff --git a/audio/audacious-aac/patches/enable_only_aac_plugin.diff b/audio/audacious-aac/patches/enable_only_aac_plugin.diff index eb0d46801c..94692f2f26 100644 --- a/audio/audacious-aac/patches/enable_only_aac_plugin.diff +++ b/audio/audacious-aac/patches/enable_only_aac_plugin.diff @@ -2,7 +2,7 @@ +++ audacious-plugins-3.6.1/Makefile 2015-04-23 19:59:48.072721987 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = src po -+SUBDIRS = src/aac-raw ++SUBDIRS = src/aac DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk diff --git a/audio/audacious-cue/audacious-cue.SlackBuild b/audio/audacious-cue/audacious-cue.SlackBuild index a3a796cd74..8d018fdadb 100644 --- a/audio/audacious-cue/audacious-cue.SlackBuild +++ b/audio/audacious-cue/audacious-cue.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-cue -VERSION=${VERSION:-3.7.2} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,7 +31,7 @@ SRCNAM=audacious-plugins if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,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="" ARCHOPTS="--disable-sse2" elif [ "$ARCH" = "i686" ]; then diff --git a/audio/audacious-cue/audacious-cue.info b/audio/audacious-cue/audacious-cue.info index 4f20ab124e..d334093006 100644 --- a/audio/audacious-cue/audacious-cue.info +++ b/audio/audacious-cue/audacious-cue.info @@ -1,8 +1,8 @@ PRGNAM="audacious-cue" -VERSION="3.7.2" +VERSION="3.8.2" HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2" +MD5SUM="20710cd19fa08c4bffb6cb33002872df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libcue" diff --git a/audio/audacious-ffmpeg/README b/audio/audacious-ffmpeg/README deleted file mode 100644 index 04da987f9f..0000000000 --- a/audio/audacious-ffmpeg/README +++ /dev/null @@ -1,4 +0,0 @@ -audacious-ffmpeg (ffmpeg Decoder Plugin used by the Audacious player) - -This plugin adds all audio ffmpeg decoders to the Audacious media -player that comes with Slackware stock packages diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild b/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild deleted file mode 100644 index f45b5c764f..0000000000 --- a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for audacious-ffmpeg - -# Copyright 2016 Johannes Schoepfer, Herrenberg, BW; Germany -# 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. - -PRGNAM=audacious-ffmpeg -VERSION=${VERSION:-3.7.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=audacious-plugins - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - ARCHOPTS="--disable-sse2" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - ARCHOPTS="--disable-sse2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - ARCHOPTS="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - ARCHOPTS="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 -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 \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Patch Makefile to build only aac plugin -patch -p1 <$CWD/patches/enable_only_ffmpeg_plugin.diff || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-aac \ - --program-prefix= \ - --program-suffix= \ - ${ARCHOPTS} \ - --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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL $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:-tgz} diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.info b/audio/audacious-ffmpeg/audacious-ffmpeg.info deleted file mode 100644 index 5370644793..0000000000 --- a/audio/audacious-ffmpeg/audacious-ffmpeg.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="audacious-ffmpeg" -VERSION="3.7.2" -HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ffmpeg" -MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" diff --git a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff b/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff deleted file mode 100644 index feb3fab813..0000000000 --- a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- audacious-plugins-3.6.1/Makefile.ORIG 2015-04-04 02:02:06.000000000 +0200 -+++ audacious-plugins-3.6.1/Makefile 2015-04-23 19:59:48.072721987 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = src po -+SUBDIRS = src/ffaudio - - DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk - diff --git a/audio/audacious-ffmpeg/slack-desc b/audio/audacious-ffmpeg/slack-desc deleted file mode 100644 index 1c73a4afc1..0000000000 --- a/audio/audacious-ffmpeg/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------------------------------------------------------| -audacious-ffmpeg: audacious-ffmpeg (ffmpeg Decoder Plugin) -audacious-ffmpeg: -audacious-ffmpeg: This plugin adds all audio ffmpeg decoders to the Audacious media -audacious-ffmpeg: player that comes with Slackware stock packages -audacious-ffmpeg: -audacious-ffmpeg: Homepage: http://audacious-media-player.org/ -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: diff --git a/audio/butt/butt.SlackBuild b/audio/butt/butt.SlackBuild index 8cfe05ed28..5a9e116b18 100644 --- a/audio/butt/butt.SlackBuild +++ b/audio/butt/butt.SlackBuild @@ -55,7 +55,7 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix $PREFIX \ --docdir $DOCDIR diff --git a/audio/calf-ladspa/calf-ladspa.SlackBuild b/audio/calf-ladspa/calf-ladspa.SlackBuild index f78f393bc7..2d85f57020 100644 --- a/audio/calf-ladspa/calf-ladspa.SlackBuild +++ b/audio/calf-ladspa/calf-ladspa.SlackBuild @@ -98,7 +98,7 @@ patch -p1 < $CWD/disable-jack-and-fluidsynth.diff # This patch replaces them with C-style MIN and MAX macros. Not actually # needed on Slack 14.2, so it's commented out, but I'm checking the actual # patch into git so I won't lose track of it. -#patch -p1 < $CWD/minmax.diff +patch -p1 < $CWD/minmax.diff autoreconf -if diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild index d5e99369ae..d6675b8c85 100644 --- a/audio/clementine/clementine.SlackBuild +++ b/audio/clementine/clementine.SlackBuild @@ -78,6 +78,8 @@ patch -p1 < $CWD/sqlite.patch # https://github.com/clementine-player/Clementine/commit/ded312685735fc266d4154d355286eeb86db3bcd patch -p1 < $CWD/chromaprint-1.4.patch +patch -p1 < $CWD/functional-header.patch + mkdir build cd build cmake \ @@ -86,6 +88,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ + -DUSE_SYSTEM_PROJECTM=1 \ -DCMAKE_BUILD_TYPE=Release \ .. make all CFLAGS="-fPIC" PMFLAGS="-DNEWBUFFER" diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info index 1f92d726a1..184e07d412 100644 --- a/audio/clementine/clementine.info +++ b/audio/clementine/clementine.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz" MD5SUM="04ce1c102841282e620d4caae2a897a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint cryptopp libechonest protobuf" +REQUIRES="chromaprint cryptopp libechonest projectM protobuf" MAINTAINER="David Woodfall" EMAIL="dave@dawoodfall.net" diff --git a/audio/clementine/functional-header.patch b/audio/clementine/functional-header.patch new file mode 100644 index 0000000000..f41147d0ff --- /dev/null +++ b/audio/clementine/functional-header.patch @@ -0,0 +1,48 @@ +From a2f7d018c7bdee96d4cefd5a1ec0c4f710fea226 Mon Sep 17 00:00:00 2001 +From: Morris <hafnermorris@gmail.com> +Date: Sun, 12 Feb 2017 23:41:43 +0100 +Subject: [PATCH] Add missing <functional> includes + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6..8c210d3 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include <QStringList> + ++#include <functional> + #include <limits> + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb..5f63ef2 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include <functional> + #include <memory> + + #include <QFile> +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f..e5f711b 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include <QPushButton> + ++#include <functional> ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; diff --git a/audio/darkice/darkice.SlackBuild b/audio/darkice/darkice.SlackBuild index b9829076da..887e4fa8d4 100644 --- a/audio/darkice/darkice.SlackBuild +++ b/audio/darkice/darkice.SlackBuild @@ -71,7 +71,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 {} \; -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/jack2/gcc_6_and_7.patch b/audio/jack2/gcc_6_and_7.patch new file mode 100644 index 0000000000..1fbf7b6a4b --- /dev/null +++ b/audio/jack2/gcc_6_and_7.patch @@ -0,0 +1,41 @@ +diff -Naur jack-1.9.10.orig/tests/iodelay.cpp jack-1.9.10/tests/iodelay.cpp +--- jack-1.9.10.orig/tests/iodelay.cpp 2014-07-18 14:28:13.000000000 +0200 ++++ jack-1.9.10/tests/iodelay.cpp 2017-07-26 11:30:15.780890455 +0200 +@@ -20,6 +20,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdint.h> + #include <math.h> + #include <unistd.h> + #include <jack/jack.h> +@@ -167,8 +168,8 @@ + static jack_port_t *jack_capt; + static jack_port_t *jack_play; + +-jack_latency_range_t capture_latency = {-1, -1}; +-jack_latency_range_t playback_latency = {-1, -1}; ++jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; ++jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; + + void + latency_cb (jack_latency_callback_mode_t mode, void *arg) +@@ -266,4 +267,4 @@ + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// -------------------------------------------------------------------------------- +diff -Naur jack-1.9.10.orig/tests/test.cpp jack-1.9.10/tests/test.cpp +--- jack-1.9.10.orig/tests/test.cpp 2014-07-18 14:28:13.000000000 +0200 ++++ jack-1.9.10/tests/test.cpp 2017-07-26 11:30:35.980457716 +0200 +@@ -480,7 +480,7 @@ + jack_nframes_t delta_time = cur_time - last_time; + + Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); +- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { ++ if (delta_time > 0 && (jack_nframes_t)abs((int64_t)delta_time - cur_buffer_size) > tolerance) { + printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); + } + diff --git a/audio/jack2/jack2.SlackBuild b/audio/jack2/jack2.SlackBuild index 204c9293e3..f35d6925ba 100644 --- a/audio/jack2/jack2.SlackBuild +++ b/audio/jack2/jack2.SlackBuild @@ -71,6 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc_6_and_7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./waf configure \ diff --git a/audio/lmms/gcc6.patch b/audio/lmms/gcc6.patch new file mode 100644 index 0000000000..ef7fbe75c9 --- /dev/null +++ b/audio/lmms/gcc6.patch @@ -0,0 +1,112 @@ +From a06cb0126ccb025993efb2d81c7cbfd8edd60609 Mon Sep 17 00:00:00 2001 +From: Javier Serrano Polo <javier@jasp.net> +Date: Sat, 30 Apr 2016 00:00:09 +0200 +Subject: [PATCH] Fixed build problems with GCC 6 + +--- + plugins/LadspaEffect/calf/src/modules_limit.cpp | 3 ++- + plugins/opl2/fmopl.c | 29 +++++++++++----------- + .../zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl | 6 +++-- + .../zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl | 6 +++-- + 5 files changed, 29 insertions(+), 22 deletions(-) + +diff --git a/plugins/LadspaEffect/calf/src/modules_limit.cpp b/plugins/LadspaEffect/calf/src/modules_limit.cpp +index 3930078..cd3d6fa 100644 +--- a/plugins/LadspaEffect/calf/src/modules_limit.cpp ++++ b/plugins/LadspaEffect/calf/src/modules_limit.cpp +@@ -540,7 +540,8 @@ uint32_t multibandlimiter_audio_module::process(uint32_t offset, uint32_t numsam + } // process single strip with filter + + // write multiband coefficient to buffer +- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)), 1.0); ++ float pre_buffer = *params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)); ++ buffer[pos] = std::min(pre_buffer, 1.0f); + + for (int i = 0; i < strips; i++) { + // process gain reduction +diff --git a/plugins/opl2/fmopl.c b/plugins/opl2/fmopl.c +index 9b411a2..3dd4a51 100644 +--- a/plugins/opl2/fmopl.c ++++ b/plugins/opl2/fmopl.c +@@ -653,21 +653,21 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + double rate; + + /* make attack rate & decay rate tables */ +- for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; { +- for (i = 4; i <= 60; i++) { +- rate = OPL->freqbase; /* frequency rate */ +- if( i < 60 ) { +- rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ +- } +- rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ +- rate *= (double)(EG_ENT<<ENV_BITS); +- OPL->AR_TABLE[i] = rate / ARRATE; +- OPL->DR_TABLE[i] = rate / DRRATE; +- } +- for ( i = 60; i < 75; i++ ) { +- OPL->AR_TABLE[i] = EG_AED-1; +- OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; ++ for (i = 4; i <= 60; i++) { ++ rate = OPL->freqbase; /* frequency rate */ ++ if( i < 60 ) { ++ rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ + } ++ rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ ++ rate *= (double)(EG_ENT<<ENV_BITS); ++ OPL->AR_TABLE[i] = rate / ARRATE; ++ OPL->DR_TABLE[i] = rate / DRRATE; ++ } ++ for ( i = 60; i < 75; i++ ) { ++ OPL->AR_TABLE[i] = EG_AED-1; ++ OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ } + #if 0 + for ( i = 0; i < 64 ; i++ ) { /* make for overflow area */ + LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, +@@ -675,7 +675,6 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + ((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLE[i]) * (1000.0 / OPL->rate) )); + } + #endif +- } + } + + /* ---------- generic table initialize ---------- */ +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +index 359f64c..db70677 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +@@ -204,12 +204,14 @@ if (event==FL_RELEASE){ + + if ((event==FL_DRAG)&&(currentpoint>=0)){ + int ny=127-(int) (y_*127.0/h()); +- if (ny<0) ny=0;if (ny>127) ny=127; ++ if (ny<0) ny=0; ++ if (ny>127) ny=127; + env->Penvval[currentpoint]=ny; + + int dx=(int)((x_-cpx)*0.1); + int newdt=cpdt+dx; +- if (newdt<0) newdt=0;if (newdt>127) newdt=127; ++ if (newdt<0) newdt=0; ++ if (newdt>127) newdt=127; + if (currentpoint!=0) env->Penvdt[currentpoint]=newdt; + else env->Penvdt[currentpoint]=0; + +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +index f1b887c..5ab7290 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +@@ -133,8 +133,10 @@ if ( (x_>=0)&&(x_<w()) && (y_>=0)&&(y_<h())){ + if ((event==FL_PUSH)||(event==FL_DRAG)){ + int leftbutton=1; + if (Fl::event_button()==FL_RIGHT_MOUSE) leftbutton=0; +- if (x_<0) x_=0;if (y_<0) y_=0; +- if (x_>=w()) x_=w();if (y_>=h()-1) y_=h()-1; ++ if (x_<0) x_=0; ++ if (y_<0) y_=0; ++ if (x_>=w()) x_=w(); ++ if (y_>=h()-1) y_=h()-1; + + if ((oldx<0)||(oldx==x_)){ + int sn=(int)(x_*1.0/w()*N_RES_POINTS); diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild index 2de7305a99..35414c0364 100644 --- a/audio/lmms/lmms.SlackBuild +++ b/audio/lmms/lmms.SlackBuild @@ -51,6 +51,9 @@ 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 archlinux +patch -p1 < $CWD/gcc6.patch + mkdir build cd build cmake \ diff --git a/audio/mac/gcc6.patch b/audio/mac/gcc6.patch new file mode 100644 index 0000000000..e22d1c1f53 --- /dev/null +++ b/audio/mac/gcc6.patch @@ -0,0 +1,181 @@ +From: Peter Levine <plevine457@gmail.com> +--- mac-3.99-u4-b5-s7/src/Shared/NoWindows.h.old 2016-09-18 21:37:56.049105791 -0400 ++++ mac-3.99-u4-b5-s7/src/Shared/NoWindows.h 2016-09-18 21:55:29.666295506 -0400 +@@ -39,8 +39,8 @@ + typedef const wchar_t * LPCWSTR; + + #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES); +-#define max(a,b) (((a) > (b)) ? (a) : (b)) +-#define min(a,b) (((a) < (b)) ? (a) : (b)) ++#define max_macro(a,b) (((a) > (b)) ? (a) : (b)) ++#define min_macro(a,b) (((a) < (b)) ? (a) : (b)) + + #define __stdcall + #define CALLBACK +--- mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp.old 2016-09-18 21:43:44.270495095 -0400 ++++ mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp 2016-09-18 21:44:47.960148731 -0400 +@@ -45,7 +45,7 @@ + + if (pBuffer != NULL && nBytes > 0) + { +- int nHeadBytes = min(m_nEndCap - m_nHead, nBytes); ++ int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes); + int nFrontBytes = nBytes - nHeadBytes; + + memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes); +@@ -72,7 +72,7 @@ + + int CCircleBuffer::RemoveHead(int nBytes) + { +- nBytes = min(MaxGet(), nBytes); ++ nBytes = min_macro(MaxGet(), nBytes); + m_nHead += nBytes; + if (m_nHead >= m_nEndCap) + m_nHead -= m_nEndCap; +@@ -81,7 +81,7 @@ + + int CCircleBuffer::RemoveTail(int nBytes) + { +- nBytes = min(MaxGet(), nBytes); ++ nBytes = min_macro(MaxGet(), nBytes); + m_nTail -= nBytes; + if (m_nTail < 0) + m_nTail += m_nEndCap; +--- mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp.old 2016-09-18 21:48:40.916547811 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp 2016-09-18 21:51:43.670733601 -0400 +@@ -117,7 +117,7 @@ + return ERROR_UNDEFINED; + + // calculate how many bytes to copy and add that much to the buffer +- int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone); ++ int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone); + memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess); + + // unlock the buffer (fail if not successful) +@@ -162,7 +162,7 @@ + + while ((m_nBufferTail - m_nBufferHead) >= nThreshold) + { +- int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); ++ int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); + + if (nFrameBytes == 0) + break; +--- mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp.old 2016-09-18 21:46:56.962072960 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp 2016-09-18 22:01:14.402044817 -0400 +@@ -35,8 +35,8 @@ + m_bErrorDecodingCurrentFrame = FALSE; + + // set the "real" start and finish blocks +- m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); +- m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); ++ m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); ++ m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); + m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS)); + } + +@@ -85,7 +85,7 @@ + + // cap + int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock; +- const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish); ++ const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish); + + // get the data + unsigned char * pOutputBuffer = (unsigned char *) pBuffer; +@@ -99,7 +99,7 @@ + + // analyze how much to remove from the buffer + const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks; +- nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks); ++ nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks); + + // remove as much as possible + if (nBlocksThisPass > 0) +@@ -182,7 +182,7 @@ + + int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME); + int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks; +- int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft); ++ int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft); + + // start the frame if we need to + if (nFrameOffsetBlocks == 0) +--- mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp.old 2016-09-18 21:47:16.972925909 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp 2016-09-18 21:52:39.022779503 -0400 +@@ -193,7 +193,7 @@ + nBytesRead = 1; + while ((nBytesLeft > 0) && (nBytesRead > 0)) + { +- int nBytesToRead = min(16384, nBytesLeft); ++ int nBytesToRead = min_macro(16384, nBytesLeft); + if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS) + return ERROR_IO_READ; + +--- mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp.old 2016-09-18 21:55:53.331533348 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp 2016-09-18 21:58:21.508345586 -0400 +@@ -16,7 +16,7 @@ + memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16)); + + // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated) +- m_nFieldValueBytes = max(nFieldBytes, 0); ++ m_nFieldValueBytes = max_macro(nFieldBytes, 0); + m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE); + memset(m_spFieldValue, 0, m_nFieldValueBytes + 2); + if (m_nFieldValueBytes > 0) +--- mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp.old 2016-09-18 21:53:24.090030009 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp 2016-09-18 22:00:13.500083252 -0400 +@@ -113,7 +113,7 @@ + m_nCurrentBitIndex = (m_nCurrentBitIndex & 31); + + // zero the rest of the memory (may not need the +1 because of frame byte alignment) +- memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); ++ memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); + } + + // return a success +@@ -247,7 +247,7 @@ + BitArrayState.k++; + + // figure the pivot value +- int nPivotValue = max(nOriginalKSum / 32, 1); ++ int nPivotValue = max_macro(nOriginalKSum / 32, 1); + int nOverflow = nEncode / nPivotValue; + int nBase = nEncode - (nOverflow * nPivotValue); + +--- mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp.old 2016-09-18 21:56:44.606337012 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp 2016-09-18 21:59:55.854310134 -0400 +@@ -35,7 +35,7 @@ + m_nCurrentStep = nCurrentStep; + + // figure the percentage done +- float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1)); ++ float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1)); + int nPercentageDone = (int) (fPercentageDone * 1000 * 100); + if (nPercentageDone > 100000) nPercentageDone = 100000; + +--- mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp.old 2016-09-18 21:56:29.974394222 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp 2016-09-18 21:59:28.214726465 -0400 +@@ -177,9 +177,9 @@ + + if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; } + if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; } +- if (max(LPeak, RPeak) > *pPeakLevel) ++ if (max_macro(LPeak, RPeak) > *pPeakLevel) + { +- *pPeakLevel = max(LPeak, RPeak); ++ *pPeakLevel = max_macro(LPeak, RPeak); + } + + // check for pseudo-stereo files +--- mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp.old 2016-09-18 21:56:16.548445898 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp 2016-09-18 21:58:56.148161050 -0400 +@@ -110,7 +110,7 @@ + if (m_nVersion >= 3990) + { + // figure the pivot value +- int nPivotValue = max(BitArrayState.nKSum / 32, 1); ++ int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1); + + // get the overflow + int nOverflow = 0; diff --git a/audio/mac/mac.SlackBuild b/audio/mac/mac.SlackBuild index 644f31dcc5..1590f769d4 100644 --- a/audio/mac/mac.SlackBuild +++ b/audio/mac/mac.SlackBuild @@ -41,9 +41,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-u4-b5 -tar xvf $CWD/$PRGNAM-$VERSION-u4-b5.tar.gz -cd $PRGNAM-$VERSION-u4-b5 +rm -rf $PRGNAM-$VERSION-u4-b5-s7 +tar xvf $CWD/$PRGNAM-$VERSION-u4-b5-s7.tar.gz +cd $PRGNAM-$VERSION-u4-b5-s7 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -51,6 +51,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -61,9 +63,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-assembly=yes \ --build=$ARCH-slackware-linux -# Patch to fix gcc4 output errors: -patch -p0 < $CWD/gcc4_errors.patch - make make install DESTDIR=$PKG diff --git a/audio/mac/mac.info b/audio/mac/mac.info index 7e21a2e6b4..2eb81bf1b7 100644 --- a/audio/mac/mac.info +++ b/audio/mac/mac.info @@ -1,8 +1,8 @@ PRGNAM="mac" VERSION="3.99" HOMEPAGE="https://web.archive.org/web/20120529111247/http://supermmx.org/linux/mac" -DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5/mac-3.99-u4-b5.tar.gz" -MD5SUM="75716b342e07deae58f56a2522362006" +DOWNLOAD="http://etree.org/shnutils/shntool/support/formats/ape/unix/3.99-u4-b5-s7/mac-3.99-u4-b5-s7.tar.gz" +MD5SUM="74df3c96476636387ddd12255b03bebe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/milkytracker/README b/audio/milkytracker/README index f16c7e8551..b940d275bb 100644 --- a/audio/milkytracker/README +++ b/audio/milkytracker/README @@ -1,5 +1,4 @@ This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create standard .MOD and .XM module files. -JACK support is optional and can be added by doing: - JACK=yes ./milkytracker.SlackBuild +lhasa is an optional dependency. diff --git a/audio/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild index 7f6841c8f1..f5b9189d03 100644 --- a/audio/milkytracker/milkytracker.SlackBuild +++ b/audio/milkytracker/milkytracker.SlackBuild @@ -24,13 +24,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=milkytracker -VERSION=${VERSION:-0.90.86} +SRCNAM=MilkyTracker +VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +42,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,34 +61,39 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 \ - \( -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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -lasound" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --with-jack=${JACK:-no} +# From upstream +patch -p1 < $CWD/patches/gnuinstalldirs.patch +# Thanks fedora +patch -p1 < $CWD/patches/sdlmain.patch -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 \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + make install DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/share/{applications,pixmaps} cp $CWD/milkytracker.desktop $PKG/usr/share/applications cp resources/pictures/carton.png $PKG/usr/share/pixmaps/milkytracker-icon-128.png -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info index cdab01e8f0..1ae6e90182 100644 --- a/audio/milkytracker/milkytracker.info +++ b/audio/milkytracker/milkytracker.info @@ -1,10 +1,10 @@ PRGNAM="milkytracker" -VERSION="0.90.86" +VERSION="1.0.0" HOMEPAGE="http://www.milkytracker.org/" -DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2" -MD5SUM="1ef462969cf54ba61748d4d878b5747e" +DOWNLOAD="https://github.com/milkytracker/MilkyTracker/archive/v1.0.0/milkytracker-1.0.0.tar.gz" +MD5SUM="ba6840d3725f805c409f78061f48c319" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zziplib" +REQUIRES="jack-audio-connection-kit zziplib" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/audio/milkytracker/patches/gnuinstalldirs.patch b/audio/milkytracker/patches/gnuinstalldirs.patch new file mode 100644 index 0000000000..aeae02af2b --- /dev/null +++ b/audio/milkytracker/patches/gnuinstalldirs.patch @@ -0,0 +1,71 @@ +From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sun, 7 May 2017 10:49:21 +0200 +Subject: [PATCH] Use GNUInstallDirs in order to change installation paths + +* This allows distro-specific modification of directories + to adjust to different FHS layouts. +--- + CMakeLists.txt | 5 ++++- + docs/CMakeLists.txt | 2 +- + resources/music/CMakeLists.txt | 2 +- + src/tracker/CMakeLists.txt | 2 +- + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 996e2f0..bac54f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,9 +19,12 @@ + # along with MilkyTracker. If not, see <http://www.gnu.org/licenses/>. + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.5) + project(MilkyTracker) + ++# Adhere to GNU filesystem layout conventions ++include(GNUInstallDirs) ++ + # Force SDL if requested + option(FORCESDL "Force SDL instead of native" OFF) + if(FORCESDL) +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 0aacc60..aca4a61 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -35,7 +35,7 @@ elseif(WIN32) + set(INSTALL_DEST .) + else() + list(APPEND DOCUMENTS readme_unix) +- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER}) ++ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR}) + endif() + + install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST}) +diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt +index f918b6e..f29fcd6 100644 +--- a/resources/music/CMakeLists.txt ++++ b/resources/music/CMakeLists.txt +@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm") + if(APPLE OR WIN32) + set(INSTALL_DEST "Example Songs") + else() +- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs) ++ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs) + endif() + + install(FILES ${SONGS} DESTINATION ${INSTALL_DEST}) +diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt +index 1e4062e..b7a96a7 100644 +--- a/src/tracker/CMakeLists.txt ++++ b/src/tracker/CMakeLists.txt +@@ -399,7 +399,7 @@ target_link_libraries( + if(APPLE OR WIN32) + set(INSTALL_DEST .) + else() +- set(INSTALL_DEST bin) ++ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR}) + endif() + + install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST}) diff --git a/audio/milkytracker/patches/sdlmain.patch b/audio/milkytracker/patches/sdlmain.patch new file mode 100644 index 0000000000..3917a062d6 --- /dev/null +++ b/audio/milkytracker/patches/sdlmain.patch @@ -0,0 +1,12 @@ +diff -ru MilkyTracker-1.0.0/cmake/FindSDL2.cmake MilkyTracker-sdlmain/cmake/FindSDL2.cmake +--- MilkyTracker-1.0.0/cmake/FindSDL2.cmake 2017-03-12 21:30:25.000000000 +0200 ++++ MilkyTracker-sdlmain/cmake/FindSDL2.cmake 2017-03-19 20:23:15.773398294 +0200 +@@ -93,7 +93,7 @@ + endif() + + set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) ++set(SDL2_LIBRARIES ${SDL2_LIBRARY}) + + include(FindPackageHandleStandardArgs) + diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index 4ee8066b9c..3c5a938a60 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -22,6 +22,8 @@ # 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 + PRGNAM=mixxx VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-2} @@ -29,7 +31,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i5486" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -66,13 +68,22 @@ tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.gz cd $PRGNAM-$SRCVER 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 {} \; + +# Patch for the newer scons +patch -p1 < $CWD/patches/scons-3.0.0.patch # Upstream patch for the newer chromaprint -patch -p1 < $CWD/chromaprint-1.4.patch +patch -p1 < $CWD/patches/chromaprint-1.4.patch + +# Fix for the newer gccs +patch -p1 < $CWD/patches/mixxx-2.0.0-gcc-6.patch + +# Fix for sqlite +patch -p1 < $CWD/patches/mixxx-remove-sqlite-typedef.patch # Fix library installation path sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1 @@ -83,17 +94,21 @@ QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ scons \ shoutcast=1 \ faad=1 \ + opus=1 \ + build=release \ + optimize=portable \ + virtualize=0 \ + localecompare=1 \ + qt_sqlite_plugin=0 \ prefix=/usr QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ scons \ install_root=$PKG/usr \ prefix=/usr \ - shoutcast=1 \ - faad=1 \ install -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir $PKG/usr/doc diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info index b332a332b3..e93ca14b90 100644 --- a/audio/mixxx/mixxx.info +++ b/audio/mixxx/mixxx.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz" MD5SUM="5520a2f110f1078197d2ff914ccca37a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband" +REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr opusfile portaudio portmidi protobuf rubberband" MAINTAINER="Elvio Basello (HelLViS69)" EMAIL="hellvis69@gmail.com" diff --git a/audio/mixxx/chromaprint-1.4.patch b/audio/mixxx/patches/chromaprint-1.4.patch index 35e63d2c5f..35e63d2c5f 100644 --- a/audio/mixxx/chromaprint-1.4.patch +++ b/audio/mixxx/patches/chromaprint-1.4.patch diff --git a/audio/mixxx/patches/mixxx-2.0.0-gcc-6.patch b/audio/mixxx/patches/mixxx-2.0.0-gcc-6.patch new file mode 100644 index 0000000000..f56a54817f --- /dev/null +++ b/audio/mixxx/patches/mixxx-2.0.0-gcc-6.patch @@ -0,0 +1,17 @@ +--- ./src/util/math.h.orig 2016-07-14 04:13:22.861482580 +0100 ++++ ./src/util/math.h 2016-07-14 04:15:36.966067224 +0100 +@@ -4,7 +4,13 @@ + // Causes MSVC to define M_PI and friends. + // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx + #define _USE_MATH_DEFINES +-#include <cmath> ++#include <math.h> ++#include <cmath> ++// Note: Because of our fpclassify hack, we actualy need to inlude both, ++// the c and the c++ version of the math header. ++// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included ++// after our fpclassify hack ++ + #include <algorithm> + + #include "util/assert.h" diff --git a/audio/mixxx/patches/mixxx-remove-sqlite-typedef.patch b/audio/mixxx/patches/mixxx-remove-sqlite-typedef.patch new file mode 100644 index 0000000000..b29b255595 --- /dev/null +++ b/audio/mixxx/patches/mixxx-remove-sqlite-typedef.patch @@ -0,0 +1,27 @@ +--- a/src/library/trackcollection.cpp ++++ b/src/library/trackcollection.cpp +@@ -2,10 +2,6 @@ + #include <QtDebug> + + #include "library/trackcollection.h" +- +-#ifdef __SQLITE3__ +-#include <sqlite3.h> +-#endif + + #include "library/librarytablemodel.h" + #include "library/schemamanager.h" + +--- a/src/library/trackcollection.h ++++ b/src/library/trackcollection.h +@@ -34,8 +34,7 @@ + #include "library/dao/libraryhashdao.h" + + #ifdef __SQLITE3__ +-typedef struct sqlite3_context sqlite3_context; +-typedef struct Mem sqlite3_value; ++#include <sqlite3.h> + #endif + + class TrackInfoObject; + diff --git a/audio/mixxx/patches/scons-3.0.0.patch b/audio/mixxx/patches/scons-3.0.0.patch new file mode 100644 index 0000000000..8694340e9e --- /dev/null +++ b/audio/mixxx/patches/scons-3.0.0.patch @@ -0,0 +1,378 @@ +Patch for mix-2.0.0 to build with changes in syntax of scons-3.0.0 + +Matteo Bernardini <ponce@slackbuilds.org> + +diff -Naur mixxx-2.0.0.orig/plugins/soundsourcem4a/SConscript mixxx-2.0.0/plugins/soundsourcem4a/SConscript +--- mixxx-2.0.0.orig/plugins/soundsourcem4a/SConscript 2015-12-29 17:10:41.000000000 +0100 ++++ mixxx-2.0.0/plugins/soundsourcem4a/SConscript 2017-10-28 21:48:54.154313241 +0200 +@@ -47,7 +47,7 @@ + + if have_faad_26: + env.Append(CPPDEFINES = '__M4AHACK__') +- print "libfaad 2.6 compatibility mode... enabled" ++ print ("libfaad 2.6 compatibility mode... enabled") + if have_mp4v2_h: + env.Append(CPPDEFINES = '__MP4V2__') + +diff -Naur mixxx-2.0.0.orig/src/SConscript mixxx-2.0.0/src/SConscript +--- mixxx-2.0.0.orig/src/SConscript 2015-12-29 17:10:41.000000000 +0100 ++++ mixxx-2.0.0/src/SConscript 2017-10-28 22:11:00.133348147 +0200 +@@ -15,8 +15,8 @@ + branch_name = util.get_branch_name() + vcs_revision = util.get_revision() + vcs_name = util.get_current_vcs() +-print "WE ARE IN:", os.getcwd() +-print "Building ", branch_name, " - rev.", vcs_revision ++print ("WE ARE IN:", os.getcwd()) ++print ("Building ", branch_name, " - rev.", vcs_revision) + + plugins = [] + +@@ -114,15 +114,15 @@ + def run_tests(): + ret = Execute("./mixxx-test") + if ret != 0: +- print "WARNING: Not all tests pass. See mixxx-test output." ++ print ("WARNING: Not all tests pass. See mixxx-test output.") + Exit(ret) + + if int(build.flags['test']): +- print "Building tests." ++ print ("Building tests.") + build_tests() + + if 'test' in BUILD_TARGETS: +- print "Running tests." ++ print ("Running tests.") + run_tests() + + def construct_version(build, mixxx_version, branch_name, vcs_revision): +@@ -284,7 +284,7 @@ + if build.platform_is_linux or build.platform_is_bsd: + flags['prefix'] = ARGUMENTS.get('prefix', '/usr/local') + if not os.path.exists(flags['prefix']): +- print "Error: Prefix path does not exist!" ++ print ("Error: Prefix path does not exist!") + Exit(1) + else: + #install_root is used in Debian/Ubuntu packaging (check the debian/rules file in the Ubuntu package) +@@ -292,7 +292,7 @@ + #building a Debian package, pbuilder wants to install Mixxx to a temporary directory, but you still need + #the compiled-in strings using /usr as the prefix. That's why we have install_root and flags['prefix']. + install_root = ARGUMENTS.get('install_root', flags['prefix']) +- print "Install root: " + install_root ++ print ("Install root: " + install_root) + unix_share_path = os.path.join(install_root, + env.get('SHAREDIR', default='share')) + unix_bin_path = os.path.join(install_root, +@@ -549,54 +549,46 @@ + return program_location + + def BuildRelease(target, source, env): +- print +- print "==== Mixxx Post-Build Checks ====" +- print +- print "You have built version %s" % mixxx_version +- print ++ print ("==== Mixxx Post-Build Checks ====") ++ print ("You have built version %s" % mixxx_version) + if build.build_is_debug: +- print "YOU ARE ABOUT TO PACKAGE A DEBUG BUILD!!" +- print +- print "Binary has size ", ++ print ("YOU ARE ABOUT TO PACKAGE A DEBUG BUILD!!") ++ print ("Binary has size ") + if build.platform_is_windows: + os.system('for %I in ('+dist_dir+'\mixxx.exe) do @echo %~zI') + else: + os.system('ls -lh '+dist_dir+'/mixxx.exe | cut -d \' \' -f 5') +- print +- print "Installer file ", ++ print ("Installer file ") + package_name = 'mixxx' + + package_version = construct_version(build, mixxx_version, branch_name, + vcs_revision) + arch = "x64" if build.machine_is_64bit else "x86" + exe_name = '%s-%s-%s.exe' % (package_name, package_version, arch) +- print exe_name +- print +- print "Top line of README, check version:" ++ print (exe_name) ++ print ("Top line of README, check version:") + if build.platform_is_windows: + os.system('for /l %l in (1,1,1) do @for /f "tokens=1,2* delims=:" %a in (\'findstr /n /r "^" README ^| findstr /r "^%l:"\') do @echo %b') + else: + os.system('head -n 1 README') +- print +- print "Top 2 lines of LICENSE, check version and copyright dates:" ++ print ("Top 2 lines of LICENSE, check version and copyright dates:") + if build.platform_is_windows: + os.system('for /l %l in (1,1,2) do @for /f "tokens=1,2* delims=:" %a in (\'findstr /n /r "^" LICENSE ^| findstr /r "^%l:"\') do @echo %b') + else: + os.system('head -n 2 LICENSE') +- print + #if (raw_input("Go ahead and build installer (yes/[no])? ") == "yes"): + if True: + # TODO(XXX): Installing a runtime isn't specific to MSVS? + if build.toolchain_is_msvs: + redist_file = 'vcredist_%s.exe' % arch +- print "Searching for the Visual C++ DLL installer package", redist_file ++ print ("Searching for the Visual C++ DLL installer package", redist_file) + # Check for the runtime installer in the winlib root. + redist_path = '%s' % os.path.join(mixxx_winlib_path, redist_file) +- print " ", redist_path, ++ print (" ", redist_path) + if not os.path.isfile(redist_path): + raise Exception('Could not find the MSVC++ runtime installer.') + +- print "Now building installation package..." ++ print ("Now building installation package...") + command_flag = None + nsis_path = None + if not build.crosscompile and build.platform_is_windows: +@@ -608,7 +600,7 @@ + command_flag = '-' + + if not nsis_path: +- print "Cannot find NSIS. Do you have it installed?" ++ print ("Cannot find NSIS. Do you have it installed?") + else: + # Call the NSIS build + buildwin64 = "/Dx64=1" if build.machine_is_64bit else '' +@@ -619,10 +611,10 @@ + 'qtpath': build.env['QTDIR'], + 'winlibpath': mixxx_winlib_path, + '64bit': buildwin64} +- print "Using command: " + command ++ print ("Using command: " + command) + subprocess.check_call(command) + else: +- print "Aborted building installer" ++ print ("Aborted building installer") + + # Do release things + versionbld = Builder(action = BuildRelease, suffix = '.foo', src_suffix = '.bar') +@@ -661,31 +653,23 @@ + # Build the Ubuntu package + def BuildUbuntuPackage(target, source, env): + global mixxx_version +- print +- print "==== Mixxx Post-Build Checks ====" +- print +- print "You have built version ", mixxx_version +- print +- print +- print "Top line of README, check version:" ++ print ("==== Mixxx Post-Build Checks ====") ++ print ("You have built version ", mixxx_version) ++ print ("Top line of README, check version:") + os.system('head -n 1 README') +- print +- print "Top 2 lines of LICENSE, check version and copyright dates:" ++ print ("Top 2 lines of LICENSE, check version and copyright dates:") + os.system('head -n 2 LICENSE') +- print +- print "Top line of debian/ubuntu changelog, check version:" ++ print ("Top line of debian/ubuntu changelog, check version:") + os.system('head -n 1 build/debian/changelog') +- print + +- print "Now building DEB package..." +- print ++ print ("Now building DEB package...") + + arch = 'amd64' if build.machine_is_64bit else 'i386' + + package_target = ARGUMENTS.get('package', None) + ubuntu_distros = ARGUMENTS.get('ubuntu_dist', None) + if ubuntu_distros is None: +- print "You did not specify an Ubuntu distribution to target. Specify one with the ubuntu_dist flag." ++ print ("You did not specify an Ubuntu distribution to target. Specify one with the ubuntu_dist flag.") + # TODO(XXX) default to their current distro? the .pbuilderrc does this + return + ubuntu_version = ARGUMENTS.get('ubuntu_version', '0ubuntu1') +@@ -717,23 +701,16 @@ + + build_dir = os.path.join('ubuntu', mixxx_dir) + +- if os.path.exists(build_dir): +- print "* Cleaning up %s (cwd: %s)" % (build_dir, os.getcwd()) +- print +- os.system('rm -rf %s' % build_dir) # be careful. +- + # TODO: make a get flags arg to accept a revision which can override this and checkout of a specific SVN rev for the package + + # Export the source folder +- print "* Exporting source folder from current workspace (%s rev: %s)" % (vcs_name, +- vcs_revision) +- print ++ print ("* Exporting source folder from current workspace (%s rev: %s)" % (vcs_name, ++ vcs_revision)) + util.export_source('.', build_dir) + + # Copy a patch to be included in the exported build sources (this can also be something like src/SConscript, /build/debian/rules) + if os.path.exists('post-export-patch'): +- print "* Applying post export patch" +- print ++ print ("* Applying post export patch") + os.system('cp --dereference -r post-export-patch/* %s' % build_dir) + + # Write a build.h to the exported directory. Later code looks for a +@@ -744,15 +721,13 @@ + os.chdir('ubuntu') + + # Tar the source code +- print "* Tarring source directory to '%s' ... (this can take a couple minutes)" % os.path.join(os.getcwd(), mixxx_tarball) +- print ++ print ("* Tarring source directory to '%s' ... (this can take a couple minutes)" % os.path.join(os.getcwd(), mixxx_tarball)) + os.system('rm -f "%s"' % mixxx_tarball) #Remove old tarball + os.system('tar --exclude build/debian --exclude=debian --exclude=debian/* -czf "%s" %s' % (mixxx_tarball, mixxx_dir)) + + os.chdir(mixxx_dir) + # Copy the debian folder from /build/debian to exported source folder root +- print "* Copying Debian build directory from build/debian to debian (cwd: %s)" % os.getcwd() +- print ++ print ("* Copying Debian build directory from build/debian to debian (cwd: %s)" % os.getcwd()) + os.system('cp -r build/debian .') + os.system('cp res/linux/mixxx.usb.rules ./debian/mixxx.mixxx-usb.udev') + +@@ -790,8 +765,7 @@ + author="RJ Ryan <rryan@mixxx.org>") + + # Run pbuilder +- print "* Starting pbuilder ... (cwd: %s)" % os.getcwd() +- print ++ print ("* Starting pbuilder ... (cwd: %s)" % os.getcwd()) + + command = ["MIXXX_BUILD=%s" % build.build, + "ARCH=%s" % arch, +@@ -809,11 +783,9 @@ + if package_target == 'source': + if result == 0: + # TODO(rryan) check it actually succeeded +- print "* Done! Signed source package is in ubuntu/" +- print ++ print ("* Done! Signed source package is in ubuntu/") + else: +- print "* Build failed." +- print ++ print ("* Build failed.") + else: + result_path = "/var/cache/pbuilder/%s-%s/result/" % (ubuntu_distro, arch) + result_filename = "%s_%s_%s.deb" % (package_name, package_version, arch) +@@ -843,27 +815,18 @@ + shutil.move(source_tar_file, dest_tar_file) + + if result == 0 and os.path.exists(result_file): +- print "Done! Package and tarballs are in %s" % result_path +- print "* Found package at '%s'. Copying to ubuntu/" % result_file +- print ++ print ("Done! Package and tarballs are in %s" % result_path) ++ print ("* Found package at '%s'. Copying to ubuntu/" % result_file) + shutil.copyfile(result_file, dest_deb_file) + else: +- print "* Build failed." +- print ++ print ("* Build failed.") + + # print "Signing the .deb changes file..." + # os.system('sudo debsign /var/cache/pbuilder/result/*.changes') + +- if ubuntu_ppa is not None: +- # dput this changes file to the PPA +- dput_command = 'dput %s ../%s_%s_source.changes' % (ubuntu_ppa, package_name, package_version) +- print "* Uploading package for", ubuntu_distro, "to launchpad:", dput_command +- os.system(dput_command) +- + # Return back to the starting directory, otherwise you'll get a .sconsign.dblite error! + os.chdir('../..') +- print "* Returning to starting working directory ... (cwd: " + os.getcwd() + ")" +- print ++ print ("* Returning to starting working directory ... (cwd: " + os.getcwd() + ")") + + #Build the Ubuntu package if "makeubuntu" was passed as an argument + versiondebbld = Builder(action = BuildUbuntuPackage) #, suffix = '.foo', src_suffix = '.bar') +diff -Naur mixxx-2.0.0.orig/src/SConscript.env mixxx-2.0.0/src/SConscript.env +--- mixxx-2.0.0.orig/src/SConscript.env 2015-12-29 17:10:41.000000000 +0100 ++++ mixxx-2.0.0/src/SConscript.env 2017-10-28 21:37:47.023295680 +0200 +@@ -17,7 +17,7 @@ + # Check for old build.h file and delete it if it exists + defs = str(SCons.Script.File('#src/build.h')) + if os.path.exists(defs): +- print "Deleting deprecated build file: %s" % defs ++ print ("Deleting deprecated build file: %s" % defs) + os.remove(defs) + + #env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun +@@ -61,7 +61,7 @@ + dependency = dependency_class() + + try: +- print "Configuring %s" % dependency.name ++ print ("Configuring %s" % dependency.name) + dependency.configure(build, conf) + except Exception, e: + logging.error("Unmet dependency: %s" % e) +@@ -73,7 +73,7 @@ + + for feature in available_features: + try: +- print "Configuring %s" % feature.name ++ print ("Configuring %s" % feature.name) + feature.configure(build, conf) + + # Only process the feature's dependencies if it's enabled +@@ -106,7 +106,7 @@ + #=================================================== + + # Print feature summary +-print "\nFeatures Summary:\n================" ++print ("\nFeatures Summary:\n================") + + for feature in available_features: + message = "Enabled" if feature.enabled(build) else "Disabled" +@@ -115,7 +115,7 @@ + if len(feature.status) > 0: + message = "%s" % feature.status + +- print "%035s... %s" % (feature.description(), message) ++ print ("%035s... %s" % (feature.description(), message)) + + build_flags = ' '.join(sorted( + [('%s=%s' % (k,v) if v is not None else k) for k,v in build.flags.iteritems() if v is not None])) +@@ -163,20 +163,20 @@ + + # Print the build flags (useful if the flags have been cached, ie. if you just run "scons" + # and want to see the flags that you used last time) +-print "================" +-print "Building with flags: %s" % build_flags +-print "Building with CC: %s" % env['CC'] +-print "Building with CXX: %s" % env['CXX'] +-print "Building with CCFLAGS: %s" % env['CCFLAGS'] +-print "Building with CPPDEFINES: %s" % ' '.join(['-D'+'='.join(pair) if not isinstance(pair, basestring) else '-D'+pair for pair in env['CPPDEFINES']]) +-print "Building with CXXFLAGS: %s" % env['CXXFLAGS'] +-print "Building with LINKFLAGS: %s" % env['LINKFLAGS'] +-print "Building with LIBS: %s" % ' '.join(env['LIBS']) +-print "Building with PATH: %s" % env['ENV']['PATH'] ++print ("================") ++print ("Building with flags: %s" % build_flags) ++print ("Building with CC: %s" % env['CC']) ++print ("Building with CXX: %s" % env['CXX']) ++print ("Building with CCFLAGS: %s" % env['CCFLAGS']) ++print ("Building with CPPDEFINES: %s" % ' '.join(['-D'+'='.join(pair) if not isinstance(pair, basestring) else '-D'+pair for pair in env['CPPDEFINES']])) ++print ("Building with CXXFLAGS: %s" % env['CXXFLAGS']) ++print ("Building with LINKFLAGS: %s" % env['LINKFLAGS']) ++print ("Building with LIBS: %s" % ' '.join(env['LIBS'])) ++print ("Building with PATH: %s" % env['ENV']['PATH']) + if build.platform_is_windows: +- print "Building with INCLUDE: %s" % env['ENV']['INCLUDE'] +- print "Building with LIB: %s" % env['ENV']['LIB'] +- print "Building with LIBPATH: %s" % env['ENV']['LIBPATH'] +-print "================\n" ++ print ("Building with INCLUDE: %s" % env['ENV']['INCLUDE']) ++ print ("Building with LIB: %s" % env['ENV']['LIB']) ++ print ("Building with LIBPATH: %s" % env['ENV']['LIBPATH']) ++print ("================\n") + + Export('sources') diff --git a/audio/muse/README b/audio/muse/README index 232eb66968..9930502f1b 100644 --- a/audio/muse/README +++ b/audio/muse/README @@ -4,6 +4,10 @@ the MusE development team. MusE aims to be a complete multitrack virtual studio for Linux, it is published under the GNU General Public License. -Optional dependencies are fluidsynth, dssi and lash. +Optional dependencies are fluidsynth, lash and lilv. To start MusE, the user has to be in the "audio" group. + +NOTE: it seems like native vst support is broken on x86 so we +disable it on this platform: vst plugins on x86 can still be used +through the optional dependency dssi-vst. diff --git a/audio/muse/muse.SlackBuild b/audio/muse/muse.SlackBuild index 833fd3ba30..90dffd9086 100644 --- a/audio/muse/muse.SlackBuild +++ b/audio/muse/muse.SlackBuild @@ -5,13 +5,13 @@ # Written by Felix Pfeifer pfeifer[dot]felix[at]googlemail[dot]com PRGNAM=muse -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-3.0pre2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,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" @@ -36,6 +36,9 @@ else LIBDIRSUFFIX="" fi +native_vst="" +[ "$ARCH" = "i586" ] && native_vst="-DENABLE_VST_NATIVE=0 -DENABLE_VST_VESTIGE=0" + set -e rm -rf $PKG @@ -46,19 +49,21 @@ 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 {} \; +echo $native_vst mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_PYTHON:STRING="ON" \ + $native_vst \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/audio/muse/muse.info b/audio/muse/muse.info index f72af27286..c4baf66135 100644 --- a/audio/muse/muse.info +++ b/audio/muse/muse.info @@ -1,10 +1,10 @@ PRGNAM="muse" -VERSION="2.1.2" +VERSION="3.0pre2" HOMEPAGE="http://muse-sequencer.org/" -DOWNLOAD="http://downloads.sf.net/lmuse/muse-2.1.2.tar.gz" -MD5SUM="ad917335ac05a3d62e3cd073af901001" +DOWNLOAD="http://downloads.sf.net/lmuse/muse-3.0pre2.tar.gz" +MD5SUM="9737152b13ff90959507890ed1491bfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jack-audio-connection-kit ladspa_sdk liblo" +REQUIRES="dssi jack-audio-connection-kit ladspa_sdk liblo qt5" MAINTAINER="Felix Pfeifer" EMAIL="pfeifer[dot]felix[at]googlemail[dot]com" diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild index 523d4638c8..4351552662 100644 --- a/audio/ocp/ocp.SlackBuild +++ b/audio/ocp/ocp.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed -i "s/0.1.20/0.1.21/g" configure -sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)" configure +sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7.*)" configure CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/audio/pianobar/pianobar.info b/audio/pianobar/pianobar.info index 78512f2461..3c5c23b2f2 100644 --- a/audio/pianobar/pianobar.info +++ b/audio/pianobar/pianobar.info @@ -5,6 +5,6 @@ DOWNLOAD="https://6xq.net/pianobar/pianobar-2017.08.30.tar.bz2" MD5SUM="2af4ad10af1e11a8f3cace474320ca4a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ffmpeg" +REQUIRES="ffmpeg json-c" MAINTAINER="Brenton Earl" EMAIL="brent@exitstatusone.com" diff --git a/audio/pithos/doinst.sh b/audio/pithos/doinst.sh index 4a25de5e6f..e924bab47c 100644 --- a/audio/pithos/doinst.sh +++ b/audio/pithos/doinst.sh @@ -8,3 +8,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/audio/pithos/pithos.SlackBuild b/audio/pithos/pithos.SlackBuild index 32579cffe5..0d7c1f9b1e 100644 --- a/audio/pithos/pithos.SlackBuild +++ b/audio/pithos/pithos.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pithos -# Copyright 2013 Robby Workman, Northport, Alabama, USA +# Copyright 2013,2017 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pithos -VERSION=${VERSION:-git_ed501485} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -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" @@ -61,15 +61,25 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ +chown -R root:root $PRGNAM-$VERSION +find -L $PRGNAM-$VERSION \ \( -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 {} \; -python setup.py install --root=$PKG +mkdir -p $PRGNAM-$VERSION/build +meson \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $PRGNAM-$VERSION \ + $PRGNAM-$VERSION/build + +DESTDIR=$PKG ninja -C $PRGNAM-$VERSION/build install cat $CWD/contrib/pithosctl > $PKG/usr/bin/pithosctl chmod 0755 $PKG/usr/bin/pithosctl @@ -78,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/license $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/pithos/pithos.info b/audio/pithos/pithos.info index c276852bd2..198bec9218 100644 --- a/audio/pithos/pithos.info +++ b/audio/pithos/pithos.info @@ -1,10 +1,10 @@ PRGNAM="pithos" -VERSION="git_ed501485" -HOMEPAGE="http://kevinmehall.net/p/pithos/" -DOWNLOAD="http://harrier.slackbuilds.org/misc/pithos-git_ed501485.tar.xz" -MD5SUM="fb7f45ff93b5aab7b60e5b943d7bb024" +VERSION="1.4.0" +HOMEPAGE="https://github.com/pithos/pithos" +DOWNLOAD="https://github.com/pithos/pithos/releases/download/1.4.0/pithos-1.4.0.tar.xz" +MD5SUM="2324a9ed104682fb2417f662a82cc8bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gst0-python gst0-ffmpeg" +REQUIRES="meson gst-python gst-libav" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/audio/pithos/slack-desc b/audio/pithos/slack-desc index 3ac97f0f7d..c55001e893 100644 --- a/audio/pithos/slack-desc +++ b/audio/pithos/slack-desc @@ -13,7 +13,7 @@ pithos: lightweight than the Pandora.com web client and integrates with pithos: desktop features such as media keys, notifications, and the sound pithos: menu. pithos: -pithos: Homepage: http://kevinmehall.net/p/pithos/ +pithos: Homepage: https://github.com/pithos/pithos pithos: pithos: pithos: diff --git a/audio/rumor/gcc7.diff b/audio/rumor/gcc7.diff new file mode 100644 index 0000000000..a8c54f20c0 --- /dev/null +++ b/audio/rumor/gcc7.diff @@ -0,0 +1,12 @@ +diff -Naur rumor-1.0.5.orig/src/notator.cc rumor-1.0.5.new/src/notator.cc +--- rumor-1.0.5.orig/src/notator.cc 2010-11-15 18:40:22.000000000 +0100 ++++ rumor-1.0.5.new/src/notator.cc 2017-05-31 15:51:42.014855383 +0200 +@@ -334,7 +334,7 @@ + } + } else { + OctaveTic=(RefPitch_wt>AbsPitch_wt?',':'\''); +- NumTics=(abs(RefPitch_wt-AbsPitch_wt)+3)/7; ++ NumTics=(RefPitch_wt-AbsPitch_wt+3)/7; + RefPitch_wt=AbsPitch_wt; + } + for (int i=0; i<NumTics; i++){ diff --git a/audio/rumor/rumor.SlackBuild b/audio/rumor/rumor.SlackBuild index daeebef2b9..d3ee309487 100644 --- a/audio/rumor/rumor.SlackBuild +++ b/audio/rumor/rumor.SlackBuild @@ -49,6 +49,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to archlinux +patch -p1 < $CWD/gcc7.diff + ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/audio/seq24/perfedit.patch b/audio/seq24/perfedit.patch deleted file mode 100644 index 960e6d2bcc..0000000000 --- a/audio/seq24/perfedit.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- seq24/trunk/src/perfedit.cpp.old 2016-01-03 23:30:55.562890265 +0700 -+++ seq24/trunk/src/perfedit.cpp 2016-01-03 23:32:24.958812214 +0700 -@@ -119,7 +119,7 @@ - /* snap */ - m_button_snap = manage( new Button()); - m_button_snap->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( snap_xpm )))); -- m_button_snap->signal_clicked().connect( bind<Menu *>( mem_fun( *this, &perfedit::popup_menu), m_menu_snap )); -+ m_button_snap->signal_clicked().connect( bind<void>( mem_fun( *this, &perfedit::popup_menu), m_menu_snap )); - add_tooltip( m_button_snap, "Grid snap. (Fraction of Measure Length)" ); - m_entry_snap = manage( new Entry()); - m_entry_snap->set_size_request( 40, -1 ); -@@ -152,7 +152,7 @@ - /* beats per measure */ - m_button_bpm = manage( new Button()); - m_button_bpm->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm )))); -- m_button_bpm->signal_clicked().connect( bind<Menu *>( mem_fun( *this, &perfedit::popup_menu), m_menu_bpm )); -+ m_button_bpm->signal_clicked().connect( bind<void>( mem_fun( *this, &perfedit::popup_menu), m_menu_bpm )); - add_tooltip( m_button_bpm, "Time Signature. Beats per Measure" ); - m_entry_bpm = manage( new Entry()); - m_entry_bpm->set_width_chars(2); -@@ -162,7 +162,7 @@ - /* beat width */ - m_button_bw = manage( new Button()); - m_button_bw->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm )))); -- m_button_bw->signal_clicked().connect( bind<Menu *>( mem_fun( *this, &perfedit::popup_menu), m_menu_bw )); -+ m_button_bw->signal_clicked().connect( bind<void>( mem_fun( *this, &perfedit::popup_menu), m_menu_bw )); - add_tooltip( m_button_bw, "Time Signature. Length of Beat" ); - m_entry_bw = manage( new Entry()); - m_entry_bw->set_width_chars(2); diff --git a/audio/seq24/seq24.SlackBuild b/audio/seq24/seq24.SlackBuild index 39df07766b..4b8cf91b27 100644 --- a/audio/seq24/seq24.SlackBuild +++ b/audio/seq24/seq24.SlackBuild @@ -23,13 +23,13 @@ # YOUR DATA IS DESTROYED. PRGNAM=seq24 -VERSION=${VERSION:-rev136} +VERSION=${VERSION:-0.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -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" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM/trunk -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM/trunk +rm -rf $PRGNAM-$VERSION +tar -xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,12 +69,17 @@ 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 {} \; -autoreconf -i - -patch -p2 < $CWD/perfedit.patch +# Thanks to fedora for this: +# class "mutex" in src/* clashes with "std::mutex" due +# to "using namespace std;". Rename mutex to seq24_mutex. +sed -i \ + -e 's,mutex::,seq24_mutex::,' \ + -e 's,\([ cs]\) mutex,\1 seq24_mutex,' \ + -e 's,::mutex,::seq24_mutex,' \ + src/*.h src/*.cpp CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -O2 -std=c++11" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/seq24/seq24.info b/audio/seq24/seq24.info index 7681d18b95..3ebc841eb3 100644 --- a/audio/seq24/seq24.info +++ b/audio/seq24/seq24.info @@ -1,8 +1,8 @@ PRGNAM="seq24" -VERSION="rev136" +VERSION="0.9.3" HOMEPAGE="http://filter24.org/seq24/" -DOWNLOAD="http://master.dl.sourceforge.net/project/slackbuildsdirectlinks/seq24/seq24-rev136.tar.gz" -MD5SUM="e3616365eefa04349773198fec794241" +DOWNLOAD="https://launchpad.net/seq24/trunk/0.9.3/+download/seq24-0.9.3.tar.bz2" +MD5SUM="e7c653abb71f17e5cc070ef1d8406a1a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/shell-fm/README b/audio/shell-fm/README deleted file mode 100644 index fdf6eca651..0000000000 --- a/audio/shell-fm/README +++ /dev/null @@ -1,12 +0,0 @@ -shell-fm is a lightweight, console-based player for Last.FM radio streams. -It's pretty small (the binary is currently a little smaller than 60K, or -50K when stripped) and it has most features the "official" player has, if -not even a few more. Additional features are, for example: - -network interface (control shell-fm remotely) -autoban (automatically ban all tracks of an artist you don't like) -bookmark stations (quickly jump to bookmarked stations with a single key) -... probably more - -*NOTE: Last-FM have changed their API so that only PAID subscribers -can listen to streams in shell-fm. diff --git a/audio/shell-fm/shell-fm.SlackBuild b/audio/shell-fm/shell-fm.SlackBuild deleted file mode 100644 index 6b0a480d55..0000000000 --- a/audio/shell-fm/shell-fm.SlackBuild +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# Slackware build script for shell-fm - -# Copyright 2009-2013 David Woodfall <dave@dawoodfall.net> -# 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. - -PRGNAM=shell-fm -VERSION=${VERSION:-git20130207} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -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.xz -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 {} \; - -LDFLAGS="-lstdc++" \ -make -make 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 - -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 INSTALL AUTHORS RELEASE \ - $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:-tgz} diff --git a/audio/shell-fm/shell-fm.info b/audio/shell-fm/shell-fm.info deleted file mode 100644 index 798592cb54..0000000000 --- a/audio/shell-fm/shell-fm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="shell-fm" -VERSION="git20130207" -HOMEPAGE="https://github.com/jkramer/shell-fm" -DOWNLOAD="http://unrealize.co.uk/source/shell-fm-git20130207.tar.xz" -MD5SUM="56692e9253265ca91dde3081cfd58782" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" diff --git a/audio/shell-fm/slack-desc b/audio/shell-fm/slack-desc deleted file mode 100644 index 3bf0b1a989..0000000000 --- a/audio/shell-fm/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------------------------------------------------------| -shell-fm: shell-fm (a command line last.fm player) -shell-fm: -shell-fm: shell-fm is a lightweight, console-based player for Last.FM radio -shell-fm: streams. It's pretty small (the binary is currently a little smaller -shell-fm: than 60K, or 50K when stripped) and it has most features the -shell-fm: "official" player has, if not even a few more. -shell-fm: -shell-fm: Homepage: https://github.com/jkramer/shell-fm -shell-fm: -shell-fm: -shell-fm: diff --git a/audio/sidplayfp/sidplayfp.SlackBuild b/audio/sidplayfp/sidplayfp.SlackBuild index ae706d48f7..dd201aac7e 100644 --- a/audio/sidplayfp/sidplayfp.SlackBuild +++ b/audio/sidplayfp/sidplayfp.SlackBuild @@ -25,13 +25,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sidplayfp -VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,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/audio/sidplayfp/sidplayfp.info b/audio/sidplayfp/sidplayfp.info index 8c8d1ac6dd..1c16a8fcd7 100644 --- a/audio/sidplayfp/sidplayfp.info +++ b/audio/sidplayfp/sidplayfp.info @@ -1,8 +1,8 @@ PRGNAM="sidplayfp" -VERSION="1.3.0" +VERSION="1.4.3" HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" -DOWNLOAD="https://sourceforge.net/projects/sidplay-residfp/files/sidplayfp/1.3/sidplayfp-1.3.0.tar.gz" -MD5SUM="65ae736d372860223bee9bceb00a3b91" +DOWNLOAD="https://downloads.sourceforge.net/sidplay-residfp/sidplayfp-1.4.3.tar.gz" +MD5SUM="be020b5927c80c4269273895400a8120" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsidplayfp" diff --git a/audio/yoshimi/0001-Fix-for-fltk-1.3.patch b/audio/yoshimi/0001-Fix-for-fltk-1.3.patch deleted file mode 100644 index 22568fcbcf..0000000000 --- a/audio/yoshimi/0001-Fix-for-fltk-1.3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 86532198f0467c6d29090ce7ad95bcb36cd697f6 Mon Sep 17 00:00:00 2001 -From: Andrew Deryabin <andrew@audioplugins.org> -Date: Tue, 3 Feb 2015 06:08:57 +0000 -Subject: [PATCH 1/2] Fix for fltk < 1.3 - ---- - src/main.cpp | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/src/main.cpp b/src/main.cpp -index ab995ad..18a36d2 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -30,6 +30,8 @@ using namespace std; - #include <list> - #include <pthread.h> - #include <semaphore.h> -+#include <cstdio> -+#include <unistd.h> - - #include <FL/Fl.H> - #include <FL/Fl_Window.H> -@@ -97,10 +99,27 @@ static void *mainGuiThread(void *arg) - - map<SynthEngine *, MusicClient *>::iterator it; - fl_register_images(); -+#if (FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION < 3) -+ char *fname = tmpnam(NULL); -+ if(fname) -+ { -+ FILE *f = fopen(fname, "wb"); -+ if(f) -+ { -+ fwrite(yoshimi_logo_png, sizeof(yoshimi_logo_png), 1, f); -+ fclose(f); -+ } -+ } -+ Fl_PNG_Image pix(fname); -+ if(fname) -+ unlink(fname); -+#else -+ Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); -+#endif - Fl_Window winSplash(400, 300, "yoshimi splash screen"); - Fl_Box box(0, 0, 400,300); - //Fl_Pixmap pix(yoshimi_logo); -- Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); -+ - box.image(pix); - Fl_Box boxLb(10, 300-30, 400-20, 30); - boxLb.box(FL_NO_BOX); --- -2.2.2 - diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild index 9108177be7..a5fa58b73b 100644 --- a/audio/yoshimi/yoshimi.SlackBuild +++ b/audio/yoshimi/yoshimi.SlackBuild @@ -5,13 +5,13 @@ # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com> PRGNAM=yoshimi -VERSION=${VERSION:-1.3.2} +VERSION=${VERSION:-1.5.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,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,32 +51,32 @@ 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 {} \; -cat $CWD/0001-Fix-for-fltk-1.3.patch | patch -p1 - -cd src +mkdir src/build +cd src/build # Both "DDefaultAudio/Midi..." lines can be removed for default JACK audio/MIDI cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DDefaultAudio:STRING=alsa \ - -DDefaultMidi:STRING=alsa \ - . + -DCMAKE_BUILD_TYPE=Release \ + .. make VERBOSE=1 make install DESTDIR=$PKG -cd .. +cd ../.. -# Move man pages to correct location -#mv $PKG/usr/share/man $PKG/usr/ +# Move man pages and docs to the correct locations +mv $PKG/usr/share/man $PKG/usr/ +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION +rm -fR $PKG/usr/share/doc 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/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 Changelog COPYING INSTALL README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/yoshimi/yoshimi.info b/audio/yoshimi/yoshimi.info index 6635219915..006befc376 100644 --- a/audio/yoshimi/yoshimi.info +++ b/audio/yoshimi/yoshimi.info @@ -1,8 +1,8 @@ PRGNAM="yoshimi" -VERSION="1.3.2" +VERSION="1.5.2.1" HOMEPAGE="http://yoshimi.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/yoshimi/1.1/yoshimi-1.3.2.tar.bz2" -MD5SUM="48aefa60c1f451b6ea39a4a36583f8ab" +DOWNLOAD="http://downloads.sf.net/yoshimi/yoshimi-1.5.2.1.tar.bz2" +MD5SUM="432e8453334a49dd7b43d5bfae6a02bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mxml fltk lv2 jack-audio-connection-kit" |