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 ms0.migadu.com with LMTPS id uKtEDOBjR2LLmgAAgWs5BA (envelope-from ) for ; Fri, 01 Apr 2022 22:43:12 +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 mDXOBOBjR2KnCQEAG6o9tA (envelope-from ) for ; Fri, 01 Apr 2022 22:43:12 +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 8E7241DD60 for ; Fri, 1 Apr 2022 22:43:11 +0200 (CEST) Received: from localhost ([::1]:50072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naO6v-0002qa-W7 for larch@yhetil.org; Fri, 01 Apr 2022 16:43:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naO6p-0002pI-PL for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naO6o-0005v9-QH for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naO6o-0007uP-Or for guix-patches@gnu.org; Fri, 01 Apr 2022 16:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54379] [PATCH 3/3] 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: Fri, 01 Apr 2022 20:43: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.164884577930370 (code B ref 54379); Fri, 01 Apr 2022 20:43:02 +0000 Received: (at 54379) by debbugs.gnu.org; 1 Apr 2022 20:42:59 +0000 Received: from localhost ([127.0.0.1]:43684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6k-0007tg-MV for submit@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:59 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:37432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naO6j-0007tA-DT for 54379@debbugs.gnu.org; Fri, 01 Apr 2022 16:42:57 -0400 Received: by mail-ej1-f53.google.com with SMTP id bg10so8285636ejb.4 for <54379@debbugs.gnu.org>; Fri, 01 Apr 2022 13:42:57 -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=Lis/VbiTXNWQzvA+mLJVbqi5U8T9H0fzITJaofNthEQ=; b=GgHHEBcXd4LFBew0N4edbpgBB6IaSVzVuinJOsLAmsr54hVGObnzT5vJ440JO7HvG9 +kQEGoYdkProzkxvxDwzp5EBXNoDj3Rh5zktiiabZVFydHhUe8cCpWokD7pw8b6BHWKN V49hjapargCqkqWAxFCfNep43TD7hdy5XuGxYgJcCSiC5Q1IziWJbrXKPauF0r7jhSsh TJzXLBZdDOWzNQGSnL0RjC0Ulpwyx26ODXBVbnPj3bgSUnjlfkGqhPOY0O6HKyiMhJ1z uIHrSXPXNbRs42ACVMtRkx3r21iu8IMM09KWBY9VuXYFnMVmsyRl7EtoU6nwe+A+nfCp vaSg== 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=Lis/VbiTXNWQzvA+mLJVbqi5U8T9H0fzITJaofNthEQ=; b=cXagk2U+OygLpuJzYUnd5DDFnoZQTFsZIbgauaiRGqiPBs+RK75mCFXhyfQm0c8iNY 8CSGrbOS1t5Bdqwj2qmXJoVlQ9t7DystFU2LTQsfvUugFfseBVBsI9KKW9Zrl7BX8VzL nIWGmqUzzAzy0N6iTm87NfQN6dIOxSLBQL3II2tjcz4z60ZIMQ3BAOCNeoZH86bDMRfU KYyUpzalbiX9QGY2bUpybY1wuRnFPcmB4J3ZUe/BvsvYLXyR2PUouLflGrXVcaYsjsLx lXcvd64Q3gdSbxeVqPZj4rj7K4GgXyp3ocn/IjzPiLr9W8lNCdO6WvBoxPkQPFjLMksP HHfQ== X-Gm-Message-State: AOAM533q0auCTu68lVLYIo7/tRgNrZwMg5+cvJ3yLbYFy7AS0UBCgJiJ s8Cdsn4W0Wc71jjoqasgaX0ugYQtP8U= X-Google-Smtp-Source: ABdhPJxI3M3ErH9+p68BDiCmrrdvDmp+p7nV+pyrS4mTwr39mzI2WbeFYTy9jMi4pVW3mBuX3h5Zng== X-Received: by 2002:a17:907:869f:b0:6da:888b:4258 with SMTP id qa31-20020a170907869f00b006da888b4258mr1374174ejc.720.1648845771471; Fri, 01 Apr 2022 13:42:51 -0700 (PDT) Received: from localhost.localdomain ([51.154.70.17]) by smtp.gmail.com with ESMTPSA id i22-20020a170906251600b006d6d9081f46sm1371720ejb.150.2022.04.01.13.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 13:42:51 -0700 (PDT) From: Kevin Boulain Date: Fri, 1 Apr 2022 22:44:41 +0200 Message-Id: <20220401204441.8244-4-kevinboulain@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401204441.8244-1-kevinboulain@gmail.com> References: <20220401204441.8244-1-kevinboulain@gmail.com> MIME-Version: 1.0 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648845791; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=Lis/VbiTXNWQzvA+mLJVbqi5U8T9H0fzITJaofNthEQ=; b=WZYQo6bNwidnV2ot8eCUiFiHFwkXJYH3MdSK8DJVjFPVS0MNvnMGHiMCp0CIRwpKTB598W kLy3b8FzAz7+3C80JRHCPUz7+UvK9AAmjkwiAUo/wxa6kVh0Khy2Pu32IbtUqkNKGElguV 99nFEsdBPxBBmA3nQ9xaHE1emvdywamXxDj4RHSPeHmm94Zb7Js03WJ5O0uTjxAijVEOyc Ay03MN2SgKXkO4lT9qMJI38hLc/SMo3kjURu0K+AcwsWYml6vCb4lc+rBfRYfScPep9VlR lfvAwm2GqZFD2Gt7vdqmXdtSanvOdOia7vkjMYIxUNXz7o+HyRw8ZNyc3lP7LQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648845791; a=rsa-sha256; cv=none; b=YPoh6x0u15s6a6Qc92KpsWAxveEXsnj1BHVi/z5etDwSNIudmkp/ZKwoWNnNOqvoGyeawX BIXZr0ywcg8to9TbKNx30tf1MtINSOI6b0yK4G4x/FNF8VkZHpERg4gP4ZE3PY/93aAxgE jtvyXGO2o+8HT/PWNXV60qOXJCXd2VBH5EZLeM9W4CXFS3wlfpLXi1yo6OJQIYi6WXKDBV 5nSRT1Q02aeH9rxuM4kVOWNdgM/8aSYH1SqYKbKkd0mpyrPbI+Ax64gFcYg6loQbrmU/Su sxYCzSv0uKE5bt5ycWkczaRpZRL9y3ZdlPvD/lC6OZTldL7c4rTiorrg4nSGVQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GgHHEBcX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 6.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GgHHEBcX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 8E7241DD60 X-Spam-Score: 6.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: DPYA7NXrHEPg * 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 | 12 ++++++------ gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 15 insertions(+), 15 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 8ff59f084b..41b1a1c010 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7557,7 +7557,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) @@ -7600,7 +7600,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 5b9b2d5ca5..11ffe04c50 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8274,7 +8274,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") @@ -8315,9 +8315,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.49") (source (origin @@ -8340,9 +8340,9 @@ (define-public pipewire-0.3 (modify-phases %standard-phases ;; Skip shrink-runpath, otherwise validate-runpath fails. (delete 'shrink-runpath)))) - (native-inputs (modify-inputs (package-native-inputs pipewire) + (native-inputs (modify-inputs (package-native-inputs pipewire-0.2) (prepend python-docutils))) ; For manpages. - (inputs (modify-inputs (package-inputs pipewire) + (inputs (modify-inputs (package-inputs pipewire-0.2) ;; The libcamera plugin doesn't build with the current GStreamer ;; version (g_memdup has to be replaced with g_memdup2 first). (prepend avahi @@ -8383,7 +8383,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