Merge pull request #8 from flathub/sam/more-extensions

Enable more extensions

.gitmodules

+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules/

default.settings

+standardpath: 1
+verbose: 0
+defeatrt: 0
+flags: -font-size 12
+loadlib1: libdir
+loadlib2: Gem
+loadlib3: cyclone
+loadlib4: zexy
+loadlib5: creb
+loadlib6: cxc
+loadlib7: iemlib
+loadlib8: list-abs
+loadlib9: mapping
+loadlib10: markex
+loadlib11: maxlib
+loadlib12: memento
+loadlib13: mjlib
+loadlib14: motex
+loadlib15: oscx
+loadlib16: pddp
+loadlib17: pdogg
+loadlib18: pixeltango
+loadlib19: pmpd
+loadlib20: rradical
+loadlib21: sigpack
+loadlib22: smlib
+loadlib23: unauthorized
+loadlib24: vbap
+loadlib25: pan
+loadlib26: freeverb~
+loadlib27: hcs
+loadlib28: jmmmp
+loadlib29: ext13
+loadlib30: ggee
+loadlib31: iem_anything
+loadlib32: ekext
+loadlib33: disis
+loadlib34: lyonpotpourri
+loadlib35: pdlua
+nloadlib: 35
+path1: /app/lib/pd-l2ork/
+path2: /app/lib/pd-l2ork/extra/
+path3: /app/lib/pd-l2ork/extra/flext
+path4: /app/lib/pd-l2ork/extra/cyclone
+path5: /app/lib/pd-l2ork/extra/zexy
+path6: /app/lib/pd-l2ork/extra/creb
+path7: /app/lib/pd-l2ork/extra/cxc
+path8: /app/lib/pd-l2ork/extra/iemlib
+path9: /app/lib/pd-l2ork/extra/list-abs
+path10: /app/lib/pd-l2ork/extra/mapping
+path11: /app/lib/pd-l2ork/extra/markex
+path12: /app/lib/pd-l2ork/extra/maxlib
+path13: /app/lib/pd-l2ork/extra/memento
+path14: /app/lib/pd-l2ork/extra/mjlib
+path15: /app/lib/pd-l2ork/extra/motex
+path16: /app/lib/pd-l2ork/extra/oscx
+path17: /app/lib/pd-l2ork/extra/pddp
+path18: /app/lib/pd-l2ork/extra/pdogg
+path19: /app/lib/pd-l2ork/extra/pixeltango
+path20: /app/lib/pd-l2ork/extra/pmpd
+path21: /app/lib/pd-l2ork/extra/rradical
+path22: /app/lib/pd-l2ork/extra/sigpack
+path23: /app/lib/pd-l2ork/extra/smlib
+path24: /app/lib/pd-l2ork/extra/unauthorized
+path25: /app/lib/pd-l2ork/extra/pan
+path26: /app/lib/pd-l2ork/extra/hcs
+path27: /app/lib/pd-l2ork/extra/jmmmp
+path28: /app/lib/pd-l2ork/extra/ext13
+path29: /app/lib/pd-l2ork/extra/ggee
+path30: /app/lib/pd-l2ork/extra/ekext
+path31: /app/lib/pd-l2ork/extra/flext
+path32: /app/lib/pd-l2ork/extra/rjlib
+path33: /app/lib/pd-l2ork/extra/disis
+path34: /app/lib/pd-l2ork/extra/lyonpotpourri
+path35: /app/lib/pd-l2ork/extra/pdlua
+npath: 35

net.purrdata.PurrData.yml

@@ -15,6 +15,7 @@ finish-args: [
     '--device=all'
 ]
 modules:
+- "shared-modules/lua5.3/lua-5.3.5.json"
 - name: purr-data
   buildsystem: autotools
   subdir: pd/src
@@ -26,6 +27,8 @@ modules:
     commit: 7cf93e5e32009f033430b8bc9c7276adb272853c
   - type: patch
     path: patch/build-api.patch
+  - type: patch
+    path: patch/gnu-make-parallel.patch
   - type: patch
     path: patch/no-rsync-during-install.patch
 
@@ -34,14 +37,14 @@ modules:
   subdir: externals
   build-commands:
   - |
-    make -j $(FLATPAK_BUILDER_N_JOBS) prefix=/app \
+    make -j ${FLATPAK_BUILDER_N_JOBS} LUA_LIBS="-L/app/lib -llua" prefix=/app \
          adaptive arraysize autotune bassemu boids comport creb cxc cyclone earplug ekext ext13 fftease \
          flatgui freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemguts iem_adaptfilt iemmatrix \
          iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping \
-         markex maxlib mjlib moonlib motex mrpeach pan pdcontainer pddp pdogg plugin pmpd \
+         markex maxlib mjlib moonlib motex mrpeach pan pdcontainer pddp pdlua pdogg plugin pmpd \
          rjlib sigpack smlib tof unauthorized vbap windowing
   - |
-    make -j $(FLATPAK_BUILDER_N_JOBS) DESTDIR=/ prefix=/app \
+    make -j ${FLATPAK_BUILDER_N_JOBS} DESTDIR=/ LUA_LIBS="-L/app/lib -llua" prefix=/app \
          adaptive_install arraysize_install autotune_install bassemu_install \
          boids_install comport_install creb_install cxc_install cyclone_install \
          earplug_install ekext_install ext13_install fftease_install \
@@ -52,7 +55,7 @@ modules:
          jasch_lib_install loaders-libdir_install lyonpotpourri_install \
          mapping_install markex_install maxlib_install mjlib_install \
          moonlib_install motex_install mrpeach_install \
-         pan_install pdcontainer_install pddp_install pdogg_install \
+         pan_install pdcontainer_install pddp_install pdlua_install pdogg_install \
          plugin_install pmpd_install rjlib_install sigpack_install smlib_install \
          tof_install unauthorized_install vbap_install windowing_install
   # The following externals from the purr-data repo are not built:
@@ -63,7 +66,6 @@ modules:
   #   iemgui -- requires a config.h that it doesn't have
   #   moocow -- fails to configure
   #   oscx -- fails to configure
-  #   pdlua -- requires Lua
   #   zexy -- fails to configure
   sources:
   - type: git
@@ -75,7 +77,7 @@ modules:
   buildsystem: simple
   subdir: abstractions
   build-commands:
-  - make -j $(FLATPAK_BUILDER_N_JOBS) DESTDIR=/ prefix=/app install
+  - make -j ${FLATPAK_BUILDER_N_JOBS} DESTDIR=/ prefix=/app install
   sources:
   - type: git
     url: https://github.com/agraef/purr-data/
@@ -103,6 +105,8 @@ modules:
   # add mime type to .pd files
   - install -d /app/share/mime/packages/
   - install -m 644 packages/linux_make/pd-l2ork.xml /app/share/mime/packages/net.purrdata.PurrData.xml
+  # Default settings (mostly needed to set up the PD library search paths).
+  - install -m 644 default.settings /app/lib/pd-l2ork
   sources:
   - type: git
     url: https://github.com/agraef/purr-data/
@@ -123,3 +127,12 @@ modules:
     path: net.purrdata.PurrData.metainfo.xml
   - type: file
     path: net.purrdata.PurrData.svg
+  - type: file
+    path: default.settings
+
+cleanup:
+  - /include/*
+  - /lib/pd-l2ork/Makefile.am
+  - /lib/pd-l2ork/README.txt
+  - /lib/pd-l2ork/bin/todo.txt
+  - /lib/pd-l2ork/bin/nw/credits.html

shared-modules @ 769d287b

+Subproject commit 769d287b1a65f8b128570be11ec4626dcc608210