diff --git a/libdispatch-unused-variable.patch b/libdispatch-unused-variable.patch new file mode 100644 index 0000000..22b7876 --- /dev/null +++ b/libdispatch-unused-variable.patch @@ -0,0 +1,25 @@ +From 56a3fdf7f167c9896be3f1ac67792a529455b303 Mon Sep 17 00:00:00 2001 +From: bbhtt +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 + diff --git a/make4.3.patch b/make4.3.patch deleted file mode 100644 index ea79519..0000000 --- a/make4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk old -+++ libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk new -@@ -96,7 +96,7 @@ define parse_addon - $(eval ADDON_SOURCES=$(PARSED_ADDONS_SOURCE_FILES)) \ - $(eval PROCESS_NEXT=0) \ - $(if $(wildcard $(addon)/addon_config.mk), \ -- $(foreach var_line, $(subst $(space),?,$(shell cat $(addon)/addon_config.mk | tr '\n' '\t')), \ -+ $(foreach var_line, $(shell cat $(addon)/addon_config.mk | tr '\n ' '\t?'), \ - $(eval unscaped_var_line=$(strip $(subst ?, ,$(var_line)))) \ - $(if $(filter $(PROCESS_NEXT),1), $(eval $(unscaped_var_line))) \ - $(if $(filter %:,$(unscaped_var_line)), \ diff --git a/ofxAudioFile-missing-header.patch b/ofxAudioFile-missing-header.patch new file mode 100644 index 0000000..9cf5f0d --- /dev/null +++ b/ofxAudioFile-missing-header.patch @@ -0,0 +1,24 @@ +From d97dc2871f597ea05d3d13347c9c05259bc8fbef Mon Sep 17 00:00:00 2001 +From: bbhtt +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 + #include ++#include + + class ofxAudioFile { + +-- +2.41.0 + diff --git a/ofxHapPlayer-gcc.patch b/ofxHapPlayer-gcc.patch new file mode 100644 index 0000000..87f8eae --- /dev/null +++ b/ofxHapPlayer-gcc.patch @@ -0,0 +1,36 @@ +From e4db7a1c3a62df4129831091b3ac0cd5c39d10fc Mon Sep 17 00:00:00 2001 +From: bbhtt +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 + #elif defined(TARGET_LINUX) +-#include + #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 diff --git a/ofxVisualProgramming-missing-header.patch b/ofxVisualProgramming-missing-header.patch new file mode 100644 index 0000000..b696c56 --- /dev/null +++ b/ofxVisualProgramming-missing-header.patch @@ -0,0 +1,22 @@ +From 1a03bcf9f4a4e19121c9f5327220c7bb0b93c9df Mon Sep 17 00:00:00 2001 +From: d3cod3 +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 + #include + #include ++#include ++#include + #include "ofLog.h" + + class ofxVPHasUID { diff --git a/openal_fix.patch b/openal_fix.patch deleted file mode 100644 index 23d92f4..0000000 --- a/openal_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libs/openFrameworks/sound/ofOpenALSoundPlayer.bck 2020-01-01 13:36:59.501973818 +0100 -+++ libs/openFrameworks/sound/ofOpenALSoundPlayer.h 2020-01-01 13:37:52.486103430 +0100 -@@ -10,9 +10,9 @@ - - typedef unsigned int ALuint; - /** Opaque device handle */ --typedef struct ALCdevice_struct ALCdevice; -+struct ALCdevice; - /** Opaque context handle */ --typedef struct ALCcontext_struct ALCcontext; -+struct ALCcontext; - - - diff --git a/openframeworks-libsndfile.patch b/openframeworks-libsndfile.patch new file mode 100644 index 0000000..ce27f00 --- /dev/null +++ b/openframeworks-libsndfile.patch @@ -0,0 +1,63 @@ +From 04a9a46b4ef07b74c56d0fe0a325872651ffbd38 Mon Sep 17 00:00:00 2001 +From: ofTheo +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 +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 + + #if defined (TARGET_OF_IOS) || defined (TARGET_OSX) + #include +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 + + + #ifdef OF_USING_MPG123 diff --git a/org.d3cod3.Mosaic.appdata.xml b/org.d3cod3.Mosaic.appdata.xml index 9bcad22..5539492 100644 --- a/org.d3cod3.Mosaic.appdata.xml +++ b/org.d3cod3.Mosaic.appdata.xml @@ -8,10 +8,8 @@ An openFrameworks based Visual Patching Creative-Coding Platform -

- 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 -

- +

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

+ org.d3cod3.Mosaic.desktop @@ -44,6 +42,7 @@ +

Changes:

  • added texture mixer object to mix up to 32 texture using alpha
  • Updated ofxAddonsTool to last commit
    • diff --git a/org.d3cod3.Mosaic.yml b/org.d3cod3.Mosaic.yml index bfa4e47..7bc4343 100644 --- a/org.d3cod3.Mosaic.yml +++ b/org.d3cod3.Mosaic.yml @@ -1,13 +1,15 @@ app-id: org.d3cod3.Mosaic runtime: org.freedesktop.Platform -runtime-version: '20.08' +runtime-version: '23.08' sdk: org.freedesktop.Sdk +sdk-extensions: + - org.freedesktop.Sdk.Extension.llvm16 command: mosaic finish-args: # X11 + XShm access - --share=ipc - --socket=x11 - + - --socket=pulseaudio # Needs access to webcams and so - --device=all @@ -23,7 +25,7 @@ cleanup: add-extensions: org.freedesktop.Platform.ffmpeg-full: directory: lib/ffmpeg - version: '20.08' + version: '23.08' add-ld-path: '.' no-autodownload: true autodelete: false @@ -36,7 +38,6 @@ modules: - shared-modules/glew/glew.json - shared-modules/gtk2/gtk2.json - shared-modules/libusb/libusb.json - - shared-modules/linux-audio/jack2.json - name: iputils buildsystem: meson config-opts: @@ -55,16 +56,12 @@ modules: - "-DBUILD_MANS=false" - "-DBUILD_HTML_MANS=false" - "-DNO_SETCAP_OR_SUID=false" - - "-DSETCAP_OR_SUID_ARPING=false" - - "-DSETCAP_OR_SUID_CLOCKDIFF=false" - - "-DSETCAP_OR_SUID_PING=false" - - "-DSETCAP_OR_SUID_TRACEROUTE6=false" - "-DUSE_GETTEXT=false" sources: - type: archive url: https://github.com/iputils/iputils/archive/s20190709.tar.gz sha256: a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a - + #- name: libblocksruntime # buildsystem: simple # build-commands: @@ -73,7 +70,7 @@ modules: # - type: archive # url: https://github.com/mheily/blocks-runtime/releases/download/v0.4.1/libblocksruntime-0.4.1.tar.gz # sha256: 7807e18d7d6cabd90f77c8b8a8ebd472516fa4ed6a02df82e0c33b1c5e112abc - + #- name: libpthread-workqueue # buildsystem: simple # build-commands: @@ -83,7 +80,7 @@ modules: # - type: archive # url: https://github.com/mheily/libpwq/archive/refs/tags/v0.9.1.tar.gz # sha256: 768f756a3813531c2d7c441bc0a6265a438e55edbfb4204506e5f68072471d33 - + #- name: libkqueue # buildsystem: simple # build-commands: @@ -94,7 +91,7 @@ modules: # - type: archive # url: https://github.com/mheily/libkqueue/archive/refs/tags/v2.4.0.tar.gz # sha256: fbfb6693928cd7b27a6c037916a366af7c1b36a3b9da0a58ae5025b6a3c736e0 - + #- name: libdispatch # buildsystem: simple # build-commands: @@ -103,7 +100,7 @@ modules: # - type: archive # url: https://github.com/nickhutchinson/libdispatch/archive/refs/tags/v0.1.3.1.tar.gz # sha256: aadaa74aaa155487b794aa28e1ab422d86d0e5a3cf3e6ab64def6a64b4b33c9e - + - name: freeglut build-options: cflags: -fcommon @@ -113,14 +110,14 @@ modules: sources: - type: archive url: "https://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/freeglut-3.2.1.tar.gz" - md5: cd5c670c1086358598a6d4a9d166949d - + sha256: d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 + - name: libxmu sources: - type: archive url: https://www.x.org/archive//individual/lib/libXmu-1.1.3.tar.bz2 sha256: 9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731 - + - name: libraw1394 rm-configure: true sources: @@ -128,12 +125,14 @@ modules: url: https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz sha256: 03ccc69761d22c7deb1127fc301010dd13e70e44bb7134b8ff0d07590259a55e - type: script - commands: + commands: - autoreconf -fiv dest-filename: autogen.sh - + - name: freeimage buildsystem: simple + build-options: + cxxflags: -std=c++14 build-commands: - sh gensrclist.sh - sh genfipsrclist.sh @@ -153,7 +152,7 @@ modules: buildsystem: cmake-ninja builddir: true config-opts: - - -DCMAKE_BUILD_TYPE=Debug + - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DOPENCV_GENERATE_PKGCONFIG=ON #- -OPENCV_ENABLE_NONFREE=ON - -DWITH_OPENCL=ON @@ -175,11 +174,11 @@ modules: # - "/bin" sources: - type: archive - url: https://github.com/opencv/opencv/archive/4.2.0.tar.gz - sha256: 9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec + url: https://github.com/opencv/opencv/archive/4.8.0.tar.gz + sha256: cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd - type: archive - url: https://github.com/opencv/opencv_contrib/archive/4.2.0.tar.gz - sha256: 8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020 + url: https://github.com/opencv/opencv_contrib/archive/4.8.0.tar.gz + sha256: b4aef0f25a22edcd7305df830fa926ca304ea9db65de6ccd02f6cfa5f3357dbb # dest: contrib - name: assimp @@ -212,8 +211,8 @@ modules: - ./b2 -j $FLATPAK_BUILDER_N_JOBS install sources: - type: archive - url: https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2 - sha256: 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 + url: https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2 + sha256: 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e - name: glfw buildsystem: cmake-ninja @@ -230,7 +229,7 @@ modules: - "/lib/pkgconfig" - name: liburiparser - buildsystem: cmake + buildsystem: cmake-ninja config-opts: - "-DURIPARSER_BUILD_DOCS=OFF" - "-DURIPARSER_BUILD_TESTS=OFF" @@ -252,33 +251,29 @@ modules: sha256: 55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a - name: poco - buildsystem: cmake + buildsystem: cmake-ninja sources: - type: archive - url: https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz - sha256: 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 + url: https://github.com/pocoproject/poco/archive/poco-1.12.4-release.tar.gz + sha256: 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef + - name: libdaemon buildsystem: autotools - config-opts: - - "--prefix=/app" sources: - - type: git - url: git://git.0pointer.net/libdaemon.git - commit: 9fcc28e0e8f84968d1fb8b6d544a42efb13803ec - + - type: archive + url: http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz + sha256: fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 + - name: libevent buildsystem: autotools - config-opts: - - "--prefix=/app" sources: - type: git url: https://github.com/libevent/libevent tag: release-2.1.12-stable - + - name: avahi buildsystem: autotools config-opts: - - "--prefix=/app" - "--with-distro=none" - "--disable-gtk3" - "--disable-mono" @@ -320,9 +315,13 @@ modules: - name: libdispatch buildsystem: cmake-ninja build-options: + append-path: /usr/lib/sdk/llvm16/bin + prepend-ld-library-path: /usr/lib/sdk/llvm16/lib env: CC: clang CXX: clang++ + config-opts: + - -DBUILD_TESTING=OFF sources: - type: git url: https://github.com/apple/swift-corelibs-libdispatch @@ -330,6 +329,8 @@ modules: - type: patch path: avoid-kqueue.patch strip-components: 0 + - type: patch + path: libdispatch-unused-variable.patch - name: openframeworks buildsystem: simple # subdir: libs/openFrameworksCompiled/project @@ -359,10 +360,10 @@ modules: path: "org.d3cod3.Mosaic.desktop" # openframeworks - type: archive - url: https://openframeworks.cc/versions/v0.11.0/of_v0.11.0_linux64gcc6_release.tar.gz - sha256: 513cee3ce081e79fdc1a942af09869145fff3d7addeee0a76cef26fbc3ae69b1 + url: https://openframeworks.cc/versions/v0.11.2/of_v0.11.2_linux64gcc6_release.tar.gz + sha256: 9907beae6c786751470f5a55f1273280f3c240b4a93ce0c4a32c4a62b401470c - type: shell - commands: + commands: - sed -e '/GL\/glext.h/ s/^#*/\/\//' -i libs/openFrameworks/utils/ofConstants.h # use openCV 4 - type: shell @@ -370,11 +371,7 @@ modules: - sed -i -E 's/ADDON_PKG_CONFIG_LIBRARIES =(.*)opencv\s/ADDON_PKG_CONFIG_LIBRARIES =\1opencv4 /g' addons/ofxOpenCv/addon_config.mk - sed -i -E 's/ADDON_PKG_CONFIG_LIBRARIES =(.*)opencv$/ADDON_PKG_CONFIG_LIBRARIES =\1opencv4/g' addons/ofxOpenCv/addon_config.mk - type: patch - path: openal_fix.patch - strip-components: 0 - - type: patch - path: make4.3.patch - strip-components: 0 + path: openframeworks-libsndfile.patch # addons - type: git url: https://github.com/d3cod3/ofxAudioAnalyzer.git @@ -388,6 +385,8 @@ modules: # tag: commit: 3b4248d7772379aedbe7088ac239b9d376a7df55 dest: addons/ofxAudioFile + - type: patch + path: ofxAudioFile-missing-header.patch - type: git url: https://github.com/d3cod3/ofxBTrack.git # branch: master @@ -436,6 +435,8 @@ modules: tag: 0.5.0 commit: e8a7e810f7d3ce3869af39e6d5ceb99168a3463a dest: addons/ofxHapPlayer + - type: patch + path: ofxHapPlayer-gcc.patch - type: git url: https://github.com/d3cod3/ofxImGui.git # branch: master @@ -487,7 +488,7 @@ modules: url: https://github.com/d3cod3/ofxPDSP.git # branch: master # tag: - commit: a64410c1dd0231de2a3fde6c81da6ea9043b3d11 + commit: e8f6d447c0f3a53e0dd69ea26afdcba1f7edeeff dest: addons/ofxPDSP - type: git url: https://github.com/d3cod3/ofxPython.git @@ -507,6 +508,8 @@ modules: tag: 0.5.0 commit: a9e3790422e664bd36297d2a533e4d6b99e0b678 dest: addons/ofxVisualProgramming + - type: patch + path: ofxVisualProgramming-missing-header.patch - type: git url: https://github.com/d3cod3/ofxWarp.git # branch: master @@ -533,5 +536,5 @@ modules: commit: a5caa8931a21e8b91e5d97a1ec407a2fa1e7f83b dest: apps/d3cod3/Mosaic - + diff --git a/shared-modules b/shared-modules index ca1664c..5350d9e 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit ca1664c5d1d94899432f364f006c582898afbae2 +Subproject commit 5350d9e0fbb53b9583655d1af217b1d9d839a39d