diff --git a/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch b/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch deleted file mode 100644 index 445cab08bd..0000000000 --- a/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 30 Sep 2021 11:12:27 +0200 -Subject: [PATCH] cpu: fix compilation on ARM - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -f8817b439433798bd7217dc4ae72197887b0fc96] ---- - spa/plugins/support/cpu-arm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c -index d80b8ad87..de07ebf41 100644 ---- a/spa/plugins/support/cpu-arm.c -+++ b/spa/plugins/support/cpu-arm.c -@@ -80,7 +80,7 @@ arm_init(struct impl *impl) - int arch; - - if (!(cpuinfo = get_cpuinfo())) { -- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl); -+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl); - return 1; - } - --- -2.25.1 - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 879cfa41cb..7894939b0d 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f4ae272e8d3fa3ff6a6ba2a465d1f951405b08fd31bbb82c27bb7cf55e113ba1 pipewire-0.3.38.tar.bz2 +sha256 fafcde675b264485883df1f3bf7e08f36fd1d661ecc092dcec6fd35a059c2aff pipewire-0.3.39.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 272cd046aa..f376f3c276 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,13 +4,13 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.38 +PIPEWIRE_VERSION = 0.3.39 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver) PIPEWIRE_LICENSE_FILES = COPYING LICENSE PIPEWIRE_INSTALL_STAGING = YES -PIPEWIRE_DEPENDENCIES = host-pkgconf dbus $(TARGET_NLS_DEPENDENCIES) +PIPEWIRE_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) PIPEWIRE_CONF_OPTS += \ -Ddocs=disabled \ @@ -28,6 +28,13 @@ PIPEWIRE_CONF_OPTS += \ -Dvideotestsrc=enabled \ -Dvolume=enabled +ifeq ($(BR2_PACKAGE_DBUS),y) +PIPEWIRE_CONF_OPTS += -Ddbus=enabled +PIPEWIRE_DEPENDENCIES += dbus +else +PIPEWIRE_CONF_OPTS += -Ddbus=disabled +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) PIPEWIRE_CONF_OPTS += -Dudev=enabled PIPEWIRE_DEPENDENCIES += udev @@ -106,9 +113,9 @@ PIPEWIRE_DEPENDENCIES += ncurses endif ifeq ($(BR2_PACKAGE_PIPEWIRE_V4L2),y) -PIPEWIRE_CONF_OPTS += -Dv4l2=enabled +PIPEWIRE_CONF_OPTS += -Dpipewire-v4l2=enabled -Dv4l2=enabled else -PIPEWIRE_CONF_OPTS += -Dv4l2=disabled +PIPEWIRE_CONF_OPTS += -Dpipewire-v4l2=disabled -Dv4l2=disabled endif ifeq ($(BR2_PACKAGE_LIBCAMERA)$(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_HAS_UDEV),yyy)