diff --git a/README b/README index 91482f8..ccc5392 100644 --- a/README +++ b/README @@ -145,6 +145,10 @@ URI: git://github.com/schnitzeltony/meta-qt5-extra.git branch: master revision: HEAD +URI: git://github.com/schnitzeltony/meta-musician.git +branch: master +revision: HEAD + URI: git://github.com/schnitzeltony/meta-office.git branch: master revision: HEAD diff --git a/recipes-image/packagegroups/packagegroup-gui-full.bb b/recipes-image/packagegroups/packagegroup-gui-full.bb index c6df293..628f4a6 100644 --- a/recipes-image/packagegroups/packagegroup-gui-full.bb +++ b/recipes-image/packagegroups/packagegroup-gui-full.bb @@ -8,8 +8,6 @@ MACHINE_SPECIFICS_FULL = "" MACHINE_SPECIFICS_FULL_mx6 = "gstreamer1.0-plugins-imx" RDEPENDS_${PN} = " \ - packagegroup-gui-music \ - \ source-han-sans-cn-fonts \ source-han-sans-kr-fonts \ source-han-sans-jp-fonts \ @@ -52,8 +50,10 @@ RDEPENDS_${PN} = " \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-retro', 'mame dosbox z80 vice stella opentyrian d1x-rebirth', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'games-layer', 'pingus supertux2 freeciv wesnoth-all astromenace chromium-bsu maelstrom', '', d)} \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-musicians', 'packagegroup-gui-musicians', '', d)} \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'sdr-layer', 'packagegroup-sdr-python-extended packagegroup-sdr-gnuradio-base packagegroup-sdr-gnuradio-extended packagegroup-sdr-rtlsdr packagegroup-sdr-uhd', '', d)} \ + \ " # firefox diff --git a/recipes-image/packagegroups/packagegroup-gui-music.bb b/recipes-image/packagegroups/packagegroup-gui-musicians.bb similarity index 77% rename from recipes-image/packagegroups/packagegroup-gui-music.bb rename to recipes-image/packagegroups/packagegroup-gui-musicians.bb index d142143..0c66481 100644 --- a/recipes-image/packagegroups/packagegroup-gui-music.bb +++ b/recipes-image/packagegroups/packagegroup-gui-musicians.bb @@ -1,11 +1,13 @@ -SUMMARY = "All packages required for a music image" +SUMMARY = "All packages required for musician image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit packagegroup RDEPENDS_${PN} = " \ - meta-qt5-extra-music-world \ + musicians-world \ + mixxx \ + qmmp \ alsa-utils alsa-utils-scripts \ jack-utils \ pulseaudio-module-alsa-card \ @@ -15,4 +17,5 @@ RDEPENDS_${PN} = " \ sox \ a2jmidid \ fluidsynth-bin \ + xfce4-mixer \ " diff --git a/recipes-image/xfce4/xfce4-music-image.bb b/recipes-image/xfce4/xfce4-music-image.bb index b3db98d..25d81e9 100644 --- a/recipes-image/xfce4/xfce4-music-image.bb +++ b/recipes-image/xfce4/xfce4-music-image.bb @@ -8,7 +8,7 @@ XFCE_DM = "sddm sddm-morona-autologin" IMAGE_FEATURES += "volatile-log" IMAGE_INSTALL += " \ - packagegroup-gui-music \ + packagegroup-gui-musicians \ \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libreoffice', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'browser-layer', 'chromium-x11', '', d)} \