rpms / muse

Clone
Source Code
GIT

#3 Rebase to MuSE 4.0
Merged 2 years ago by oget. Opened 3 years ago by ngompa.
rpms/ ngompa/muse rebase-to-4.0  into  rawhide

file modified
+1 
@@ -12,3 +12,4 @@ 
 

  /muse-3.0.tar.gz
 

  /muse-3.0.1.tar.gz
 

  /muse-3.0.2.tar.gz
 

+ /muse-4.0.tar.gz

file removed
-12 
@@ -1,12 +0,0 @@ 
 

- diff -Naur muse-3.0.2-original/CMakeLists.txt muse-3.0.2/CMakeLists.txt
 

- --- muse-3.0.2-original/CMakeLists.txt	2018-01-29 16:10:59.000000000 -0500
 

- +++ muse-3.0.2/CMakeLists.txt	2021-04-17 08:47:47.027195203 -0400
 

- @@ -441,7 +441,7 @@
 

-      ##
 

-      

-      if(ENABLE_LV2_GTK2)
 

- -      find_package(GTK2 COMPONENTS gtk gtkmm)
 

- +      PKG_CHECK_MODULES(GTK2 REQUIRED gtkmm-2.4)
 

-        if(GTK2_FOUND)
 

-            set(HAVE_GTK2 ON)
 

-        endif(GTK2_FOUND)

file removed
-234 
@@ -1,234 +0,0 @@ 
 

- diff -rupN muse-3.0.2.org/synti/fluidsynth/fluidsynti.cpp muse-3.0.2/synti/fluidsynth/fluidsynti.cpp
 

- --- muse-3.0.2.org/synti/fluidsynth/fluidsynti.cpp	2018-01-29 15:07:03.000000000 -0500
 

- +++ muse-3.0.2/synti/fluidsynth/fluidsynti.cpp	2020-02-17 13:14:55.090799740 -0500
 

- @@ -44,6 +44,10 @@
 

-  #include "fluidsynti.h"
 

-  #include "muse/midi_consts.h"
 

-  

- +// fluid_synth_error() is deprecated in 2.0.2 and will cause a compile error.
 

- +#if !(FLUIDSYNTH_VERSION_MAJOR >= 2 && FLUIDSYNTH_VERSION_MINOR >= 0 && FLUIDSYNTH_VERSION_MICRO >= 2)
 

- +#define FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR 1
 

- +#endif
 

-  

-  #ifdef HAVE_INSTPATCH
 

-  #include <libinstpatch/libinstpatch.h>
 

- @@ -152,19 +156,29 @@ FluidSynth::~FluidSynth()
 

-          //Try to unload soundfont
 

-          int err = fluid_synth_sfunload(fluidsynth, it->intid, 0);
 

-          if(err == -1)  

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-            std::cerr << DEBUG_ARGS << "Error unloading soundfont!" << fluid_synth_error(fluidsynth) << std::endl;
 

- +#else
 

- +          std::cerr << DEBUG_ARGS << "Error unloading soundfont! id: " << it->intid << std::endl;
 

- +#endif
 

-        }
 

-          

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-        int err = delete_fluid_synth (fluidsynth);
 

- +#else
 

- +      delete_fluid_synth (fluidsynth);
 

- +#endif
 

-        if(gui)
 

-          delete gui;
 

-  

-        if (initBuffer)
 

-              delete [] initBuffer;
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-        if (err == -1) {
 

-              std::cerr << DEBUG_ARGS << "error while destroying synth: " << fluid_synth_error(fluidsynth) << std::endl;
 

-              return;
 

- -            }            

- +            }
 

- +#endif
 

-        }
 

-  

-  bool FluidSynth::init(const char* name)
 

- @@ -819,13 +833,23 @@ bool FluidSynth::playNote(int channel, i
 

-        if (velo) {
 

-              if (fluid_synth_noteon(fluidsynth, channel, pitch, velo)) {
 

-                    if (FS_DEBUG)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                          std::cerr << DEBUG_ARGS << "error processing noteon event: " << fluid_synth_error(fluidsynth);
 

- +#else                    

- +                        std::cerr << DEBUG_ARGS << "error processing noteon event: channel: "
 

- +                          << channel << " pitch: " << pitch << " velo: " << velo << std::endl;
 

- +#endif
 

-                    }
 

-              }
 

-        else {
 

-              if (fluid_synth_noteoff(fluidsynth, channel, pitch))
 

-                    if (FS_DEBUG)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                          std::cerr << DEBUG_ARGS << "error processing noteoff event: " << fluid_synth_error(fluidsynth) << std::endl;
 

- +#else                    

- +                        std::cerr << DEBUG_ARGS << "error processing noteoff event: channel: "
 

- +                        << channel << " pitch: " << pitch << std::endl;
 

- +#endif
 

-              }
 

-        return false;
 

-        }
 

- @@ -1120,7 +1144,12 @@ void FluidSynth::setController(int chann
 

-                    

-                    err = fluid_synth_program_select(fluidsynth, channel, font_intid , banknum, patch);
 

-                    if (err)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                          printf("FluidSynth::setController() - Error changing program on soundfont %s, channel: %d\n", fluid_synth_error(fluidsynth), channel);
 

- +#else
 

- +                        printf("FluidSynth::setController() - Error changing program on soundfont, channel: %d id: %d banknum: %d patch:%d\n",
 

- +                               channel, font_intid, banknum, patch);
 

- +#endif
 

-                    else {
 

-                          channels[channel].preset = val;//setChannelPreset(val, channel);
 

-                          channels[channel].banknum = banknum;
 

- @@ -1135,7 +1164,11 @@ void FluidSynth::setController(int chann
 

-              }
 

-  

-        if (err)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-              printf ("FluidSynth::setController() - error processing controller event: %s\n", fluid_synth_error(fluidsynth));
 

- +#else
 

- +            printf ("FluidSynth::setController() - error processing controller event, channel: %d, ctrl: %d val: %d\n", channel, id, val);
 

- +#endif
 

-        }
 

-  

-  //---------------------------------------------------------
 

- @@ -1351,7 +1384,12 @@ void FluidSynth::rewriteChannelSettings(
 

-                    || int_id == FS_UNSPECIFIED_ID)) {
 

-                    int rv = fluid_synth_program_select(fluidsynth, i, int_id, banknum, preset);
 

-                    if (rv)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                          std::cerr << DEBUG_ARGS << "Error changing preset! " << fluid_synth_error(fluidsynth) << std::endl;
 

- +#else
 

- +                        std::cerr << DEBUG_ARGS << "Error changing preset! id: "
 

- +                          << int_id << " banknum: " << banknum << " preset: " << preset << std::endl;
 

- +#endif
 

-                    }
 

-              }
 

-        }
 

- @@ -1368,7 +1406,11 @@ const char* FluidSynth::getPatchName(int
 

-        else {
 

-              fluid_preset_t *preset = fluid_synth_get_channel_preset(fluidsynth, i);
 

-              if (!preset) return "<unknown>";
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-              return preset->get_name(preset);
 

- +#else
 

- +            return fluid_preset_get_name(preset);
 

- +#endif
 

-              }
 

-        }
 

-  //---------------------------------------------------------
 

- @@ -1414,12 +1456,20 @@ const MidiPatch* FluidSynth::getFirstPat
 

-        if (!channels[channel].drumchannel) {
 

-              for (unsigned bank = 0; bank < 128; ++bank) {
 

-                    for (unsigned patch = 0; patch < 128; ++patch) {
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                          preset = sfont->get_preset (sfont, bank, patch);
 

- +#else
 

- +                        preset = fluid_sfont_get_preset (sfont, bank, patch);
 

- +#endif
 

-                          if (preset) {
 

-                                midiPatch.hbank = bank;
 

-                                midiPatch.lbank = 0xff;  // Off
 

-                                midiPatch.prog = patch;
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                                midiPatch.name = preset->get_name (preset);
 

- +#else
 

- +                              midiPatch.name = fluid_preset_get_name (preset);
 

- +#endif
 

-                                return &midiPatch;
 

-                                }
 

-                          }
 

- @@ -1429,12 +1479,20 @@ const MidiPatch* FluidSynth::getFirstPat
 

-        else { //This is a drumchannel
 

-              int bank = 128;
 

-              for (unsigned patch = 0; patch < 128; ++patch) {
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                    preset = sfont->get_preset (sfont, bank, patch);
 

- +#else
 

- +                  preset = fluid_sfont_get_preset (sfont, bank, patch);
 

- +#endif
 

-                    if (preset) {
 

-                          midiPatch.hbank = 0xff;  // Off
 

-                          midiPatch.lbank = 0xff;  // Off
 

-                          midiPatch.prog = patch;
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                          midiPatch.name = preset->get_name(preset);
 

- +#else
 

- +                        midiPatch.name = fluid_preset_get_name (preset);
 

- +#endif
 

-                          return &midiPatch;
 

-                          }
 

-                    }
 

- @@ -1466,13 +1524,21 @@ const MidiPatch* FluidSynth::getNextPatc
 

-  

-              for (unsigned bank = patch->hbank; bank < 128; ++bank) {
 

-                    for ( ; prog < 128; ++prog) {
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                          preset = sfont->get_preset (sfont, bank, prog);
 

- +#else
 

- +                        preset = fluid_sfont_get_preset (sfont, bank, prog);
 

- +#endif
 

-                          if (preset) {
 

-                                //printf("Preset info: bank: %d prog: %d name: %s\n", bank, prog, preset->get_name(preset));
 

-                                midiPatch.hbank = bank;
 

-                                midiPatch.lbank = 0xff;  // Off
 

-                                midiPatch.prog = prog;
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                                midiPatch.name = preset->get_name (preset);
 

- +#else
 

- +                              midiPatch.name = fluid_preset_get_name (preset);
 

- +#endif
 

-                                return &midiPatch;
 

-                                }
 

-                          }
 

- @@ -1483,13 +1549,21 @@ const MidiPatch* FluidSynth::getNextPatc
 

-              unsigned bank = 128;
 

-              unsigned prog = patch->prog;
 

-              for (prog = patch->prog + 1; prog < 128; ++prog) {
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                    preset = sfont->get_preset (sfont, bank, prog);
 

- +#else
 

- +                  preset = fluid_sfont_get_preset (sfont, bank, prog);
 

- +#endif
 

-                    if (preset) {
 

-                          //printf("Preset info: bank: %d prog: %d name: %s\n",bank, prog, preset->get_name(preset));
 

-                          midiPatch.hbank = 0xff;  // Off
 

-                          midiPatch.lbank = 0xff;  // Off
 

-                          midiPatch.prog = prog;
 

- +#if FLUIDSYNTH_VERSION_MAJOR < 2
 

-                          midiPatch.name = preset->get_name (preset);
 

- +#else
 

- +                        midiPatch.name = fluid_preset_get_name (preset);
 

- +#endif
 

-                          return &midiPatch;
 

-                          }
 

-                    }
 

- @@ -1539,7 +1613,11 @@ bool FluidSynth::popSoundfont (int ext_i
 

-                 currentlyLoadedFonts--;
 

-              }
 

-           else //OK, there was trouble
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                 std::cerr << DEBUG_ARGS << "Error unloading soundfont!" << fluid_synth_error(fluidsynth) << std::endl;
 

- +#else
 

- +               std::cerr << DEBUG_ARGS << "Error unloading soundfont! id: " << int_id << std::endl;
 

- +#endif
 

-        }
 

-        if (FS_DEBUG)
 

-              printf("Removed soundfont with ext it: %d\n",ext_id);
 

- @@ -1573,10 +1651,15 @@ void LoadFontWorker::execLoadFont(void *
 

-        int rv = fluid_synth_sfload(fptr->fluidsynth, filename, 1);
 

-  

-        if (rv ==-1) {
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-              fptr->sendError(fluid_synth_error(fptr->fluidsynth));
 

- +#endif
 

-              if (FS_DEBUG)
 

- +#ifdef FLUIDSYNTI_HAVE_FLUID_SYNTH_ERROR
 

-                    std::cerr << DEBUG_ARGS << "error loading soundfont: " << fluid_synth_error(fptr->fluidsynth) << std::endl;
 

- -
 

- +#else
 

- +                  std::cerr << DEBUG_ARGS << "error loading soundfont: " << filename << std::endl;
 

- +#endif
 

-              delete h;
 

-              return;
 

-        }

file removed
-23 
@@ -1,23 +0,0 @@ 
 

- diff -rupN muse-3.0.2.org/muse/mplugins/mitplugin.cpp muse-3.0.2/muse/mplugins/mitplugin.cpp
 

- --- muse-3.0.2.org/muse/mplugins/mitplugin.cpp	2017-12-04 16:01:18.000000000 -0500
 

- +++ muse-3.0.2/muse/mplugins/mitplugin.cpp	2018-05-28 11:44:09.880741367 -0400
 

- @@ -21,6 +21,8 @@
 

-  //
 

-  //=========================================================
 

-  

- +#include <QAction>
 

- +
 

-  #include "mitplugin.h"
 

-  #include "app.h"
 

-  #include "event.h"
 

- diff -rupN muse-3.0.2.org/muse/widgets/genset.cpp muse-3.0.2/muse/widgets/genset.cpp
 

- --- muse-3.0.2.org/muse/widgets/genset.cpp	2018-01-22 11:43:28.000000000 -0500
 

- +++ muse-3.0.2/muse/widgets/genset.cpp	2018-05-28 11:26:05.656917314 -0400
 

- @@ -29,6 +29,7 @@
 

-  #include <QRect>
 

-  #include <QShowEvent>
 

-  #include <QString>
 

- +#include <QButtonGroup>
 

-  

-  #include "genset.h"
 

-  #include "app.h"

file removed
-217 
@@ -1,217 +0,0 @@ 
 

- diff --git a/muse3/awl/knob.h b/muse3/awl/knob.h
 

- index 44c7ba48d..22f0d979f 100644
 

- --- a/muse3/awl/knob.h
 

- +++ b/muse3/awl/knob.h
 

- @@ -23,6 +23,12 @@
 

-  #ifndef __AWLKNOB_H__
 

-  #define __AWLKNOB_H__
 

-  

- +#include <QPainterPath>
 

- +#include <QPaintEvent>
 

- +#include <QString>
 

- +#include <QMouseEvent>
 

- +#include <QSize>
 

- +
 

-  #include "aslider.h"
 

-  // #include <QtDesigner/QDesignerExportWidget>
 

-  

- diff --git a/muse3/awl/slider.cpp b/muse3/awl/slider.cpp
 

- index 7d82fde3e..e434b4e35 100644
 

- --- a/muse3/awl/slider.cpp
 

- +++ b/muse3/awl/slider.cpp
 

- @@ -22,7 +22,6 @@
 

-  

-  #include "slider.h"
 

-  

- -#include <QMouseEvent>
 

-  #include <QPainter>
 

-  

-  namespace Awl {
 

- diff --git a/muse3/awl/slider.h b/muse3/awl/slider.h
 

- index 8379ae115..acc738f71 100644
 

- --- a/muse3/awl/slider.h
 

- +++ b/muse3/awl/slider.h
 

- @@ -23,6 +23,13 @@
 

-  #ifndef __AWLSLIDER_H__
 

-  #define __AWLSLIDER_H__
 

-  

- +#include <QPainterPath>
 

- +#include <QPaintEvent>
 

- +#include <QString>
 

- +#include <QMouseEvent>
 

- +#include <QSize>
 

- +#include <QPoint>
 

- +
 

-  #include "aslider.h"
 

-  

-  namespace Awl {
 

- diff --git a/muse3/muse/widgets/meter.cpp b/muse3/muse/widgets/meter.cpp
 

- index 3920e6f68..a5bb75097 100644
 

- --- a/muse3/muse/widgets/meter.cpp
 

- +++ b/muse3/muse/widgets/meter.cpp
 

- @@ -26,9 +26,6 @@
 

-  

-  #include <cmath>
 

-  

- -#include <QMouseEvent>
 

- -#include <QPainter>
 

- -#include <QResizeEvent>
 

-  #include <QVector>
 

-  #include <QLocale>
 

-  #include <algorithm>
 

- diff --git a/muse3/muse/widgets/meter.h b/muse3/muse/widgets/meter.h
 

- index 7de510a45..b08512e41 100644
 

- --- a/muse3/muse/widgets/meter.h
 

- +++ b/muse3/muse/widgets/meter.h
 

- @@ -29,12 +29,10 @@
 

-  

-  #include <QFrame>
 

-  #include <QTimer>
 

- -
 

- -class QResizeEvent;
 

- -class QMouseEvent;
 

- -class QPainter;
 

- -class QPainterPath;
 

- -
 

- +#include <QResizeEvent>
 

- +#include <QMouseEvent>
 

- +#include <QPainter>
 

- +#include <QPainterPath>
 

-  #include <QBitmap>
 

-  

-  #include "sclif.h"
 

- diff --git a/muse3/muse/widgets/slider.cpp b/muse3/muse/widgets/slider.cpp
 

- index 5a0e85c05..c0742ddf1 100644
 

- --- a/muse3/muse/widgets/slider.cpp
 

- +++ b/muse3/muse/widgets/slider.cpp
 

- @@ -25,8 +25,8 @@
 

-  #include <cmath>
 

-  #include "mmath.h"
 

-  

- -#include <QPainter>
 

- -#include <QResizeEvent>
 

- +#include <QPainterPath>
 

- +#include <QMouseEvent>
 

-  

-  #include "utils.h"
 

-  #include "slider.h"
 

- diff --git a/muse3/muse/widgets/slider.h b/muse3/muse/widgets/slider.h
 

- index 6da3085fb..c4a8ba7cf 100644
 

- --- a/muse3/muse/widgets/slider.h
 

- +++ b/muse3/muse/widgets/slider.h
 

- @@ -27,6 +27,18 @@
 

-  #ifndef __SLIDER_H__
 

-  #define __SLIDER_H__
 

-  

- +#include <QWidget>
 

- +#include <QPainter>
 

- +#include <QPaintEvent>
 

- +#include <QString>
 

- +#include <QResizeEvent>
 

- +#include <QSize>
 

- +#include <QPoint>
 

- +#include <QColor>
 

- +#include <QRect>
 

- +#include <QBrush>
 

- +#include <QFont>
 

- +
 

-  #include "sclif.h"
 

-  #include "sliderbase.h"
 

-  #include "scldraw.h"
 

- 

- diff --git a/muse3/muse/widgets/utils.cpp b/muse3/muse/widgets/utils.cpp
 

- index e40d5e145..311352ff9 100644
 

- --- a/muse3/muse/widgets/utils.cpp
 

- +++ b/muse3/muse/widgets/utils.cpp
 

- @@ -27,17 +27,11 @@
 

-  //#include <time.h>
 

-  

-  #include <QApplication>
 

- -#include <QFrame>
 

-  #include <QClipboard>
 

- -#include <QColor>
 

- -#include <QGradient>
 

- -#include <QIcon>
 

-  #include <QLinearGradient>
 

-  #include <QMimeData>
 

-  #include <QPainter>
 

- -#include <QPointF>
 

-  #include <QFileInfo>
 

- -#include <QFont>
 

-  

-  #include "audio.h"
 

-  #include "audiodev.h"
 

- diff --git a/muse3/muse/widgets/utils.h b/muse3/muse/widgets/utils.h
 

- index bded33ab0..cb41748d2 100644
 

- --- a/muse3/muse/widgets/utils.h
 

- +++ b/muse3/muse/widgets/utils.h
 

- @@ -26,15 +26,15 @@
 

-  #define MAX(a,b) (((a)>(b))?(a):(b))
 

-  #define MIN(a,b) (((a)<(b))?(a):(b))
 

-  

- -class QFont;
 

- -class QFrame;
 

- -class QString;
 

- -class QWidget;
 

- -class QGradient;
 

- -class QCanvas;
 

- -class QPointF;
 

- -class QColor;
 

- -class QPainterPath;
 

- +#include <QFont>
 

- +#include <QFrame>
 

- +#include <QString>
 

- +#include <QWidget>
 

- +#include <QGradient>
 

- +#include <QPointF>
 

- +#include <QColor>
 

- +#include <QPainterPath>
 

- +#include <QIcon>
 

-  

-  namespace MusECore {
 

-  

- diff --git a/muse3/muse/midiedit/scoreedit.cpp b/muse3/muse/midiedit/scoreedit.cpp
 

- index b963f3ad8..e9c3aac8f 100644
 

- --- a/muse3/muse/midiedit/scoreedit.cpp
 

- +++ b/muse3/muse/midiedit/scoreedit.cpp
 

- @@ -24,9 +24,7 @@
 

-  #include <QLayout>
 

-  #include <QSizeGrip>
 

-  #include <QLabel>
 

- -#include <QScrollBar>
 

-  #include <QPushButton>
 

- -#include <QToolButton>
 

-  #include <QToolTip>
 

-  #include <QMenu>
 

-  #include <QSignalMapper>
 

- @@ -35,16 +33,14 @@
 

-  #include <QClipboard>
 

-  #include <QDir>
 

-  #include <QKeySequence>
 

- -#include <QKeyEvent>
 

- -#include <QGridLayout>
 

- -#include <QResizeEvent>
 

- -#include <QCloseEvent>
 

-  #include <QMimeData>
 

-  #include <QScrollArea>
 

-  #include <QSettings>
 

-  #include <QImage>
 

-  #include <QInputDialog>
 

-  #include <QMessageBox>
 

- +#include <QTimer>
 

- +#include <QPainterPath>
 

-  

-  #include <stdio.h>
 

-  #include <math.h>
 

- diff --git a/muse3/muse/mixer/routedialog.cpp b/muse3/muse/mixer/routedialog.cpp
 

- index 2e6cf0f09..975b44966 100644
 

- --- a/muse3/muse/mixer/routedialog.cpp
 

- +++ b/muse3/muse/mixer/routedialog.cpp
 

- @@ -35,6 +35,7 @@
 

-  #include <QLayout>
 

-  #include <QFlags>
 

-  #include <QVariant>
 

- +#include <QPainterPath>
 

-  

-  #include "routedialog.h"
 

-  #include "globaldefs.h"

file modified
+29 -41 
@@ -1,40 +1,30 @@ 
 

- %global maj 3.0
 

+ %global majorver 4.0
 

  # No need to provide & require internal libraries
 

  %global _privatelibs libmuse_.*[.]so.*
 

  %global __provides_exclude ^(%{_privatelibs})$
 

  %global __requires_exclude ^(%{_privatelibs})$
 

  %undefine _strict_symbol_defs_build
 

+ %undefine _ld_as_needed
 

+ %undefine _lto_cflags
 

+ 

  

  Name:          muse
 

  Summary:       Midi/Audio Music Sequencer
 

  # Epoch is set to 1 for PlanetCCRMA compatibility.
 

  # See: https://fedoraproject.org/wiki/AudioCreation
 

  Epoch:         1
 

- Version:       3.0.2
 

- Release:       16%{?dist}
 

+ Version:       %{majorver}.0
 

+ Release:       1%{?dist}
 

  # original freeverb plugin was public domain
 

  # givertcap (not built) is GPLv2
 

  # The rest, including the core of muse is distributed under GPLv2+
 

  License:       Public Domain and GPLv2 and GPLv2+ and LGPLv2+
 

- URL:           http://www.muse-sequencer.org/
 

- Source0:       https://downloads.sourceforge.net/project/lmuse/%{name}-%{maj}/%{name}-%{version}.tar.gz
 

- # FTBFS fix RHBZ#1583068 - fixed upstream
 

- # https://github.com/muse-sequencer/muse/commit/02d9dc6abd
 

- Patch0:        muse-missing-includes.patch
 

- # Fluidsynth 1&2 support. From upstream trunk
 

- # https://github.com/muse-sequencer/muse/commit/6e352b87
 

- Patch1:        muse-fluidsynth1and2.patch
 

- # Qt include fixes for newer Qt. From upstream trunk
 

- # https://github.com/muse-sequencer/muse/commit/99816883
 

- Patch2:        muse-qt-include-fixes.patch
 

- # Find gtkmm using pkg_check_modules() so we have the correct compiler and
 

- # linker flags for its recursive dependencies, such as atkmm. This is a
 

- # temporary workaround for FTBFS RHBZ#1923460, which is caused by RHBZ#1944935
 

- # in cmake.
 

- Patch3:        muse-3.0.2-find-gtkmm-with-pkgconfig.patch
 

+ URL:           https://muse-sequencer.github.io/
 

+ Source0:       https://github.com/muse-sequencer/%{name}/releases/download/%{version}/%{name}-%{majorver}.tar.gz
 

  

  BuildRequires: alsa-lib-devel
 

- BuildRequires: cmake
 

+ # Require CMake >= 3.20 to fix rhbz#1944935
 

+ BuildRequires: cmake >= 3.20
 

  BuildRequires: desktop-file-utils
 

  BuildRequires: dssi-devel
 

  BuildRequires: fluidsynth-devel
 
@@ -45,14 +35,17 @@ 
 

  BuildRequires: libappstream-glib
 

  BuildRequires: libinstpatch-devel
 

  BuildRequires: liblo-devel
 

+ BuildRequires: liblrdf-devel
 

  BuildRequires: lilv-devel
 

  BuildRequires: libsamplerate-devel
 

  BuildRequires: libsndfile-devel
 

+ BuildRequires: make
 

  BuildRequires: pkgconfig
 

  BuildRequires: python3-devel
 

  BuildRequires: qt5-qtsvg-devel
 

  BuildRequires: qt5-qttools-static
 

  BuildRequires: rtaudio-devel
 

+ BuildRequires: rubberband-devel
 

  # For lv2 plugins
 

  BuildRequires: pkgconfig(gtkmm-2.4)
 

  
@@ -61,57 +54,52 @@ 
 

  %description
 

  MusE is a MIDI/Audio sequencer with recording and editing capabilities. It can
 

  perform audio effects like chorus/flanger in real-time via LASH and it supports
 

- Jack and ALSA interfaces. MusE aims to be a complete multitrack virtual studio 

+ JACK and ALSA interfaces. MusE aims to be a complete multitrack virtual studio
 

  for Linux.
 

  

  

  %prep
 

- %setup -q
 

- %patch0 -p1 -b .includes
 

- %patch1 -p1 -b .fluidsynth1and2
 

- %patch2 -p2 -b .qtdep
 

- %patch3 -p1 -b .gtkmm-pkgconf
 

- 

- # Convert to Python3. Only "print" and "raw_input" occurences
 

- 2to3 --write --nobackups utils/muse*
 

+ %autosetup -n %{name}-%{majorver} -p1
 

+ 

  # Fix Python shebangs
 

  sed -i -e 's|/usr/bin/env python3|%{__python3}|' -e 's|/usr/bin/python$|%{__python3}|' share/scripts/* utils/*
 

  

+ 

  %build
 

  export CMAKE_CXX_FLAGS="-D_GNU_SOURCE"
 

- mkdir -p %{_target_platform}
 

- pushd %{_target_platform}
 

- %{cmake} .. \
 

-  -DMusE_DOC_DIR=%{_pkgdocdir}/
 

+ %cmake -DMusE_DOC_DIR=%{_pkgdocdir}/
 

  %cmake_build
 

  

  

  %install
 

- pushd %{_target_platform}
 

  %cmake_install
 

  

  

  %check
 

  desktop-file-validate \
 

-       %{buildroot}%{_datadir}/applications/%{name}.desktop
 

+       %{buildroot}%{_datadir}/applications/org.musesequencer.Muse*.desktop
 

  appstream-util validate-relax --nonet \
 

-       %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
 

+       %{buildroot}%{_datadir}/metainfo/org.musesequencer.Muse*.xml
 

+ 

  

  %files
 

  %license COPYING
 

  %{_pkgdocdir}
 

  %{_bindir}/%{name}*
 

  %{_bindir}/grepmidi
 

- %{_libdir}/%{name}-%{maj}*/
 

- %{_datadir}/%{name}-%{maj}*/
 

- %{_datadir}/applications/%{name}.desktop
 

- %{_datadir}/icons/hicolor/64x64/apps/%{name}_icon.png
 

+ %{_libdir}/%{name}-%{majorver}*/
 

+ %{_datadir}/%{name}-%{majorver}*/
 

+ %{_datadir}/applications/org.musesequencer.Muse*.desktop
 

+ %{_datadir}/icons/hicolor/*/apps/muse.png
 

  %{_mandir}/man1/grepmidi*
 

  %{_mandir}/man1/%{name}*
 

  %{_datadir}/mime/packages/%{name}.xml
 

- %{_datadir}/metainfo/%{name}.appdata.xml
 

+ %{_datadir}/metainfo/org.musesequencer.Muse*.xml
 

  

  %changelog
 

+ * Sat Jul 03 2021 Neal Gompa <ngompa13@gmail.com> - 1:4.0.0-1
 

+ - Rebase to MuSE 4.0
 

+ 

  * Thu Jun 17 2021 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:3.0.2-16
 

  - Rebuild for fluidsynth-2.2.1

file modified
+1 -1 
@@ -1,1 +1,1 @@ 
 

- SHA512 (muse-3.0.2.tar.gz) = 25ee05ec313576a732dd0527bdd8aba095e1c7c7fc21f8e9ded880723af326e38d098c0361efe881fa41373f657bc3fbd96b7d4bb4401d83eb2c8e103652458f
 

+ SHA512 (muse-4.0.tar.gz) = 3bb9813fb7458f7c3ae08fa02a1adedc7c687dd7520730c9dfeb002eb283e2500558333d9fdaf539d40d0099a8219f1780190348c239fcd08bd405f5e2b33ded

This fixes the FTBFS as well.

cc: @music

rebased onto 627676d
3 years ago

@oget Could you please take a look?

Hi, this pull request still has the workaround. Let's wait until the cmake issue is resolved.

Hi, this pull request still has the workaround. Let's wait until the cmake issue is resolved.

It will not be resolved anytime soon. They documented it as a requirement for packagers: https://github.com/muse-sequencer/muse/blob/master/src/README#L279-L285

Or are you talking about the gtkmm thing?

That's included in CMake 3.20, which is in F34 and Rawhide.

But it's not in EPEL8 yet, so the workaround will be needed until the next CMake rebase in RHEL 8 occurs.

F34 build of cmake was done only a few hours ago. We need to create a side-tag or wait until it hits stable to build against it.

As a (former) developer and the Fedora packager of muse, I leave the EPEL8 build to the discretion of the EPEL8 packager in their own branch.

Note that the pull request needs to be revised.

rebased onto 9835c0c
2 years ago

@oget I've rebased it on top of the latest changes and added a BR: cmake >= 3.20 to drop the patch. So this should be good to merge now.

Pull-Request has been merged by oget
2 years ago

Thanks. This is good!

@oget Can this get released in F34 and Rawhide?

I'll submit it to rawhide.
I don't do major version updates with this software on stable Fedora branches.
Metadata
None
No Tags
Changes Summary 7
+1 -0
file changed
.gitignore
-12
file removed
muse-3.0.2-find-gtkmm-with-pkgconfig.patch
-234
file removed
muse-fluidsynth1and2.patch
-23
file removed
muse-missing-includes.patch
-217
file removed
muse-qt-include-fixes.patch
+29 -41
file changed
muse.spec
+1 -1
file changed
sources
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.