From patchwork Mon Mar 14 23:06:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Boulain X-Patchwork-Id: 37832 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9EE1127BBE9; Mon, 14 Mar 2022 23:07:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1164527BBEA for ; Mon, 14 Mar 2022 23:07:21 +0000 (GMT) Received: from localhost ([::1]:32952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTtma-00062v-7R for patchwork@mira.cbaines.net; Mon, 14 Mar 2022 19:07:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTtmJ-0005aZ-9n for guix-patches@gnu.org; Mon, 14 Mar 2022 19:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTtmI-0006cK-Ah for guix-patches@gnu.org; Mon, 14 Mar 2022 19:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTtmI-0005NN-4s for guix-patches@gnu.org; Mon, 14 Mar 2022 19:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 2/2] gnu: rename pipewire to pipewire-0.2 and pipewire-0.3 to pipewire Resent-From: Kevin Boulain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Mar 2022 23:07:02 +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 Received: via spool by 54379-submit@debbugs.gnu.org id=B54379.164729920720623 (code B ref 54379); Mon, 14 Mar 2022 23:07:02 +0000 Received: (at 54379) by debbugs.gnu.org; 14 Mar 2022 23:06:47 +0000 Received: from localhost ([127.0.0.1]:46940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtm2-0005MZ-W1 for submit@debbugs.gnu.org; Mon, 14 Mar 2022 19:06:47 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:44720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTtly-0005ME-6w for 54379@debbugs.gnu.org; Mon, 14 Mar 2022 19:06:46 -0400 Received: by mail-ej1-f47.google.com with SMTP id qt6so37393587ejb.11 for <54379@debbugs.gnu.org>; Mon, 14 Mar 2022 16:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u61paQ92h3aZwL3TLdtwqOT0fk9G1wnIfqPSF/kTP8o=; b=VNlL5T4ZPxoz5GS7q8G7iicg96bzHXIYICFQ7Rj0dlQHCDjD+AYjdlNXi58YGuVW+t Ae45/4jrYt6b0gOYZjLjTjpn9ZFfugStp9cpU2+wjE7Xtk1l91UsnWbihdHN+aFNY/bo ogMIq1bnsvIErWCyYoR1pkuvkZVp5VvC0J6fIg3VMC6WJaD70GJqpBqgCDFtRhQ+pR3s jrdi2jJ4quiO5cYovxcSAD9dxo9Lb1BIwTnwM0k36w/h88cYqzlf9EjbABTRKKy6ZD5+ yQjDxJwdoAK3CD0KiejdfXh5/NFb49EH62Fq8MjBrlaPejjZQ5dhCY5h8EJeL0uU28+x c10Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u61paQ92h3aZwL3TLdtwqOT0fk9G1wnIfqPSF/kTP8o=; b=KC70n2ImXCcTbh5FTofKCkPQZSMBgWD/M/8Li7d4K/HG6ufCDX10pvagwSLd1smxEy 69zrNVwiM9MDNaJ7XUgD8MlmTKGmPfnB6nmQlQoUPTWKQLc6TeF4rrqRc4VEuacQnLPR 2bxknYSZa61XDB6U9Rt/kmttBV8vZBbvmcOKF6cMZkAuBsONOA/hPsEkZN1GiYV8RRaD z8SLCZec04BegmI3ieWytHJrjNHF1ehrlsTxmf2GRVs/Ak9lnS0H+oNcb52gcMJzq3HP DwmXnFnqhWhntvkb5W/E1aw8jAOt1C6E9+EHFnJpBW8c6GyTSAKWS/zc87oqxzQisxOD vQnQ== X-Gm-Message-State: AOAM532ThCPlnaZdBtM5ABEdk8v8WcdHUxlFWDkviKybbQwf4ku9vnVV cdlPvUCtycnrfRTUy/0j/oCFO62147g= X-Google-Smtp-Source: ABdhPJzLHbzx7c26vZyLbAImLmo06z8j3owKd9wy+Wj+66dG9/ww9JDJ98utS3LKmmSzZKBIrh0h9w== X-Received: by 2002:a17:906:a057:b0:6cf:2736:ba65 with SMTP id bg23-20020a170906a05700b006cf2736ba65mr20433014ejb.171.1647299195905; Mon, 14 Mar 2022 16:06:35 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id n6-20020a170906724600b006d4e2f6857dsm7353583ejk.139.2022.03.14.16.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 16:06:35 -0700 (PDT) From: Kevin Boulain Date: Tue, 15 Mar 2022 00:06:47 +0100 Message-Id: <20220314230647.11344-2-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220314230647.11344-1-kevinboulain@gmail.com> References: <20220314230647.11344-1-kevinboulain@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/chromium.scm (ungoogled-chromium): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (weston): Change inputs from pipewire to pipewire-0.2. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/gnome.scm (mutter): Change native-inputs and inputs from pipewire-0.3 to pipewire. * gnu/packages/kde-systemtools.scm (krfb): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/linux.scm (pipewire): Rename to pipewire-0.2. * gnu/packages/linux.scm (pipewire-0.3): Rename to pipewire. * gnu/packages/linux.scm (wireplumber): Change inputs from pipewire-0.3 to pipewire. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Change inputs from pipewire to pipewire-0.2. * gnu/packages/video.scm (obs): Change inputs from pipewire-0.3 to pipewire. --- 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 | 10 +++++----- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 7ef1e5ac1b..f60c9719fe 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -849,7 +849,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 55bde8e705..b1248c466d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1120,7 +1120,7 @@ (define-public weston ("mtdev" ,mtdev) ("linux-pam" ,linux-pam) ("pango" ,pango) - ("pipewire" ,pipewire) + ("pipewire" ,pipewire-0.2) ("wayland-protocols" ,wayland-protocols) ("xorg-server-xwayland" ,xorg-server-xwayland))) (propagated-inputs @@ -2313,7 +2313,7 @@ (define-public xdg-desktop-portal ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse))) (arguments `(#:phases @@ -2442,7 +2442,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 381ea04ea0..3eeba5e818 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7540,7 +7540,7 @@ (define-public mutter ;; theme to please libxcursor. ("adwaita-icon-theme" ,adwaita-icon-theme) ("libxcursor" ,libxcursor) ;for XCURSOR_PATH - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("python" ,python) ("python-dbus" ,python-dbus) ("python-dbusmock" ,python-dbusmock) @@ -7583,7 +7583,7 @@ (define-public mutter ("libxkbfile" ,libxkbfile) ("libxrandr" ,libxrandr) ("libxtst" ,libxtst) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("startup-notification" ,startup-notification) ("sysprof" ,sysprof) ("upower-glib" ,upower) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 3fab9089f3..205cd24e9d 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 c09276b319..ba6508c36b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8234,7 +8234,7 @@ (define-public inputattach types and interfaces and translates so that the X server can use them.") (license license:gpl2+))) -(define-public pipewire +(define-public pipewire-0.2 (package (name "pipewire") (version "0.2.7") @@ -8276,9 +8276,9 @@ (define-public pipewire of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 +(define-public pipewire (package - (inherit pipewire) + (inherit pipewire-0.2) (name "pipewire") (version "0.3.48") (source (origin @@ -8300,7 +8300,7 @@ (define-public pipewire-0.3 (modify-phases %standard-phases ;; Skip shrink-runpath, otherwise validate-runpath fails. (delete 'shrink-runpath)))) - (inputs (modify-inputs (package-inputs pipewire) + (inputs (modify-inputs (package-inputs pipewire-0.2) (prepend avahi bluez jack-2 @@ -8336,7 +8336,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 6c5efc50b9..4213ac6e4e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -166,7 +166,7 @@ (define-public webrtc-for-telegram-desktop ("libxrandr" ,libxrandr) ("openssl" ,openssl) ("opus" ,opus) - ("pipewire" ,pipewire) + ("pipewire" ,pipewire-0.2) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("x11" ,libx11) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc05c0a222..a5298ccfac 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3429,7 +3429,7 @@ (define-public obs libxcomposite mbedtls-apache mesa - pipewire-0.3 + pipewire pulseaudio qtbase-5 qtsvg