From patchwork Sun Apr 17 10:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38771 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 9723727BBEA; Sat, 23 Apr 2022 18:07:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 4E5B427BBE9 for ; Sat, 23 Apr 2022 18:07:26 +0100 (BST) Received: from localhost ([::1]:42692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niJED-0005j5-GX for patchwork@mira.cbaines.net; Sat, 23 Apr 2022 13:07:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niJDq-0005Q6-Rl for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niJDq-0008VG-Iq for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niJDq-00074X-D7 for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH v2 1/3] gnu: mpd: Add support for socket activation. References: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Apr 2022 17:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 54986-submit@debbugs.gnu.org id=B54986.165073360927146 (code B ref 54986); Sat, 23 Apr 2022 17:07:02 +0000 Received: (at 54986) by debbugs.gnu.org; 23 Apr 2022 17:06:49 +0000 Received: from localhost ([127.0.0.1]:57141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDc-00073k-MX for submit@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:48 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:37653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDY-000736-PE for 54986@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:45 -0400 Received: by mail-ej1-f65.google.com with SMTP id g13so21973363ejb.4 for <54986@debbugs.gnu.org>; Sat, 23 Apr 2022 10:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:cc:content-transfer-encoding :message-id; bh=mGiY5r+/zrnr75rG4wVqhLDFOdMCk5a8HGj+r9Jazyc=; b=PpW7oxapXdx+qTgYTWWnxr+z5/SjYr2K2oo2Lu8EP3w5i97Hp4TWwDlOOAm1Dvztq6 D2trJP0KCzgBdUoBKkhPKj1F0v2yVpTOrO00rPI9SKb0UZxe7bVZ1t5AK6vCKGZdNlgW r4D7ppAjf8YKlp46E7yLTDKMcE1StC5qnMc+h2A+1ujD3uPEKHJSCgdqu3CDDQS+iwzx v/6kBo9cMUFg05EyYhSHfYZ4SFVySXvvf5qiTEG/+g4Q6htV1vZVUIVudhuE/vuJ+W6J OX/3db1n5QA+NSy2eCbli8QokiifSA6qrG75imClwwVjrkPeby1skFrpfmDqoSAhXp05 S5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to:cc :content-transfer-encoding:message-id; bh=mGiY5r+/zrnr75rG4wVqhLDFOdMCk5a8HGj+r9Jazyc=; b=jPv2zL3H9wWcT/3fjLJxdLcodofF6p6QdN3ZtFGEvi6cS4qZHKZYIqKkPzxaLTuFEe /DbutIHcjBVtz5QBvsiQCPa7XPNbfxXmr9TLgWeMGdFwckKM+KqebbbaKk1oTpdKxeuk 5M678lfZ6bXID856nCNdzt5A4KA0LoV0E58eKZvDXJdUd3gBm/Z7Uql8KUTEwwl8OXY1 1sV2Oim+Wvp5f/7OOTkRnAe1ATyp9odTN7+hrzllIBMSwLhnt2LL1Th+UQ0QAKSNlvR0 lC8hihemnEkH+rVhOfhVUj0L+lMmWByl+2F4KsrrL1zambcUqx+YV/RZMHw5q9LSoOkz 6QvA== X-Gm-Message-State: AOAM531yUIXziAovZTD46tD39lk45y4dcijof+0spml4K//0NsmRT4wP HKUiNrM0VgmAOAuTTU/gEhohdVbuQqQ= X-Google-Smtp-Source: ABdhPJzWte7uvgafnOrmr8dDExXSZwPPgZs3mBbgAzVrPfKFDCt3Oi53s+8fY0JZnIbqhv5XM//gww== X-Received: by 2002:a17:907:8a11:b0:6df:db0a:e5ab with SMTP id sc17-20020a1709078a1100b006dfdb0ae5abmr9026760ejc.528.1650733598698; Sat, 23 Apr 2022 10:06:38 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b7-20020a170906708700b006da8440d642sm1855481ejk.113.2022.04.23.10.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 10:06:38 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 17 Apr 2022 12:01:47 +0200 MIME-Version: 1.0 Message-ID: <8c12d29e4f7ec86ca04136ba0c62bb2947f4f190.camel@gmail.com> 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/mpd.scm (mpd)[#:configure-flags]: Convert to G-Expression. Add “-Dsystemd=enabled”. [#:phases]: New argument. [inputs]: Add elogind. --- gnu/packages/mpd.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 1ee6806735..40e6a99ad7 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -47,6 +47,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages cmake) ;for MPD + #:use-module (gnu packages freedesktop) ;elogind #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -119,12 +120,28 @@ (define-public mpd "1v969w7h3660ph3h2bdlkrzc05pfz95bmxjqdbzzf7pfwf795ifb")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=enabled"))) + (list + #:configure-flags #~(list "-Ddocumentation=enabled" + "-Dsystemd=enabled") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enable-elogind + (lambda _ + (substitute* "src/lib/systemd/meson.build" + (("libsystemd") "libelogind")) + ;; XXX: systemd dependency overwritten internally, leads to bad + ;; errors + (substitute* "src/lib/systemd/meson.build" + (("systemd_dep = declare_dependency" all) + (string-append "_" all))) + (substitute* "meson.build" + (("systemd_dep,") "systemd_dep, _systemd_dep,"))))))) (inputs (list ao alsa-lib avahi boost curl + elogind ffmpeg flac fmt