diff options
| -rw-r--r-- | meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-avb-fix-compilation-on-big-endian.patch | 53 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.57.bb (renamed from meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb) | 12 |
2 files changed, 5 insertions, 60 deletions
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-avb-fix-compilation-on-big-endian.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-avb-fix-compilation-on-big-endian.patch deleted file mode 100644 index fc618b4a7c..0000000000 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-avb-fix-compilation-on-big-endian.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001 -From: Wim Taymans <wtaymans@redhat.com> -Date: Tue, 19 Jul 2022 13:49:42 +0200 -Subject: [PATCH 001/113] avb: fix compilation on big endian - -Patch-Status: Backport - ---- - src/modules/module-avb/aaf.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/module-avb/aaf.h b/src/modules/module-avb/aaf.h -index cb4871ca6..b444ce251 100644 ---- a/src/modules/module-avb/aaf.h -+++ b/src/modules/module-avb/aaf.h -@@ -35,7 +35,7 @@ struct avb_packet_aaf { - unsigned gv:1; - unsigned tv:1; - -- uint8_t seq_number; -+ uint8_t seq_num; - - unsigned _r2:7; - unsigned tu:1; -diff --git a/src/modules/module-avb/iec61883.h b/src/modules/module-avb/iec61883.h -index d3b3a7daa..6ca8724ad 100644 ---- a/src/modules/module-avb/iec61883.h -+++ b/src/modules/module-avb/iec61883.h -@@ -37,7 +37,7 @@ struct avb_packet_iec61883 { - unsigned gv:1; - unsigned tv:1; - -- uint8_t seq_number; -+ uint8_t seq_num; - - unsigned _r2:7; - unsigned tu:1; -diff --git a/spa/plugins/avb/avbtp/packets.h b/spa/plugins/avb/avbtp/packets.h -index 7047456bf..3d4a652ee 100644 ---- a/spa/plugins/avb/avbtp/packets.h -+++ b/spa/plugins/avb/avbtp/packets.h -@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf { - unsigned gv:1; - unsigned tv:1; - -- uint8_t seq_number; -+ uint8_t seq_num; - - unsigned _r2:7; - unsigned tu:1; --- -2.34.1 - diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.57.bb index feefe7c151..0ca8fd0dc4 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.56.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.57.bb @@ -13,11 +13,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "f274e53d25ee8f483ac6fce9e516bb1830abe88b" -SRC_URI = " \ - git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https \ - file://0001-avb-fix-compilation-on-big-endian.patch \ -" +SRCREV = "49f1c2038fb7b5249affa56709b117a2a8603b52" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -86,7 +83,7 @@ BLUETOOTH_AAC = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'b PACKAGECONFIG:class-target ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez ${BLUETOOTH_AAC}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ ${PIPEWIRE_SESSION_MANAGER} \ @@ -102,6 +99,7 @@ PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-al PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" +PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire" @@ -248,7 +246,7 @@ CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" FILES:${PN} = " \ ${datadir}/pipewire \ ${systemd_system_unitdir}/pipewire* \ - ${systemd_user_unitdir}/pipewire* \ + ${systemd_user_unitdir} \ ${bindir}/pipewire \ ${bindir}/pipewire-avb \ " |