From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gH3rIJS/K1/dHAAA0tVLHw (envelope-from ) for ; Thu, 06 Aug 2020 08:30:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sNDfHJS/K1/scwAA1q6Kng (envelope-from ) for ; Thu, 06 Aug 2020 08:30:12 +0000 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 F3E0394005D for ; Thu, 6 Aug 2020 08:30:11 +0000 (UTC) Received: from localhost ([::1]:59448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3bHu-00042P-1J for larch@yhetil.org; Thu, 06 Aug 2020 04:30:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3bHm-00041z-Sg for guix-patches@gnu.org; Thu, 06 Aug 2020 04:30:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3bHm-0008AR-Id for guix-patches@gnu.org; Thu, 06 Aug 2020 04:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k3bHm-0000xf-25 for guix-patches@gnu.org; Thu, 06 Aug 2020 04:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42728] [PATCH] gnu: emacs-emms: Fix build of emms-print-metadata. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Aug 2020 08:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42728@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15967025923646 (code B ref -1); Thu, 06 Aug 2020 08:30:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Aug 2020 08:29:52 +0000 Received: from localhost ([127.0.0.1]:53103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3bHc-0000wk-6x for submit@debbugs.gnu.org; Thu, 06 Aug 2020 04:29:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:33664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3bHZ-0000wb-7c for submit@debbugs.gnu.org; Thu, 06 Aug 2020 04:29:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3bHZ-00040y-1S for guix-patches@gnu.org; Thu, 06 Aug 2020 04:29:49 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:41461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3bHW-00088q-HW for guix-patches@gnu.org; Thu, 06 Aug 2020 04:29:48 -0400 X-Originating-IP: 86.246.37.13 Received: from localhost.localdomain (lfbn-idf2-1-572-13.w86-246.abo.wanadoo.fr [86.246.37.13]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id ED3361C000D for ; Thu, 6 Aug 2020 08:29:42 +0000 (UTC) From: Pierre Neidhardt Date: Thu, 6 Aug 2020 10:29:35 +0200 Message-Id: <20200806082935.13379-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.197; envelope-from=mail@ambrevar.xyz; helo=relay5-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 04:29:43 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, FROM_SUSPICIOUS_NTLD=1, FROM_SUSPICIOUS_NTLD_FP=1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.1 (--) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: ouAwRk4AAPvc * gnu/packages/emacs-xyz.scm (emacs-emms): Inherit from emacs-emms-print-metadata. [inputs]: Add emms-print-metadata. [arguments]: Fix path to emms-print-metadata. --- gnu/packages/emacs-xyz.scm | 53 +++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9943af0fcb..5d353d0d57 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1484,9 +1484,9 @@ incrementally confined in Isearch manner.") ;;; Multimedia. ;;; -(define-public emacs-emms +(define emacs-emms-print-metadata (package - (name "emacs-emms") + (name "emacs-emms-print-metadata") (version "5.42") (source (origin @@ -1495,6 +1495,37 @@ incrementally confined in Isearch manner.") "emms-" version ".tar")) (sha256 (base32 "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("emms-print-metadata") + #:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (install-file "src/emms-print-metadata" + (string-append out "/bin")) + (install-file "emms-print-metadata.1" + (string-append out "/share/man/man1")) + #t)))))) + (inputs + `(("taglib" ,taglib))) + (home-page "https://www.gnu.org/software/emms/") + (synopsis "The Emacs Multimedia System") + (description + "EMMS is the Emacs Multimedia System. It is a small front-end which +can control one of the supported external players. Thus, it supports +whatever formats are supported by your music player. It also +supports tagging and playlist management, all behind a clean and +light user interface.") + (license license:gpl3+))) + +(define-public emacs-emms + (package + (inherit emacs-emms-print-metadata) + (name "emacs-emms") (build-system emacs-build-system) (arguments `(#:phases @@ -1504,6 +1535,7 @@ incrementally confined in Isearch manner.") ;; so that everything works out-of-the-box. (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) + (emms-print-metadata (assoc-ref inputs "emms-print-metadata")) (flac (assoc-ref inputs "flac")) (vorbis (assoc-ref inputs "vorbis-tools")) (alsa (assoc-ref inputs "alsa-utils")) @@ -1528,7 +1560,7 @@ incrementally confined in Isearch manner.") (string-append opus "/bin/opusinfo"))) (emacs-substitute-variables "emms-info-libtag.el" ("emms-info-libtag-program-name" - (string-append out "/bin/emms-print-metadata"))) + (string-append emms-print-metadata "/bin/emms-print-metadata"))) (emacs-substitute-variables "emms-info-mp3info.el" ("emms-info-mp3info-program-name" (string-append mp3info "/bin/mp3info"))) @@ -1545,23 +1577,14 @@ incrementally confined in Isearch manner.") (string-append "\"" mutagen "/bin/mid3v2\""))) #t)))))) (inputs - `(("alsa-utils" ,alsa-utils) + `(("emms-print-metadata" ,emacs-emms-print-metadata) + ("alsa-utils" ,alsa-utils) ("flac" ,flac) ;for metaflac ("vorbis-tools" ,vorbis-tools) ("mpg321" ,mpg321) - ("taglib" ,taglib) ("mp3info" ,mp3info) ("mutagen" ,python-mutagen) - ("opus-tools" ,opus-tools))) - (home-page "https://www.gnu.org/software/emms/") - (synopsis "The Emacs Multimedia System") - (description - "EMMS is the Emacs Multimedia System. It is a small front-end which -can control one of the supported external players. Thus, it supports -whatever formats are supported by your music player. It also -supports tagging and playlist management, all behind a clean and -light user interface.") - (license license:gpl3+))) + ("opus-tools" ,opus-tools))))) (define-public emacs-emms-mode-line-cycle (package base-commit: 327ebd55ca595aa3fac41139c906fbe05b5b6e0b -- 2.28.0