Skip to content

Commit

Permalink
Update mod packages
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Jan 7, 2024
1 parent 34f2f35 commit bf7edd2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 145 deletions.
151 changes: 9 additions & 142 deletions mod-os/buildroot/mod-os-config.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,151 +3,18 @@ index 2a74752..a161e66 100644
--- a/.common
+++ b/.common
@@ -103,7 +103,7 @@ BUILDROOT_LINK=http://buildroot.uclibc.org/downloads/
BUILDROOT_VERSION=buildroot-2016.02
BUILDROOT_FILE=${BUILDROOT_VERSION}.tar.bz2
BUILDROOT_LINK=http://buildroot.uclibc.org/downloads/
BUILDROOT_FILE=${BUILDROOT_VERSION}.tar.${BUILDROOT_TAR_EXT}

-SOURCE_DIR=$("${readlink}" -f $(dirname $0))
-SOURCE_DIR=$("${readlink}" -f $(dirname ${0}))
+SOURCE_DIR=${HOME}/mod-plugin-builder
BR2_MAKE="make O=${WORKDIR}/${PLATFORM} BR2_EXTERNAL=${SOURCE_DIR}/plugins-dep"
BR2_EXTERNAL=${SOURCE_DIR}/${BR2_BUILD_CONFIG}
BR2_MAKE="make O=${WORKDIR}/${PLATFORM} BR2_EXTERNAL=${BR2_EXTERNAL} BR2_EXTERNAL_PLUGINS_DEP=${BR2_EXTERNAL} BR2_PLATFORM=${BR2_PLATFORM}"
BR2_TARGET=${WORKDIR}/${PLATFORM}/target

diff --git a/plugins-dep/configs/modduox-new_defconfig b/plugins-dep/configs/modduox-new_defconfig
index d3dcc17..9e69152 100644
--- a/plugins-dep/configs/modduox-new_defconfig
+++ b/plugins-dep/configs/modduox-new_defconfig
@@ -14,22 +14,20 @@ BR2_TARGET_OPTIMIZATION="-mcpu=cortex-a53 -mtune=cortex-a53 -mfix-cortex-a53-835
BR2_TARGET_LDFLAGS="-Wl,-O1,--as-needed,--strip-all"
BR2_TARGET_GENERIC_HOSTNAME=""
BR2_TARGET_GENERIC_ISSUE=""
-BR2_INIT_NONE=y
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
+BR2_INIT_SYSTEMD=y
BR2_ROOTFS_DEVICE_TABLE=""
-BR2_ROOTFS_STATIC_DEVICE_TABLE=""
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="/tmp/skeleton"
-# BR2_PACKAGE_BUSYBOX is not set
+BR2_TARGET_GENERIC_ROOT_PASSWD="mod"
+# BR2_TARGET_GENERIC_GETTY is not set
+# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+BR2_PACKAGE_BUSYBOX_CONFIG="${HOME}/busybox.config"
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_ICU=y
-BR2_PACKAGE_ALSA_LIB=y
BR2_PACKAGE_AUDIOFILE=y
BR2_PACKAGE_LIBLO=y
-BR2_PACKAGE_LIBSAMPLERATE=y
-BR2_PACKAGE_CAIRO=y
-BR2_PACKAGE_CAIRO_PNG=y
BR2_PACKAGE_NE10=y
BR2_PACKAGE_LIBXML2=y
BR2_PACKAGE_MXML=y
@@ -58,12 +56,12 @@ BR2_PACKAGE_BOOST_TIMER=y
BR2_PACKAGE_BOOST_WAVE=y
BR2_PACKAGE_EIGEN=y
BR2_PACKAGE_FFTW=y
-BR2_PACKAGE_FFTW_DOUBLE=y
BR2_PACKAGE_FFTW_FAST=y
BR2_PACKAGE_GLIBMM=y
+BR2_PACKAGE_BASH=y
BR2_PACKAGE_ACL=y
-BR2_PACKAGE_UTIL_LINUX=y
-BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
+BR2_PACKAGE_UTIL_LINUX_KILL=y
+BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_DPF=y
BR2_PACKAGE_FLUIDSYNTH=y
@@ -71,10 +69,14 @@ BR2_PACKAGE_KXSTUDIO_LV2_EXTENSIONS=y
BR2_PACKAGE_LIBGIG=y
BR2_PACKAGE_LIBMODLA=y
BR2_PACKAGE_LIBPD=y
-BR2_PACKAGE_LILV=y
BR2_PACKAGE_LVTK=y
BR2_PACKAGE_LVTK_1=y
BR2_PACKAGE_MOD_LV2_EXTENSIONS=y
BR2_PACKAGE_MOD_PLUGIN_BUILDER=y
BR2_PACKAGE_ZITA_CONVOLVER=y
BR2_PACKAGE_ZITA_RESAMPLER=y
+BR2_PACKAGE_BROWSEPY=y
+BR2_PACKAGE_MOD_MIDI_MERGER=y
+BR2_PACKAGE_MOD_PEAKMETER=y
+BR2_PACKAGE_MOD_UI=y
+BR2_PACKAGE_MOD_XRUN=y
diff --git a/plugins-dep/configs/raspberrypi4_defconfig b/plugins-dep/configs/raspberrypi4_defconfig
index e042b87..27cec64 100644
--- a/plugins-dep/configs/raspberrypi4_defconfig
+++ b/plugins-dep/configs/raspberrypi4_defconfig
@@ -15,21 +15,19 @@ BR2_TARGET_OPTIMIZATION="-mcpu=cortex-a72 -mtune=cortex-a72 -ffast-math -fno-fin
BR2_TARGET_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--strip-all"
BR2_TARGET_GENERIC_HOSTNAME=""
BR2_TARGET_GENERIC_ISSUE=""
-BR2_INIT_NONE=y
-BR2_ROOTFS_DEVICE_CREATION_STATIC=y
+BR2_INIT_SYSTEMD=y
BR2_ROOTFS_DEVICE_TABLE=""
-BR2_ROOTFS_STATIC_DEVICE_TABLE=""
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="/tmp/skeleton"
-# BR2_PACKAGE_BUSYBOX is not set
+BR2_TARGET_GENERIC_ROOT_PASSWD="mod"
+# BR2_TARGET_GENERIC_GETTY is not set
+# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+BR2_PACKAGE_BUSYBOX_CONFIG="${HOME}/busybox.config"
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_ICU=y
-BR2_PACKAGE_ALSA_LIB=y
BR2_PACKAGE_LIBLO=y
-BR2_PACKAGE_LIBSAMPLERATE=y
-BR2_PACKAGE_CAIRO=y
-BR2_PACKAGE_CAIRO_PNG=y
BR2_PACKAGE_NE10=y
BR2_PACKAGE_LIBXML2=y
BR2_PACKAGE_MXML=y
@@ -58,12 +56,12 @@ BR2_PACKAGE_BOOST_TIMER=y
BR2_PACKAGE_BOOST_WAVE=y
BR2_PACKAGE_EIGEN=y
BR2_PACKAGE_FFTW=y
-BR2_PACKAGE_FFTW_DOUBLE=y
BR2_PACKAGE_FFTW_FAST=y
BR2_PACKAGE_GLIBMM=y
+BR2_PACKAGE_BASH=y
BR2_PACKAGE_ACL=y
-BR2_PACKAGE_UTIL_LINUX=y
-BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
+BR2_PACKAGE_UTIL_LINUX_KILL=y
+BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_DPF=y
BR2_PACKAGE_FLUIDSYNTH=y
@@ -71,10 +69,14 @@ BR2_PACKAGE_JUCE6=y
BR2_PACKAGE_KXSTUDIO_LV2_EXTENSIONS=y
BR2_PACKAGE_LIBGIG=y
BR2_PACKAGE_LIBPD=y
-BR2_PACKAGE_LILV=y
BR2_PACKAGE_LVTK=y
BR2_PACKAGE_LVTK_1=y
BR2_PACKAGE_MOD_LV2_EXTENSIONS=y
BR2_PACKAGE_MOD_PLUGIN_BUILDER=y
BR2_PACKAGE_ZITA_CONVOLVER=y
BR2_PACKAGE_ZITA_RESAMPLER=y
+BR2_PACKAGE_BROWSEPY=y
+BR2_PACKAGE_MOD_MIDI_MERGER=y
+BR2_PACKAGE_MOD_PEAKMETER=y
+BR2_PACKAGE_MOD_UI=y
+BR2_PACKAGE_MOD_XRUN=y
diff --git a/plugins-dep/configs/x86_64_defconfig b/plugins-dep/configs/x86_64_defconfig
index 7a40fe1..d40ba26 100644
--- a/plugins-dep/configs/x86_64_defconfig
+++ b/plugins-dep/configs/x86_64_defconfig
--- a/plugins-dep/configs/generic-x86_64_defconfig
+++ b/plugins-dep/configs/generic-x86_64_defconfig
@@ -15,22 +15,20 @@ BR2_TARGET_OPTIMIZATION="-mtune=generic -msse -msse2 -mfpmath=sse -ffast-math -f
BR2_TARGET_LDFLAGS="-Wl,-O1,--as-needed,--strip-all"
BR2_TARGET_GENERIC_HOSTNAME=""
Expand Down Expand Up @@ -194,11 +61,11 @@ index 7a40fe1..d40ba26 100644
+BR2_TARGET_ROOTFS_EXT2=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_CARLA_BACKEND=y
BR2_PACKAGE_DPF=y
BR2_PACKAGE_FLUIDSYNTH=y
@@ -71,10 +69,14 @@ BR2_PACKAGE_FLUIDSYNTH=y
BR2_PACKAGE_FLUIDSYNTH=y
BR2_PACKAGE_KXSTUDIO_LV2_EXTENSIONS=y
BR2_PACKAGE_LIBGIG=y
BR2_PACKAGE_LIBPD=y
-BR2_PACKAGE_LILV=y
BR2_PACKAGE_LVTK=y
BR2_PACKAGE_LVTK_1=y
Expand Down
2 changes: 1 addition & 1 deletion mod-os/buildroot/packages/mod-host/mod-host.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
######################################

