Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Runtime 23.08 #2

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions libdispatch-unused-variable.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 56a3fdf7f167c9896be3f1ac67792a529455b303 Mon Sep 17 00:00:00 2001
From: bbhtt <[email protected]>
Date: Wed, 13 Sep 2023 12:38:15 +0530
Subject: [PATCH] Fix build

Pick https://github.com/apple/swift-corelibs-libdispatch/commit/915f25141a7c57b6a2a3bc8697572644af181ec5
---
src/shims/yield.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/src/shims/yield.c b/src/shims/yield.c
index 43f0017..1a2bd5e 100644
--- a/src/shims/yield.c
+++ b/src/shims/yield.c
@@ -25,6 +25,7 @@ static void *
__DISPATCH_WAIT_FOR_ENQUEUER__(void **ptr)
{
int spins = 0;
+ (void)spins;
void *value;
while ((value = os_atomic_load(ptr, relaxed)) == NULL) {
_dispatch_preemption_yield(++spins);
--
2.41.0

11 changes: 0 additions & 11 deletions make4.3.patch

This file was deleted.

24 changes: 24 additions & 0 deletions ofxAudioFile-missing-header.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From d97dc2871f597ea05d3d13347c9c05259bc8fbef Mon Sep 17 00:00:00 2001
From: bbhtt <[email protected]>
Date: Wed, 13 Sep 2023 14:02:25 +0530
Subject: [PATCH] Fix missing header

---
addons/ofxAudioFile/src/ofxAudioFile.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/addons/ofxAudioFile/src/ofxAudioFile.h b/addons/ofxAudioFile/src/ofxAudioFile.h
index ae5defa..1070e15 100644
--- a/addons/ofxAudioFile/src/ofxAudioFile.h
+++ b/addons/ofxAudioFile/src/ofxAudioFile.h
@@ -4,6 +4,7 @@

#include <iostream>
#include <string>
+#include <cstdint>

class ofxAudioFile {

--
2.41.0

36 changes: 36 additions & 0 deletions ofxHapPlayer-gcc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From e4db7a1c3a62df4129831091b3ac0cd5c39d10fc Mon Sep 17 00:00:00 2001
From: bbhtt <[email protected]>
Date: Wed, 13 Sep 2023 17:55:23 +0530
Subject: [PATCH] Fix build with gcc

Ref. https://github.com/bangnoise/ofxHapPlayer/issues/66#issuecomment-833333838
---
addons/ofxHapPlayer/src/ofxHapPlayer.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/ofxHapPlayer/src/ofxHapPlayer.cpp b/addons/ofxHapPlayer/src/ofxHapPlayer.cpp
index 6c8769d..d99f956 100644
--- a/addons/ofxHapPlayer/src/ofxHapPlayer.cpp
+++ b/addons/ofxHapPlayer/src/ofxHapPlayer.cpp
@@ -45,7 +45,6 @@ extern "C" {
#if defined(TARGET_WIN32)
#include <ppl.h>
#elif defined(TARGET_LINUX)
-#include <dispatch/dispatch.h>
#endif

// This amount will be bufferred before and after the playhead
@@ -107,8 +106,9 @@ namespace ofxHapPY {
function(p, i);
});
#else
- struct Work w = {p, function};
- dispatch_apply_f(count, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), &w, decodeWrapper);
+ for (int i = 0; i < count; i++) {
+ function(p, i);
+ }
#endif
}

--
2.41.0
22 changes: 22 additions & 0 deletions ofxVisualProgramming-missing-header.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 1a03bcf9f4a4e19121c9f5327220c7bb0b93c9df Mon Sep 17 00:00:00 2001
From: d3cod3 <[email protected]>
Date: Sun, 1 Jan 2023 10:35:01 +0100
Subject: [PATCH] fix windows compile

---
addons/ofxVisualProgramming/src/core/ofxVPHasUid.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/addons/ofxVisualProgramming/src/core/ofxVPHasUid.h b/addons/ofxVisualProgramming/src/core/ofxVPHasUid.h
index a4194032..6c8a6409 100644
--- a/addons/ofxVisualProgramming/src/core/ofxVPHasUid.h
+++ b/addons/ofxVisualProgramming/src/core/ofxVPHasUid.h
@@ -4,6 +4,8 @@
#include <string>
#include <map>
#include <iostream>
+#include <algorithm>
+#include <ctype.h>
#include "ofLog.h"

class ofxVPHasUID {
14 changes: 0 additions & 14 deletions openal_fix.patch

This file was deleted.

63 changes: 63 additions & 0 deletions openframeworks-libsndfile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
From 04a9a46b4ef07b74c56d0fe0a325872651ffbd38 Mon Sep 17 00:00:00 2001
From: ofTheo <[email protected]>
Date: Wed, 6 Apr 2022 16:05:46 -0700
Subject: [PATCH 1/2] fix for different struct type for libsndfile

---
libs/openFrameworks/sound/ofOpenALSoundPlayer.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
index 042f7b35442..ad6bb860c3c 100644
--- a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
+++ b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
@@ -14,8 +14,8 @@ typedef unsigned int ALuint;
#include "kiss_fftr.h"


-
-typedef struct SNDFILE_tag SNDFILE ;
+//defined by libsndfile in .cpp
+struct SNDFILE;


#ifdef OF_USING_MPG123

From 4c0eaf9aaa820f0c2183ba8b3674093222873981 Mon Sep 17 00:00:00 2001
From: ofTheo <[email protected]>
Date: Wed, 6 Apr 2022 16:17:35 -0700
Subject: [PATCH 2/2] better fix?

---
libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp | 1 -
libs/openFrameworks/sound/ofOpenALSoundPlayer.h | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
index 71caf42d829..39146d7d619 100644
--- a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
+++ b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
@@ -7,7 +7,6 @@
#include "glm/common.hpp"
#include "ofLog.h"
#include "ofEvents.h"
-#include <sndfile.h>

#if defined (TARGET_OF_IOS) || defined (TARGET_OSX)
#include <OpenAL/al.h>
diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
index ad6bb860c3c..80df4f90cb6 100644
--- a/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
+++ b/libs/openFrameworks/sound/ofOpenALSoundPlayer.h
@@ -12,10 +12,7 @@ typedef unsigned int ALuint;

#include "kiss_fft.h"
#include "kiss_fftr.h"
-
-
-//defined by libsndfile in .cpp
-struct SNDFILE;
+#include <sndfile.h>


#ifdef OF_USING_MPG123
7 changes: 3 additions & 4 deletions org.d3cod3.Mosaic.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
<summary>An openFrameworks based Visual Patching Creative-Coding Platform</summary>

<description>
<p>
Mosaic is a multi-platform livecoding programming/patching environment for creating real-time audio-visual compositions. It's principally designed for live needs, as can be teaching in class, live performing in an algorave, or running a generative audio-visual installation in a museum. It aims to empower artists, creative coders, scenographers and other creative technologists in their creative workflow
</p>

<p>Mosaic is a multi-platform livecoding programming/patching environment for creating real-time audio-visual compositions. It's principally designed for live needs, as can be teaching in class, live performing in an algorave, or running a generative audio-visual installation in a museum. It aims to empower artists, creative coders, scenographers and other creative technologists in their creative workflow</p>

</description>

<launchable type="desktop-id">org.d3cod3.Mosaic.desktop</launchable>
Expand Down Expand Up @@ -44,6 +42,7 @@
<releases>
<release version="0.5.0" date="2021-09-04">
<description>
<p>Changes: </p>
<ul>
<li>added texture mixer object to mix up to 32 texture using alpha</li>
<li>Updated ofxAddonsTool to last commit</li>
Expand Down
Loading