pipewire: upgrade 0.2.7 -> 0.3.1
PATCH 1/2 pipewire: upgrade 0.2.7 -> 0.3.1
* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES or if not available by pipewire's defaults
* vulkan was disabled for now
--- .../pipewire/pipewire-0.2_git.bb | 65 +++++++++++++++++++ .../pipewire/pipewire_git.bb | 32 +++++---- 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb
meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb new file +65 -0
@@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <[email protected]>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +"
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +21 -11
@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans <[email protected]>" HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire"
@@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ + jack gstreamer \ " -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +# disable vulkan fo now +EXTRA_OEMESON = "-Dvulkan=false" + +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" PACKAGES =+ "\ ${PN}-spa-plugins \
@@ -33,28 +40,31 @@ PACKAGES =+ "\ gstreamer1.0-${PN} \ lib${PN} \ lib${PN}-modules \ + lib${PN}-jack \ " RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" FILES_${PN} = "\ ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pw-* \ ${bindir}/pipewire* \ ${systemd_user_unitdir}/* \ " FILES_lib${PN} = "\ ${libdir}/libpipewire-*.so.* \ + ${libdir}/libjack-*.so.* \ + ${libdir}/libpulse-*.so.* \ " FILES_lib${PN}-modules = "\ ${libdir}/pipewire-*/* \ " FILES_${PN}-spa-plugins = "\ ${bindir}/spa-* \ - ${libdir}/spa/* \ + ${libdir}/spa-*/* \ " FILES_${PN}-alsa = "\ ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ " FILES_gstreamer1.0-${PN} = "\ ${libdir}/gstreamer-1.0/* \
Signature · 1 line
2.21.1
PATCH 2/2 mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop]
--- meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb +1 -1
@@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2" PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
Signature · 1 line
2.21.1
We need something like below patch to get it going on mips/x86
Quoted 177 lines · Andreas Müller
* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen byDISTRO_FEATURESor if not available by pipewire's defaults
* vulkan was disabled for nowSigned-off-by Andreas Müller <[email protected]>--- .../pipewire/pipewire-0.2_git.bb | 65 +++++++++++++++++++ .../pipewire/pipewire_git.bb | 32 +++++---- 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bbmeta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb new file +65
-0@@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <[email protected]>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +21
-12@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans <[email protected]>" HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire"@@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ + jack gstreamer \ " -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +# disable vulkan fo now +EXTRA_OEMESON = "-Dvulkan=false" + +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" PACKAGES =+ "\ ${PN}-spa-plugins \@@ -33,28 +40,31 @@ PACKAGES =+ "\ gstreamer1.0-${PN} \ lib${PN} \ lib${PN}-modules \ + lib${PN}-jack \ " RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" FILES_${PN} = "\ ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pw-* \ ${bindir}/pipewire* \ ${systemd_user_unitdir}/* \ " FILES_lib${PN} = "\ ${libdir}/libpipewire-*.so.* \ + ${libdir}/libjack-*.so.* \ + ${libdir}/libpulse-*.so.* \ " FILES_lib${PN}-modules = "\ ${libdir}/pipewire-*/* \ " FILES_${PN}-spa-plugins = "\ ${bindir}/spa-* \ - ${libdir}/spa/* \ + ${libdir}/spa-*/* \ " FILES_${PN}-alsa = "\ ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ " FILES_gstreamer1.0-${PN} = "\ ${libdir}/gstreamer-1.0/* \ --2.21.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 111 lines · Andreas Müller
* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen byDISTRO_FEATURESor if not available by pipewire's defaults
* vulkan was disabled for nowSigned-off-by Andreas Müller <[email protected]>--- .../pipewire/pipewire-0.2_git.bb | 65 +++++++++++++++++++ .../pipewire/pipewire_git.bb | 32 +++++---- 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bbmeta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb new file +65
-0@@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <[email protected]>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +5
-5@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans <[email protected]>" HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire"
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb S = "${WORKDIR}/git" · line 22
Quoted 7 lines
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +2
-2@@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \
Perhaps add vulkan as packageconfig too here. I am seeing
WARNING: pipewire-0.3.1-r0 do_configure: QA Issue: pipewire: invalid
PACKAGECONFIG: vulkan [invalid-packageconfig]
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb S = "${WORKDIR}/git" · line 28
Quoted 8 lines
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +4
-2+ jack gstreamer \ " -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +# disable vulkan fo now +EXTRA_OEMESON = "-Dvulkan=false" +
This should be turned into PACKAGECONFIG
Quoted 51 lines
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +10
-3+PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" PACKAGES =+ "\ ${PN}-spa-plugins \@@ -33,28 +40,31 @@ PACKAGES =+ "\ gstreamer1.0-${PN} \ lib${PN} \ lib${PN}-modules \ + lib${PN}-jack \ " RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" FILES_${PN} = "\ ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pw-* \ ${bindir}/pipewire* \ ${systemd_user_unitdir}/* \ " FILES_lib${PN} = "\ ${libdir}/libpipewire-*.so.* \ + ${libdir}/libjack-*.so.* \ + ${libdir}/libpulse-*.so.* \ " FILES_lib${PN}-modules = "\ ${libdir}/pipewire-*/* \ " FILES_${PN}-spa-plugins = "\ ${bindir}/spa-* \ - ${libdir}/spa/* \ + ${libdir}/spa-*/* \ " FILES_${PN}-alsa = "\ ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ " FILES_gstreamer1.0-${PN} = "\ ${libdir}/gstreamer-1.0/* \ --2.21.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 123 lines · Khem Raj
Quoted 111 lines · Andreas Müller
* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen byDISTRO_FEATURESor if not available by pipewire's defaults
* vulkan was disabled for nowSigned-off-by Andreas Müller <[email protected]>--- .../pipewire/pipewire-0.2_git.bb | 65 +++++++++++++++++++ .../pipewire/pipewire_git.bb | 32 +++++---- 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bbmeta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb new file +65
-0@@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <[email protected]>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +5
-5@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans <[email protected]>" HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb S = "${WORKDIR}/git" · line 22
Quoted 7 lines
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +2
-2@@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \Perhaps add vulkan as packageconfig too here. I am seeing
Quoted 2 lines
WARNING: pipewire-0.3.1-r0
do_configure: QA Issue: pipewire: invalid
PACKAGECONFIG: vulkan [invalid-packageconfig]
As you can see I played around with vulkan PACKAGECONFIG but forgot to remove it's usage. The reasons I decided to disable it by default are
* I am not sure what to (r)depend it needs - there is no virtual/vulkan. Is it vulkan-loader as gstreamer1.0-plugins-bad does?
* Have no machine to test
* Would take me huge amount of build time - and for me it is just an optional dependency for mutter (that I never used yet)
So what do you prefer:
* keep disabled (as soon as sombody wants vulkan here he/she/it can take care)
* add untested PACKAGECONFIG (with vulkan-loader in DEPENDS field?)
Cheers
Andreas
Quoted 5 lines · Andreas Müller
Quoted 3 lines · Khem Raj
Quoted 1 line · Andreas Müller
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
* as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2
* license was changed to MIT
* additional PACKAGECONFIGs added. The defaults were chosen byDISTRO_FEATURESor if not available by pipewire's defaults
* vulkan was disabled for now
perhaps a packageconfig with disabled default explicitly
Quoted 133 lines
Quoted 113 lines
Quoted 103 lines
Signed-off-by Andreas Müller <[email protected]>--- .../pipewire/pipewire-0.2_git.bb | 65 +++++++++++++++++++ .../pipewire/pipewire_git.bb | 32 +++++---- 2 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bbmeta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb new file +65
-0@@ -0,0 +1,65 @@ +SUMMARY = "Multimedia processing server for Linux" +AUTHOR = "Wim Taymans <[email protected]>" +HOMEPAGE = "https://pipewire.org" +SECTION = "multimedia" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" +DEPENDS = "alsa-lib dbus udev" +SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" +PV = "0.2.7" + +SRC_URI = "git://github.com/PipeWire/pipewire" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd manpages + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gstreamer \ +" + +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" + +PACKAGES =+ "\ + ${PN}-spa-plugins \ + ${PN}-alsa \ + ${PN}-config \ + gstreamer1.0-${PN} \ + lib${PN} \ + lib${PN}-modules \ +" + +RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" + +FILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pipewire* \ + ${systemd_user_unitdir}/* \ +" +FILES_lib${PN} = "\ + ${libdir}/libpipewire-*.so.* \ +" +FILES_lib${PN}-modules = "\ + ${libdir}/pipewire-*/* \ +" +FILES_${PN}-spa-plugins = "\ + ${bindir}/spa-* \ + ${libdir}/spa/* \ +" +FILES_${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ +" +FILES_gstreamer1.0-${PN} = "\ + ${libdir}/gstreamer-1.0/* \ +" + +CONFFILES_${PN} = "\ + ${sysconfdir}/pipewire/pipewire.conf \ +"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +5
-5@@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans <[email protected]>" HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire"meta-oe/recipes-multimedia/pipewire/pipewire_git.bb S = "${WORKDIR}/git" · line 22
Quoted 7 lines
meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +2
-2@@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \Perhaps add vulkan as packageconfig too here. I am seeing
Quoted 2 lines
WARNING: pipewire-0.3.1-r0
do_configure: QA Issue: pipewire: invalid
PACKAGECONFIG: vulkan [invalid-packageconfig]As you can see I played around with vulkan PACKAGECONFIG but forgot to remove it's usage. The reasons I decided to disable it by default are
* I am not sure what to (r)depend it needs - there is no virtual/vulkan. Is it vulkan-loader as gstreamer1.0-plugins-bad does?
* Have no machine to test
* Would take me huge amount of build time - and for me it is just an optional dependency for mutter (that I never used yet)So what do you prefer:
* keep disabled (as soon as sombody wants vulkan here he/she/it can take care)
* add untested PACKAGECONFIG (with vulkan-loader in DEPENDS field?)Cheers
Andreas