diff options
| -rw-r--r-- | audio/seq24/perfedit.patch | 29 | ||||
| -rw-r--r-- | audio/seq24/seq24.SlackBuild | 27 | ||||
| -rw-r--r-- | audio/seq24/seq24.info | 6 |
3 files changed, 19 insertions, 43 deletions
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="" |