Merge "Post HH rc1 bump of distro config"

diff --git a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb b/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb
index 7f81481..b8f48ed 100644 (file)
--- a/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb
+++ b/meta-agl-profile-core/recipes-apis/agl-service-radio/agl-service-radio_git.bb
@@ -15,8 +15,5 @@ S  = "${WORKDIR}/git"
 
 # build-time dependencies
 DEPENDS = "rtl-sdr glib-2.0 gstreamer1.0 libusb-compat"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , bb.utils.contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d), d)}"
 
 inherit cmake aglwgt pkgconfig
-
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '-DHAVE_4A_FRAMEWORK=1' , '', d)}"

diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb
index 8e32e3a..674c4e3 100644 (file)
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-multimedia.bb
@@ -11,16 +11,6 @@ PACKAGES = "\
     "
 
 RDEPENDS_${PN} += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '' , bb.utils.contains('DISTRO_FEATURES','pulseaudio','agl-audio-plugin','',d) , d)} \
     alsa-utils \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-misc', '' , d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio bluetooth', '\
-        pulseaudio-module-bluetooth-discover \
-        pulseaudio-module-bluetooth-policy \
-        pulseaudio-module-bluez5-discover \
-        pulseaudio-module-bluez5-device \
-        pulseaudio-module-switch-on-connect \
-        pulseaudio-module-loopback \
-        ','', d)} \
     gstreamer1.0-meta-base \
     "

diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
index f9271c0..6e8ad82 100644 (file)
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
@@ -24,7 +24,7 @@ agl-service-mediascanner \
 agl-service-navigation \
 agl-service-network \
 agl-service-nfc \
-${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', 'agl-service-radio', bb.utils.contains('DISTRO_FEATURES', 'pulseaudio','agl-service-radio','',d), d)} \
+${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \
 agl-service-signal-composer \
 agl-service-steering-wheel \
 agl-service-unicens \

diff --git a/meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb b/meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
index e7fa94f..4f1757c 100644 (file)
--- a/meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
+++ b/meta-agl-profile-graphical/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
@@ -16,5 +16,3 @@ DEPENDS = "json-c gstreamer1.0 gstreamer1.0-plugins-base"
 RDEPENDS_${PN} = "agl-service-mediascanner agl-service-bluetooth gstreamer1.0-plugins-bad-waylandsink"
 
 inherit cmake aglwgt pkgconfig
-
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-audio-4a-framework', '-DHAVE_4A_FRAMEWORK=1' , '', d)}"

diff --git a/templates/feature/agl-ci-change-features-nogfx/included.dep b/templates/feature/agl-ci-change-features-nogfx/included.dep
index 4c443be..759f479 100644 (file)
--- a/templates/feature/agl-ci-change-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-change-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-audio-4a-framework agl-buildstats agl-ptest
\ No newline at end of file
+agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest
\ No newline at end of file

diff --git a/templates/feature/agl-ci-change-features/included.dep b/templates/feature/agl-ci-change-features/included.dep
index 2038c3e..27e9852 100644 (file)
--- a/templates/feature/agl-ci-change-features/included.dep
+++ b/templates/feature/agl-ci-change-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-audio-4a-framework agl-buildstats agl-ptest
+agl-demo agl-devel agl-netboot agl-pipewire agl-buildstats agl-ptest

diff --git a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
index 73804f0..b818483 100644 (file)
--- a/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
+++ b/templates/feature/agl-ci-snapshot-features-nogfx/included.dep
@@ -1 +1 @@
-agl-devel agl-netboot agl-archiver agl-audio-4a-framework agl-buildstats agl-ptest
+agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest

diff --git a/templates/feature/agl-ci-snapshot-features/included.dep b/templates/feature/agl-ci-snapshot-features/included.dep
index 4abe2da..01ef6c8 100644 (file)
--- a/templates/feature/agl-ci-snapshot-features/included.dep
+++ b/templates/feature/agl-ci-snapshot-features/included.dep
@@ -1 +1 @@
-agl-demo agl-devel agl-netboot agl-archiver agl-audio-4a-framework agl-buildstats agl-ptest
+agl-demo agl-devel agl-netboot agl-archiver agl-pipewire agl-buildstats agl-ptest