From b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Thu, 9 Feb 2023 11:52:03 -0700
Subject: [PATCH] package/pipewire-media-session: bump to version 0.4.2
Explicitly set installed_tests to disabled.
Drop patch which is now upstream.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
---
...remove-session-managers-option-check.patch | 36 -------------------
.../pipewire-media-session.hash | 2 +-
.../pipewire-media-session.mk | 7 ++--
3 files changed, 6 insertions(+), 39 deletions(-)
delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch
diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch
deleted file mode 100644
index fc1d25edb3..0000000000
--- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Wed, 10 Nov 2021 08:54:06 -0700
-Subject: [PATCH] meson: remove session-managers option check.
-
-This option no longer exists and causes a build failure if building
-with the systemd system service enabled.
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24]
----
- systemd/system/meson.build | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/systemd/system/meson.build b/systemd/system/meson.build
-index ab0d49064..0e9885b0f 100644
---- a/systemd/system/meson.build
-+++ b/systemd/system/meson.build
-@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit
- systemd_config = configuration_data()
- systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session')
-
--if get_option('session-managers').contains('media-session')
-- configure_file(input : 'pipewire-media-session.service.in',
-- output : 'pipewire-media-session.service',
-- configuration : systemd_config,
-- install_dir : systemd_system_services_dir)
--endif
-+configure_file(input : 'pipewire-media-session.service.in',
-+ output : 'pipewire-media-session.service',
-+ configuration : systemd_config,
-+ install_dir : systemd_system_services_dir)
---
-2.25.1
-
diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash
index e335fd8913..e6b176eea2 100644
--- a/package/pipewire-media-session/pipewire-media-session.hash
+++ b/package/pipewire-media-session/pipewire-media-session.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2
+sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2
sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING
sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE
diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk
index d349fd7454..cc7317f925 100644
--- a/package/pipewire-media-session/pipewire-media-session.mk
+++ b/package/pipewire-media-session/pipewire-media-session.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1
+PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2
PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2
PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION)
PIPEWIRE_MEDIA_SESSION_LICENSE = MIT
@@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \
pipewire \
$(TARGET_NLS_DEPENDENCIES)
-PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled
+PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \
+ -Ddocs=disabled \
+ -Dtests=disabled \
+ -Dinstalled_tests=disabled
PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa