Commit 02a88eda authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'aggraef/purr-data-pd-lua'

parents 1b1f8698 9f2a5ea2
...@@ -16,3 +16,6 @@ ...@@ -16,3 +16,6 @@
[submodule "l2ork_addons/raspberry_pi/disis_gpio/wiringPi"] [submodule "l2ork_addons/raspberry_pi/disis_gpio/wiringPi"]
path = l2ork_addons/raspberry_pi/disis_gpio/wiringPi path = l2ork_addons/raspberry_pi/disis_gpio/wiringPi
url = https://git.purrdata.net/jwilkes/wiringPi.git url = https://git.purrdata.net/jwilkes/wiringPi.git
[submodule "externals/pd-lua"]
path = externals/pd-lua
url = https://git.purrdata.net/jwilkes/pd-lua.git
...@@ -40,13 +40,6 @@ ...@@ -40,13 +40,6 @@
# NOTES: # NOTES:
# The incremental and light builds assume an existing staging area
# (packages/*/build directory) which is *not* cleaned before installing. This
# makes it possible to update the existing staging area after recompiling just
# a part of the system (all but Gem in the case of "incremental", only the
# Pd core and a few essential externals in the case of "light"). Use `make
# clean` beforehand if you want to install into a clean staging area.
# The realclean and dist targets use git commands and thus only work in a # The realclean and dist targets use git commands and thus only work in a
# working copy of the git repo, not in the static tarball snapshots produced # working copy of the git repo, not in the static tarball snapshots produced
# by the dist target. # by the dist target.
...@@ -58,6 +51,30 @@ ...@@ -58,6 +51,30 @@
# installation tree under `packages/linux_make/build` from where it can be # installation tree under `packages/linux_make/build` from where it can be
# copied or packaged up in any desired way. # copied or packaged up in any desired way.
# The incremental and light builds assume an existing staging area
# (packages/*/build directory) which is *not* cleaned before installing. This
# makes it possible to update the existing staging area after recompiling just
# a part of the system (all but Gem in the case of "incremental", only the
# Pd core and a few essential externals in the case of "light"). Use `make
# clean` beforehand if you want to install into a clean staging area.
# When doing a `light` build, which only includes the most essential
# externals, it may be desirable to manually include additional abstractions
# and externals in the build. To these ends, after running `make light` you
# can run `make` with the `foo_abs` or `foo_ext` target, where `foo` is the
# name of the desired abstraction or external, respectively. E.g., you can run
# `make light memento_abs pdlua_ext` to get a light build with the `memento`
# abstraction and the `pdlua` external included. (This will not rebuild the
# Debian package, though, so you'll have to install manually with `make
# install` instead.) The names of the desired addons must be specified as
# given in abstractions/Makefile and externals/Makefile, respectively (look
# for targets looking like `foo_install`). Also note that even though a
# subsequent `make install` will then include your addons, they won't be
# enabled by default, so you'll have to do that manually in Purr Data's
# `Startup` dialog. Simply adding the name of the addon in the `Libraries`
# list should normally do the trick. Or you can add an option like `-lib foo`
# when running Purr Data from the command line.
.PHONY: all incremental checkout clean realclean dist .PHONY: all incremental checkout clean realclean dist
# Installation prefix under which Pd-l2ork is installed (Linux only). If this # Installation prefix under which Pd-l2ork is installed (Linux only). If this
...@@ -79,6 +96,12 @@ incremental: ...@@ -79,6 +96,12 @@ incremental:
light: light:
cd l2ork_addons && $(env) ./tar_em_up.sh -tkl cd l2ork_addons && $(env) ./tar_em_up.sh -tkl
%_abs:
make -C abstractions $(@:%_abs=%_install) DESTDIR=$(firstword $(wildcard $(CURDIR)/packages/*/build)) prefix=$(prefix)
%_ext:
make -C externals $(@:%_ext=%_install) DESTDIR=$(firstword $(wildcard $(CURDIR)/packages/*/build)) prefix=$(prefix)
checkout: checkout:
git submodule update --init git submodule update --init
......
...@@ -113,7 +113,7 @@ Hard drive space required: *roughly 2.5 GB* ...@@ -113,7 +113,7 @@ Hard drive space required: *roughly 2.5 GB*
swh-plugins mcp-plugins cmt blop slv2-jack omins rev-plugins \ swh-plugins mcp-plugins cmt blop slv2-jack omins rev-plugins \
libslv2-dev dssi-utils vco-plugins wah-plugins fil-plugins \ libslv2-dev dssi-utils vco-plugins wah-plugins fil-plugins \
mda-lv2 libmp3lame-dev libspeex-dev libgsl0-dev \ mda-lv2 libmp3lame-dev libspeex-dev libgsl0-dev \
portaudio19-dev python-dev libsmpeg0 libjpeg62-turbo \ portaudio19-dev liblua5.3-dev python-dev libsmpeg0 libjpeg62-turbo \
flite1-dev libgsm1-dev libgtk2.0-dev git libstk0-dev \ flite1-dev libgsm1-dev libgtk2.0-dev git libstk0-dev \
libsndobj-dev libfluidsynth-dev fluid-soundfont-gm byacc libsndobj-dev libfluidsynth-dev fluid-soundfont-gm byacc
...@@ -164,6 +164,7 @@ Hard drive space required: *roughly 2 GB* ...@@ -164,6 +164,7 @@ Hard drive space required: *roughly 2 GB*
brew install libtool brew install libtool
brew install fftw brew install fftw
brew install python brew install python
brew install lua
brew install fluidsynth brew install fluidsynth
brew install lame brew install lame
brew install libvorbis brew install libvorbis
......
...@@ -2,7 +2,7 @@ Source: purr-data ...@@ -2,7 +2,7 @@ Source: purr-data
Section: sound Section: sound
Priority: extra Priority: extra
Maintainer: Albert Graef <aggraef@gmail.com> Maintainer: Albert Graef <aggraef@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, python-dev, dh-python | python-support, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgmerlin-avdec-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libsndobj-dev, libspeex-dev, libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libunicap2-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, python-dev, dh-python | python-support, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgmerlin-avdec-dev, libgsm1-dev, libjpeg-dev, liblua5.3-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libsndobj-dev, libspeex-dev, libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libunicap2-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: https://git.purrdata.net/jwilkes/purr-data Homepage: https://git.purrdata.net/jwilkes/purr-data
......
...@@ -134,7 +134,7 @@ ifeq ($(LIGHT),yes) ...@@ -134,7 +134,7 @@ ifeq ($(LIGHT),yes)
LIB_TARGETS = loaders-libdir pddp LIB_TARGETS = loaders-libdir pddp
INCREMENTAL = yes INCREMENTAL = yes
else else
LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy LIB_TARGETS = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
endif endif
# DISABLED: flatgui # DISABLED: flatgui
...@@ -1404,6 +1404,22 @@ pddp_clean: ...@@ -1404,6 +1404,22 @@ pddp_clean:
make -C $(externals_src)/pddp clean make -C $(externals_src)/pddp clean
#------------------------------------------------------------------------------#
# PDLUA
LUA_CFLAGS = $(shell (pkg-config --cflags lua5.3 || pkg-config --cflags lua5.2 || pkg-config --cflags lua) 2> /dev/null)
LUA_LIBS = $(shell (pkg-config --libs lua5.3 || pkg-config --libs lua5.2 || pkg-config --libs lua) 2> /dev/null)
pdlua:
make -C $(externals_src)/pd-lua LUA_CFLAGS="$(LUA_CFLAGS)" LUA_LIBS="$(LUA_LIBS)" PD_PATH="$(pd_src)" PD_LIB="$(pd_src)/src" CFLAGS="$(CFLAGS)"
pdlua_install:
make -C $(externals_src)/pd-lua DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
pdlua_clean:
make -C $(externals_src)/pd-lua clean
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# PDOGG # PDOGG
pdogg: pdogg:
......
Subproject commit 4816ca85fd1ed52d97acfd4e5a41b0b5ab11b029
...@@ -248,16 +248,7 @@ then ...@@ -248,16 +248,7 @@ then
echo "Pd-L2Ork full installer... IMPORTANT! To ensure you have the most up-to-date submodules, this process requires internet connection to pull sources from various repositories..." echo "Pd-L2Ork full installer... IMPORTANT! To ensure you have the most up-to-date submodules, this process requires internet connection to pull sources from various repositories..."
if [ -d .git ]; then if [ -d .git ]; then
# check if Gem submodule is empty, and if so do first init git submodule update --init
if [ "$(ls -A Gem)" ]; then
git submodule update
#git submodule foreach git pull origin master
else
# init all submodules (only necessary the first time)
git submodule init
git submodule update
#git submodule foreach git pull origin master
fi
fi fi
......
...@@ -76,8 +76,10 @@ ...@@ -76,8 +76,10 @@
<string>disis</string> <string>disis</string>
<key>loadlib35</key> <key>loadlib35</key>
<string>lyonpotpourri</string> <string>lyonpotpourri</string>
<key>loadlib36</key>
<string>pdlua</string>
<key>nloadlib</key> <key>nloadlib</key>
<string>35</string> <string>36</string>
<key>path1</key> <key>path1</key>
<string>/System/Library/Fonts</string> <string>/System/Library/Fonts</string>
<key>path2</key> <key>path2</key>
......
...@@ -35,7 +35,8 @@ loadlib31: iem_anything ...@@ -35,7 +35,8 @@ loadlib31: iem_anything
loadlib32: ekext loadlib32: ekext
loadlib33: disis loadlib33: disis
loadlib34: lyonpotpourri loadlib34: lyonpotpourri
nloadlib: 34 loadlib35: pdlua
nloadlib: 35
path1: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType path1: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
path2: ~/pd-l2ork-externals path2: ~/pd-l2ork-externals
path3: ~/L2Ork/PD/Abstractions path3: ~/L2Ork/PD/Abstractions
...@@ -72,4 +73,5 @@ path33: /usr/lib/pd-l2ork/extra/flext ...@@ -72,4 +73,5 @@ path33: /usr/lib/pd-l2ork/extra/flext
path34: /usr/lib/pd-l2ork/extra/rjlib path34: /usr/lib/pd-l2ork/extra/rjlib
path35: /usr/lib/pd-l2ork/extra/disis path35: /usr/lib/pd-l2ork/extra/disis
path36: /usr/lib/pd-l2ork/extra/lyonpotpourri path36: /usr/lib/pd-l2ork/extra/lyonpotpourri
npath: 36 path37: /usr/lib/pd-l2ork/extra/pdlua
npath: 37
...@@ -184,8 +184,11 @@ Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33; ...@@ -184,8 +184,11 @@ Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib33;
Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey
Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib34; ValueData: lyonpotpourri; Tasks: libs; Flags: uninsdeletekey
Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib35; ValueData: pdlua; Tasks: libs; Flags: uninsdeletekey
Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 34; Tasks: libs; Flags: uninsdeletekey Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: loadlib35; ValueData: pdlua; Tasks: libs; Flags: uninsdeletekey
Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey
Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey
Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey
Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey Root: HKCU; SubKey: SOFTWARE\Purr-Data; ValueType: none; ValueName: loadlib36; Tasks: libs; Flags: uninsdeletekey
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment