diff options
Diffstat (limited to 'media-sound/denemo')
| -rw-r--r-- | media-sound/denemo/Manifest | 5 | ||||
| -rw-r--r-- | media-sound/denemo/denemo-2.3.0-r1.ebuild (renamed from media-sound/denemo/denemo-2.3.0.ebuild) | 36 | ||||
| -rw-r--r-- | media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch | 62 | ||||
| -rw-r--r-- | media-sound/denemo/metadata.xml | 7 |
4 files changed, 79 insertions, 31 deletions
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest index e5eda3c19498..eac5bbc1c7d3 100644 --- a/media-sound/denemo/Manifest +++ b/media-sound/denemo/Manifest @@ -1,4 +1,5 @@ AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f +AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f -EBUILD denemo-2.3.0.ebuild 2962 BLAKE2B b3cab27ecbb001c35a93fe9225a1d778125a18cf4b82787d17959370fa0d2e234dc20eb12f9f2aa544a9d099eb600eb8bbffee55d5cdc2f72cb71071a1fe792e SHA512 2daf481bcbac2735522e1cf5fbe268d907966e9bde112f0796b9aeea7ea544cd1ce3991db893bfcea2a377e7571c4ff7e2c552277bd96adbf3175d7cd3a93cf9 -MISC metadata.xml 1487 BLAKE2B 96c335a8a2e921a46b17865102aac97d3535e1e282817ab28acfaf2708547ca16fbf31fa197930212be7acd81da8db292f808178318ee8ee54a9613a671eb080 SHA512 59a4a47df129dcd13b2694e737492f64abfb8fdc056ac0cd284d9e023ca40ac17e80552324fe784d9adcad82b1ac057b78f525593bd1601fdabcbdbed3556d3c +EBUILD denemo-2.3.0-r1.ebuild 2979 BLAKE2B ef184232adff0cc1119acc79244b8637a8ccc39953bb93018078595a286618e88f787c9e2ca69da31c81af9c310a602d12843b44cc04486e0a9c905106f64d99 SHA512 7ed1ef229552d8d279bee4207563446ab6915f7033565c6149ed92e9097ec81d89afcf0db6dfb77fc7372bd7eb9517126d8b0ed97c8e61ac82eae3d4352ae6f2 +MISC metadata.xml 1266 BLAKE2B f8a27a8c74a982612bacc612dc531d1ffaa67ad380c637405d624a2deb2651e25f09636c72cfe3a9f6228e7a5289484ef99ae1d00a5e64df9cc5f220dda23409 SHA512 09c7e135243a32eeef5a0f6ef53156c2109398fd9515b377b69ed926c7c85c2aaca036704ac819803715f5776321a734896908ff4dd4c05c8c4820c339cb4f79 diff --git a/media-sound/denemo/denemo-2.3.0.ebuild b/media-sound/denemo/denemo-2.3.0-r1.ebuild index fd5f1f3e4df7..4924eed28572 100644 --- a/media-sound/denemo/denemo-2.3.0.ebuild +++ b/media-sound/denemo/denemo-2.3.0-r1.ebuild @@ -17,12 +17,13 @@ KEYWORDS="~amd64 ~x86" # --enable-mem(no) memory debugging: needs Electric fence (efence), which # is not available in portage. See https://github.com/boundarydevices/efence # --enable-gtk-doc-pdf(no) doesn't work -IUSE="alsa +aubio debug +evince jack +fluidsynth gtk-doc +gtk3 nls +portaudio - +portmidi +rubberband static test" +IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi + +rubberband test" RESTRICT="!test? ( test )" RDEPEND=" + >=app-text/evince-3.22.1-r1:= dev-libs/libxml2:2 >=dev-scheme/guile-2:12= gnome-base/librsvg:2 @@ -30,18 +31,11 @@ RDEPEND=" >=media-libs/libsmf-1.3 >=media-libs/libsndfile-1.0.28-r1 >=media-sound/lilypond-2.19.54[guile2(+)] + x11-libs/gtk+:3 + x11-libs/gtksourceview:3.0= alsa? ( >=media-libs/alsa-lib-1.1.2 ) aubio? ( >=media-libs/aubio-0.4.1-r1:= ) - evince? ( >=app-text/evince-3.22.1-r1:= ) fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= ) - gtk3? ( - x11-libs/gtk+:3 - x11-libs/gtksourceview:3.0= - ) - !gtk3? ( - x11-libs/gtk+:2 - x11-libs/gtksourceview:2.0 - ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre20140130 @@ -54,29 +48,26 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" + >=dev-util/gtk-doc-am-1.25-r1 >=dev-util/intltool-0.51.0-r1 >=sys-devel/flex-2.6.1 virtual/pkgconfig virtual/yacc - gtk-doc? ( - >=dev-util/gtk-doc-1.25-r1 - >=dev-util/gtk-doc-am-1.25-r1 - ) + gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 ) nls? ( >=sys-devel/gettext-0.19.8.1 ) " -REQUIRED_USE=" - evince? ( gtk3 ) -" - DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS ) PATCHES=( "${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch" + "${FILESDIR}/${P}-0002-Fix-issues-with-gcc10-fno-common-flag.patch" ) src_prepare() { sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die + sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \ + -i Makefile.am || die default eautoreconf } @@ -84,9 +75,13 @@ src_prepare() { src_configure() { myeconfargs=( --disable-gtk-doc-pdf + --disable-gtk2 --disable-installed-tests --disable-mem --disable-rpath + --disable-static + --enable-evince + --enable-gtk3 --enable-x11 $(use_enable alsa) $(use_enable aubio) @@ -96,15 +91,12 @@ src_configure() { $(use_enable gtk-doc doc) $(use_enable gtk-doc gtk-doc) $(use_enable gtk-doc gtk-doc-html) - $(use_enable evince) $(use_enable fluidsynth) $(use_enable jack) $(use_enable nls) $(use_enable portaudio) $(use_enable portmidi) $(use_enable rubberband) - $(use_enable static) - $(usex gtk3 --enable-gtk3 --enable-gtk2) ) econf "${myeconfargs[@]}" } diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch new file mode 100644 index 000000000000..425662e042c9 --- /dev/null +++ b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch @@ -0,0 +1,62 @@ +From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Fri, 20 Mar 2020 21:03:02 +0100 +Subject: [PATCH] Fix issues with gcc10 -fno-common flag + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + include/denemo/denemo_types.h | 7 ++++--- + src/export/print.h | 6 +++--- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h +index 1d67827..936892b 100644 +--- a/include/denemo/denemo_types.h ++++ b/include/denemo/denemo_types.h +@@ -430,7 +430,7 @@ typedef enum{ + } SCRIPT_TYPE; + + //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!! +-enum ++typedef enum + { + COL_TYPE = 0, + COL_NAME, +@@ -1167,7 +1167,7 @@ struct cs_callback + * The (singleton) root object for the program + * + */ +-struct DenemoRoot ++typedef struct DenemoRoot + { + gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/ + gchar *scheme_file;/* filename for scheme code to run on startup */ +@@ -1258,6 +1258,7 @@ struct DenemoRoot + gboolean *silent; /** Don't log any message */ + gboolean *verbose; /** Display every messages */ + guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id +-} Denemo; /**< The root object. */ ++}; ++extern struct DenemoRoot Denemo; /**< The root object. */ + + #endif +diff --git a/src/export/print.h b/src/export/print.h +index db0c8f1..64a3a8d 100644 +--- a/src/export/print.h ++++ b/src/export/print.h +@@ -108,9 +108,9 @@ typedef struct WysiwygInfo + GtkWidget *dialog; //an info dialog to tell the user what to do next... + } WysiwygInfo; + +-gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr +-GError *lily_err; +-GPid previewerpid; ++extern gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr ++extern GError *lily_err; ++extern GPid previewerpid; + + WysiwygInfo* get_wysiwyg_info(); + void initialize_print_status (void); +-- +2.25.1 + diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml index b94e07a77366..01f6188337b1 100644 --- a/media-sound/denemo/metadata.xml +++ b/media-sound/denemo/metadata.xml @@ -20,17 +20,10 @@ <flag name="aubio"> Enable <pkg>media-libs/aubio</pkg> support </flag> - <flag name="evince"> - Use <pkg>app-text/evince</pkg> document viewer - </flag> <flag name="fluidsynth"> Enable Fluidsynth MIDI software synthesis using <pkg>media-sound/fluidsynth</pkg> </flag> - <flag name="gtk3"> - Enable support for the GTK+. If enabled uses slot 3 of - <pkg>x11-libs/gtk+</pkg>, if disabled it uses slot 2 - </flag> <flag name="jack"> Enable jack support through <pkg>virtual/jack</pkg> </flag> |