Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2917f08804db593c6dc82ffb9e1bbc49e07b46e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2917f08804db593c6dc82ffb9e1bbc49e07b46e4)
  • Date: Fri, 23 Sep 2022 14:44:31 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-creation/soundtracker/HISTORY
| 6
audio-creation/soundtracker/PRE_BUILD
| 7

audio-creation/soundtracker/patches/0001-Fix-POSIX-conflicting-use-of-poll.h.patch
| 85 ++++++++++

audio-creation/soundtracker/patches/0002-Fix-duplicated-definition-of-scopegroup.patch
| 26 +++
4 files changed, 124 insertions(+)

New commits:
commit 2917f08804db593c6dc82ffb9e1bbc49e07b46e4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

soundtracker: Fix build against musl

diff --git a/audio-creation/soundtracker/HISTORY
b/audio-creation/soundtracker/HISTORY
index e4e431b..3c05926 100644
--- a/audio-creation/soundtracker/HISTORY
+++ b/audio-creation/soundtracker/HISTORY
@@ -1,3 +1,9 @@
+2022-09-23 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-POSIX-conflicting-use-of-poll.h.patch:
+ fixed build against musl
+ * patches/0002-Fix-duplicated-definition-of-scopegroup.patch
+ fixed build with GCC 10.x+
+
2007-09-01 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: removed
* DEPENDS: added alsa warning
diff --git a/audio-creation/soundtracker/PRE_BUILD
b/audio-creation/soundtracker/PRE_BUILD
new file mode 100755
index 0000000..1d7a75a
--- /dev/null
+++ b/audio-creation/soundtracker/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# Fix poll.h usage in configure script
+sedit 's@sys/poll\.h AT poll.h@' configure &&
+# Fix OS detection for musl
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git
a/audio-creation/soundtracker/patches/0001-Fix-POSIX-conflicting-use-of-poll.h.patch

b/audio-creation/soundtracker/patches/0001-Fix-POSIX-conflicting-use-of-poll.h.patch
new file mode 100644
index 0000000..8cf5f98
--- /dev/null
+++
b/audio-creation/soundtracker/patches/0001-Fix-POSIX-conflicting-use-of-poll.h.patch
@@ -0,0 +1,85 @@
+From 0e87d52de5d01c3b137e5566bffd183ff6dddbe7 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 23 Sep 2022 16:12:09 +0200
+Subject: [PATCH 1/2] Fix POSIX-conflicting use of poll.h
+
+The local poll.h header may clobber a POSIX-compliant implementation
+providing <poll.h> as the main header instead of <sys/poll.h> (which is
+not POSIX).
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ app/audio.c | 2 +-
+ app/gui.c | 2 +-
+ app/poll.c | 4 ++--
+ app/{poll.h => st-poll.h} | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+ rename app/{poll.h => st-poll.h} (98%)
+
+diff --git a/app/audio.c b/app/audio.c
+index fa847f4c3e93..df1af71e60cb 100644
+--- a/app/audio.c
++++ b/app/audio.c
+@@ -30,7 +30,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-#include "poll.h"
++#include "st-poll.h"
+
+ #ifdef _POSIX_PRIORITY_SCHEDULING
+ #include <sched.h>
+diff --git a/app/gui.c b/app/gui.c
+index 7972fbd4fa03..8a2d6c50ae08 100644
+--- a/app/gui.c
++++ b/app/gui.c
+@@ -28,7 +28,7 @@
+
+ #include <unistd.h>
+
+-#include "poll.h"
++#include "st-poll.h"
+
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+diff --git a/app/poll.c b/app/poll.c
+index cdc8c3b1a58e..fd2b3de79759 100644
+--- a/app/poll.c
++++ b/app/poll.c
+@@ -31,7 +31,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
+-#include "poll.h"
++#include "st-poll.h"
+
+ /* Poll the file descriptors described by the NFDS structures starting at
+ FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
+@@ -101,7 +101,7 @@ poll (fds, nfds, timeout)
+ #define WIN32_LEAN_AND_MEAN
+ #include "glib.h"
+ #include <windows.h>
+-#include "poll.h"
++#include "st-poll.h"
+
+ typedef struct plst {
+ HANDLE pa, pb;
+diff --git a/app/poll.h b/app/st-poll.h
+similarity index 98%
+rename from app/poll.h
+rename to app/st-poll.h
+index 3ae255b48957..f822059f0588 100644
+--- a/app/poll.h
++++ b/app/st-poll.h
+@@ -27,7 +27,7 @@
+ #include <config.h>
+
+ #ifdef HAVE_POLL
+-#include <sys/poll.h>
++#include <poll.h>
+ #else
+
+ /* Data structure describing a polling request. */
+--
+2.37.3
+
diff --git
a/audio-creation/soundtracker/patches/0002-Fix-duplicated-definition-of-scopegroup.patch

b/audio-creation/soundtracker/patches/0002-Fix-duplicated-definition-of-scopegroup.patch
new file mode 100644
index 0000000..3d29265
--- /dev/null
+++
b/audio-creation/soundtracker/patches/0002-Fix-duplicated-definition-of-scopegroup.patch
@@ -0,0 +1,26 @@
+From d018c1945e61fb5a66c51bce6ee35304de0d7f74 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 23 Sep 2022 16:30:05 +0200
+Subject: [PATCH 2/2] Fix duplicated definition of scopegroup
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ app/track-editor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/track-editor.c b/app/track-editor.c
+index 12dff47abde9..2bbee6d59672 100644
+--- a/app/track-editor.c
++++ b/app/track-editor.c
+@@ -43,7 +43,7 @@
+ Tracker *tracker;
+ GtkWidget *trackersettings;
+ GtkWidget *vscrollbar;
+-ScopeGroup *scopegroup;
++extern ScopeGroup *scopegroup;
+
+ static GtkWidget *hscrollbar;
+
+--
+2.37.3
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2917f08804db593c6dc82ffb9e1bbc49e07b46e4), Ismael Luceno, 09/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page