From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 6Id8O6ZIQmP0KgAAbAwnHQ (envelope-from ) for ; Sun, 09 Oct 2022 06:05:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OMysOqZIQmM4CAAAG6o9tA (envelope-from ) for ; Sun, 09 Oct 2022 06:05:58 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B0FF41DAC1 for ; Sun, 9 Oct 2022 06:05:58 +0200 (CEST) Received: from localhost ([::1]:47986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohNZd-00036I-S9 for larch@yhetil.org; Sun, 09 Oct 2022 00:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohNXo-0002Vp-GY for guix-patches@gnu.org; Sun, 09 Oct 2022 00:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohNXo-0005K6-89 for guix-patches@gnu.org; Sun, 09 Oct 2022 00:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohNXn-0004Sw-VL for guix-patches@gnu.org; Sun, 09 Oct 2022 00:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH v3 1/6] gnu: pipewire: Remove pipewire 0.2. Resent-From: 'Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Oct 2022 04:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54379 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54379@debbugs.gnu.org Cc: Kevin Boulain , Maxime Devos , Brendan Tildesley Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.166528818917067 (code B ref 54379); Sun, 09 Oct 2022 04:04:03 +0000 Received: (at 54379) by debbugs.gnu.org; 9 Oct 2022 04:03:09 +0000 Received: from localhost ([127.0.0.1]:41758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohNWq-0004Qs-Ih for submit@debbugs.gnu.org; Sun, 09 Oct 2022 00:03:08 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:58582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohNWk-0004Pg-9O for 54379@debbugs.gnu.org; Sun, 09 Oct 2022 00:03:02 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4MlT0S2mxcz9sTh; Sun, 9 Oct 2022 06:02:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1665288168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w7WKOG8cTjat4rrSt4XtXVSgkbFllB7Kj1YKCpU/Z+0=; b=XlZVvsTfeKqVK3UTnmuuw939ls+K+L0P6sGZcIosTS3ifjFw4wASXJjTB3ohJBnx9bvnCy QcvVYsvmD69VZrBSkfKDmoKoZCp9+4nF9T0pobGQGZxSuFCVGm/4ku8DQ9ZRr7xkPLANBx LjzFisJ9OFw7Cpp4u6G4ayVUgb9i9gzi/XUMpZC0IQdA/WBg8vfVAx13RdZbYHgQkfxUge V9MevcyataFIRkPtGTwBRulkZSDSkvtg47m/GfXy82BjYGnqjxVPdmz4b7KeAjLH/7TAcG SKN+4HYDrlLXl5+VPs2P7Z7SEL4CZmcLKla85nObgjiZeYksmScjtnUrKAaDDw== From: 'Brendan Tildesley Date: Sun, 9 Oct 2022 15:02:18 +1100 Message-Id: <20221009040223.1901-2-mail@brendan.scot> In-Reply-To: <20221009040223.1901-1-mail@brendan.scot> References: <20221009040223.1901-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665288358; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=w7WKOG8cTjat4rrSt4XtXVSgkbFllB7Kj1YKCpU/Z+0=; b=PpbqmfeimEw0DyF5MT9GoWGb/X9j5qc+2Iqwa61fvSePNSLDy2PdCEnRY6pC9Rp+VabZH9 9Sfz7kEE7QJxTqgFWkfLh+g5laodRIV9e1Nt33w8nTLjY2Jg2ILpG1E9SZs9ihMIE1tLJn mkgE7XnK4ribsXmFJ4Gkt7DOro3Ud31E7SqnxIPsCRJ9dy9+OhnlRcYoQyjsF1hKH1sbbt bMCRj01Yi01lFDfRbLR4ZoE75Cs7BNbbQoKilnTgXxnlxkbKWnrT99ExcSVSLZjEpnCalo SZDsh/wwilnb49g3TLQf+lxkyvQ6DukTc/gjNUZqB2dNs0l5yNBngXhNkzXSNQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665288358; a=rsa-sha256; cv=none; b=EblxLL4PfiuXdC36ENagm/Qbm/JkXSDxv0xsgsnzutZm00gzRjjCf0h7kzWBPBXhvWFAYB PinUt96XkjAruIif/Hb6FYZO/PduawQ6QgoRFjGghkYs/vr0L+8P8XwTOrkA0M0SbVzOoJ /EeOKV96cac/2VBFKhKYvJfXfOjA9X7czC1oYZuMMJICJmWJjlZat1sdLuDWm1G6/UBRfL nthNv7tZStv9Tfh+1nvpspPRgSY/VDa4C/NsP95xJ5nUvF24R2+3l6RuS20g2A2UF8Pb7L H3Bh/74evhZRqzcY2/i0ijP0a6qw/TMltwfC2mD8Sme5oDDOU+l4DzlzYhfpsQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=XlZVvsTf; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=XlZVvsTf; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B0FF41DAC1 X-Spam-Score: 3.51 X-Migadu-Scanner: scn1.migadu.com X-TUID: R2/I67bYKpfm From: Brendan Tildesley * gnu/packages/linux.scm: Remove pipewire. Rename pipewire-0.3 to pipewire. It may cause a rebuild due to sorting theinput list. * gnu/packages/audio.scm: Replace all instances of pipewire-0.3 -> pipewire * gnu/packages/video.scm: Same as above. --- gnu/packages/audio.scm | 2 +- gnu/packages/chromium.scm | 2 +- gnu/packages/freedesktop.scm | 6 +-- gnu/packages/gnome.scm | 4 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/linux.scm | 78 ++++++++++++-------------------- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 8 files changed, 38 insertions(+), 60 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f57c22240a..c37532e77b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5862,7 +5862,7 @@ (define-public qpwgraph (arguments (list #:tests? #f)) ;; no tests (inputs (list alsa-lib libxkbcommon - pipewire-0.3 + pipewire qtbase qtsvg)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 0559f60c5f..4244eac381 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -963,7 +963,7 @@ (define-public ungoogled-chromium opus+custom pango pciutils - pipewire-0.3 + pipewire pulseaudio re2 snappy diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ab37f04bef..c30e8c62d1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1203,7 +1203,7 @@ (define-public weston mtdev linux-pam pango - pipewire-0.3 + pipewire wayland-protocols-next xorg-server-xwayland)) (propagated-inputs @@ -2454,7 +2454,7 @@ (define-public xdg-desktop-portal ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse-3))) (arguments `(#:configure-flags @@ -2586,7 +2586,7 @@ (define-public xdg-desktop-portal-wlr grim iniparser libinih - pipewire-0.3 + pipewire slurp wayland wayland-protocols)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f44bd6a39..fc6997e34d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7999,7 +7999,7 @@ (define-public mutter ;; theme to please libxcursor. adwaita-icon-theme libxcursor ;for XCURSOR_PATH - pipewire-0.3 + pipewire python python-dbus python-dbusmock @@ -8041,7 +8041,7 @@ (define-public mutter libxkbfile libxrandr libxtst - pipewire-0.3 + pipewire startup-notification sysprof upower diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 4e6cd1d6e1..8784023294 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -254,7 +254,7 @@ (define-public krfb libxcb libxtst oxygen-icons ;; default icon set - pipewire-0.3 + pipewire qtbase-5 qtx11extras xcb-util-image diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3972675a8d..b51ea553a0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018, 2020 Brendan Tildesley +;;; Copyright © 2018, 2020, 2022 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu @@ -8715,7 +8715,7 @@ (define-public inputattach (define-public pipewire (package (name "pipewire") - (version "0.2.7") + (version "0.3.56") (source (origin (method git-fetch) (uri (git-reference @@ -8724,23 +8724,34 @@ (define-public pipewire (file-name (git-file-name name version)) (sha256 (base32 - "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) - (patches (search-patches "pipewire-0.2.7-fno-common.patch")))) + "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dsystemd=false"))) + (list + #:configure-flags + #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") + "-Dsystemd=disabled" + "-Dsession-managers=[]" + "-Dman=enabled"))) (native-inputs - (list pkg-config)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg - gstreamer - gst-plugins-base - libva - sbc - sdl2)) + (list pkg-config + python-docutils)) + (inputs (list alsa-lib + avahi + bluez + dbus + eudev + ffmpeg + gst-plugins-base + gstreamer + jack-2 + ldacbt + libva + pulseaudio + sbc + sdl2 + vulkan-headers + vulkan-loader)) (home-page "https://pipewire.org/") (synopsis "Server and user space API to deal with multimedia pipelines") (description @@ -8754,39 +8765,6 @@ (define-public pipewire of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 - (package - (inherit pipewire) - (name "pipewire") - (version "0.3.56") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PipeWire/pipewire") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) - (arguments - (list - #:configure-flags - #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") - "-Dsystemd=disabled" - "-Dsession-managers=[]" - "-Dman=enabled"))) - (native-inputs - (modify-inputs (package-native-inputs pipewire) - (prepend python-docutils))) - (inputs (modify-inputs (package-inputs pipewire) - (prepend avahi - bluez - jack-2 - ldacbt - pulseaudio - vulkan-loader - vulkan-headers))))) - (define-public wireplumber (package (name "wireplumber") @@ -8808,7 +8786,7 @@ (define-public wireplumber (native-inputs (list `(,glib "bin") pkg-config)) - (inputs (list dbus elogind glib lua pipewire-0.3)) + (inputs (list dbus elogind glib lua pipewire)) (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") (synopsis "Session / policy manager implementation for PipeWire") (description "WirePlumber is a modular session / policy manager for diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82c9227ba8..759257f2bf 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -338,7 +338,7 @@ (define-public webrtc-for-telegram-desktop openh264 openssl opus - pipewire-0.3 + pipewire protobuf)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e6da6ce04f..27cdb7aafa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3387,7 +3387,7 @@ (define-public obs mbedtls-apache mesa pciutils - pipewire-0.3 + pipewire pulseaudio python qtbase-5 -- 2.37.2