MOD_HOST_VERSION = f36bce78eed80f4f7194c923afd4dcae2c80bc79
MOD_HOST_VERSION = 2b7fee0772dfcf11ff129f00bd9ab1de2a7f4af9
MOD_HOST_SITE = $(call github,moddevices,mod-host,$(MOD_HOST_VERSION))
MOD_HOST_DEPENDENCIES = jack2mod lilv readline fftw-single fftw-double

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
######################################

MOD_MIDI_MERGER_VERSION = c3b9432af9a1249c1a4ef77904913825cf1a50a5
MOD_MIDI_MERGER_VERSION = c10f5bb9151c654afdfdec6fd395539bb03eabe1
MOD_MIDI_MERGER_SITE = $(call github,moddevices,mod-midi-merger,$(MOD_MIDI_MERGER_VERSION))
MOD_MIDI_MERGER_DEPENDENCIES = jack2mod

Expand Down
2 changes: 1 addition & 1 deletion mod-os/buildroot/packages/mod-ui/mod-ui.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
######################################

MOD_UI_VERSION = 43c204a397cf12f25654381893f59304ceec32a5
MOD_UI_VERSION = c5e4f5d10cfd5d696b99ee338598948527f7f11b
MOD_UI_SITE = $(call github,moddevices,mod-ui,$(MOD_UI_VERSION))
MOD_UI_DEPENDENCIES = python3 python-aggdraw python-pillow python-pycrypto python-pystache python-setuptools python-serial python-tornado host-python3 jack-capture jack2mod lilv mod-host
MOD_UI_SETUP_TYPE = distutils
Expand Down

0 comments on commit bf7edd2

Please sign in to comment.