From patchwork Wed Jun 17 10:50:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22754 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 32BF927BBE1; Wed, 17 Jun 2020 11:51:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1680327BBE3 for ; Wed, 17 Jun 2020 11:51:34 +0100 (BST) Received: from localhost ([::1]:47048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVfJ-0002yb-GP for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:51:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fu-LC for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003IB-MP for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVen-0001bx-LT for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 1/5] gnu: Add cdrdao. References: <87tuzaq884.fsf@araneo.si> In-Reply-To: <87tuzaq884.fsf@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910186090 (code B ref 41911); Wed, 17 Jun 2020 10:51:01 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:18 +0000 Received: from localhost ([127.0.0.1]:50491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe6-0001a5-6D for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:18 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe1-0001Zq-Cd for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:17 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 21b28605 for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=uokBWZJTGbN8isjyfungz HdernY=; b=LmmwcXpI71L+1VffJ/lxLWQbdmI44d8LK8DC7Mt1VI42jf+rEun+b Z05TgKaBKkmh4HNrqPSUjyhzlaMEmDmq9dW2DzuF1j/z5Q/pKvmABbreWpgku/i4 cvfIA+NIysqAyELrC2aNrOh0HnTKgGAWkI1LuNnnDZNMRy1t8fscEw3Vzhius/z9 fTJnR0OaB8s0efsBGYXG6BJuqqNVLdLdqYVbgc+gk1J4JNz5B+BilXlarREJU4+B 92WwH8WeR6LGMd1LsRi3hVJcFyoAJmLoGM/v8PYphHZB7tNKs+xjqMlKCKGzw4iV 5+LNJXXl5W0AwlkjChPeSJMIxVGegopEg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id f3036d71 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:12 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:04 +0200 Message-Id: <20200617105008.11348-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 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/cdrom.scm (cdrdao): New variable. --- gnu/packages/cdrom.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 67236f86de..ac8dd26af0 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,9 +39,11 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -242,6 +245,54 @@ extra-robust data verification, synchronization, error handling and scratch reconstruction capability.") (license gpl2))) ; libraries under lgpl2.1 +(define-public cdrdao + (package + (name "cdrdao") + (version "1.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdrdao/cdrdao.git") + (commit + (string-append "rel_" (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gcl8ibyylamy2d1piq3749nw3xrlp12r0spzp2gmni57b8a6b7j")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list + ;; GCDMaster depends on obsolete libgnomeuimm, see + ;; . + "--without-gcdmaster" + ;; Use the native SCSI interface. + "--without-scglib") + #:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'fix-configure.ac + (lambda _ + ;; Remove reference to missing macro. + (substitute* "configure.ac" (("^AM_GCONF_SOURCE_2.*") "")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("ao" ,ao) + ("lame" ,lame) + ("libmad" ,libmad) + ("libvorbis" ,libvorbis))) + (home-page "http://cdrdao.sourceforge.net") + (synopsis "Read and write CDs in disk-at-once mode") + (description "cdrdao records audio or data CDs in disk-at-once (DAO) mode, +based on a textual description of the contents. This mode writes the complete +disc – lead-in, one or more tracks, and lead-out – in a single step and is +commonly used with audio CDs. @code{cdrdao} can also handle the bin/cue +format, commonly used for VCDs or disks with subchannel data.") + (license gpl2+))) + (define-public cdrtools (package (name "cdrtools") From patchwork Wed Jun 17 10:50:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22756 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 0064427BBE3; Wed, 17 Jun 2020 11:55:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7ADE927BBE1 for ; Wed, 17 Jun 2020 11:55:11 +0100 (BST) Received: from localhost ([::1]:59796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVip-0000DK-0C for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fo-KI for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003H3-2t for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVeo-0001c3-1r for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 2/5] gnu: k3b: Add inputs for external programs. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226119 (code B ref 41911); Wed, 17 Jun 2020 10:51:02 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe9-0001ac-IL for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:21 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe5-0001Zq-Ib for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:18 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 10a39633 for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=bEuDxN0g q02iyJaxrQv65xjFFAY=; b=iUKQRiBRfjqfJdl2F/Lb8J/hcgEKKQ7+F5nqk9WQ Pstoc1g3EWCeQfPPbcnK/NNUcj4a7TyGqSa92Whq7Z2wxCKuJZ963SGnf3dQIqRA 0p7R78K1aIcddj9qoSWtLULZh5JLGQ4DPg2x/Cwy9JvL4WgfQPkI4nq5zGV1mrZW PCrCiqqSihn9yP4w7qb3J0A5R0PyXFQNEm7sWawYzc//5Y/qt5x63WIYA9BtIvB2 yAZCGDyTEeQE21nBs53b7AWgLpl6h004+R3G96LxzH2/FFEbGnc6Qc3yw8P+b6OS 7iQsZeY/OFGxyHuRgyiJWCaEVu74/+dnEBAOdfZa0Bqqng== Received: by araneo.si (OpenSMTPD) with ESMTPSA id e379011f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:12 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:05 +0200 Message-Id: <20200617105008.11348-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> 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/kde-multimedia.scm (k3b)[inputs]: Add cdrdao, dvd+rw-tools, libburn and sox. [arguments]<#:phases>[wrap-path]: New phase to wrap the binary with paths to the above. --- gnu/packages/kde-multimedia.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 938251a532..654aecd858 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,12 +297,26 @@ This package is part of the KDE multimedia module.") (sha256 (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'qt-wrap 'wrap-path + (lambda _ + ;; Set paths to backend programs. + (wrap-program (string-append (assoc-ref %outputs "out") "/bin/k3b") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref %build-inputs input) "/bin")) + '("cdrdao" "dvd+rw-tools" "libburn" "sox")))) + #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("kdoctools" ,kdoctools))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("cdrdao" ,cdrdao) + ("dvd+rw-tools" ,dvd+rw-tools) + ("ffmpeg" ,ffmpeg) ("flac" ,flac) ("karchive" ,karchive) ("kcmutils" ,kcmutils) @@ -319,6 +334,7 @@ This package is part of the KDE multimedia module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("lame" ,lame) + ("libburn" ,libburn) ("libdvdread" ,libdvdread) ;; TODO: LibFuzzer ("libiconv" ,libiconv) @@ -334,6 +350,7 @@ This package is part of the KDE multimedia module.") ("qtwebkit" ,qtwebkit) ("shared-mime-info" ,shared-mime-info) ("solid" ,solid) + ("sox" ,sox) ("taglib" ,taglib))) (home-page "https://kde.org/applications/multimedia/org.kde.k3b") (synopsis "Sophisticated CD/DVD burning application") From patchwork Wed Jun 17 10:50:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22758 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 97E5127BBE3; Wed, 17 Jun 2020 11:55:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3D93827BBE1 for ; Wed, 17 Jun 2020 11:55:24 +0100 (BST) Received: from localhost ([::1]:60594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVj1-0000YK-Pc for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fm-KC for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003I9-Fh for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVeo-0001cB-F5 for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 3/5] gnu: k3b: Add inputs for libraries loaded at runtime. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226126 (code B ref 41911); Wed, 17 Jun 2020 10:51:02 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe9-0001ae-ST for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:22 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe6-0001Zq-FN for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:18 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 5edb3114 for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=ZzF/Nzw1 YM0yskvzpocB4pfQKtM=; b=FqT0bHroPjdVttCiMUV9RJYJTfSfXPpcDCW/fP12 StVgbqzNdN0c2wwD/O828f58I0QIV4BeBDiabD3DtthRQ/xXOhTh4SZNduNN0ahF rGMtPpfUyeLmUHXopxV1yuk++ms465H+AFyWcXV2VwzBHCwbrYhoaoUzz7ROpXqd 1U8dCL04l2NhUxNEMFw6xD4Hz6aYaVNhTtCcH1YLKJLWkx8kRUUucTiV5AJl3azf KcGIpOEssePwTv+jLbbGKyDvYMmJoXhmoOtwuRlPYRsFrkDKZmLld668pEnLHOwy x6FA98FGM3uGylRwfCH575HEk2x+8cUTVg4zevUHQrE3lA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 611276d0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:13 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:06 +0200 Message-Id: <20200617105008.11348-3-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> 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 Patch the source to load these from absolute paths. Actual loading is done by the Qt library, so we cannot use k3b’s runpath. * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add libcdio-paranoia and libdvdcss. [arguments]<#:phases>[set-absolute-library-paths]: New phase. --- gnu/packages/kde-multimedia.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 654aecd858..9fab19f1f6 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -300,6 +300,19 @@ This package is part of the KDE multimedia module.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-absolute-library-paths + (lambda _ + ;; Set absolute paths for dlopened libraries. We can’t use k3b’s + ;; runpath as they are loaded by the Qt library. + (let ((libcdio-paranoia (assoc-ref %build-inputs "libcdio-paranoia")) + (libdvdcss (assoc-ref %build-inputs "libdvdcss"))) + (substitute* "libk3b/tools/k3bcdparanoialib.cpp" + (("\"(cdio_cdda|cdio_paranoia)\"" _ library) + (string-append "\"" libcdio-paranoia "/lib/" library "\""))) + (substitute* "libk3b/tools/k3blibdvdcss.cpp" + (("\"(dvdcss)\"" _ library) + (string-append "\"" libdvdcss "/lib/" library "\"")))) + #t)) (add-after 'qt-wrap 'wrap-path (lambda _ ;; Set paths to backend programs. @@ -335,6 +348,8 @@ This package is part of the KDE multimedia module.") ("kxmlgui" ,kxmlgui) ("lame" ,lame) ("libburn" ,libburn) + ("libcdio-paranoia" ,libcdio-paranoia) + ("libdvdcss" ,libdvdcss) ("libdvdread" ,libdvdread) ;; TODO: LibFuzzer ("libiconv" ,libiconv) From patchwork Wed Jun 17 10:50:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22757 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 520DF27BBE3; Wed, 17 Jun 2020 11:55:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0EBB527BBE1 for ; Wed, 17 Jun 2020 11:55:18 +0100 (BST) Received: from localhost ([::1]:60204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlViv-0000OH-J9 for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Ft-LH for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVeo-0003ID-SW for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVeo-0001cJ-RP for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 4/5] gnu: k3b: Note the runtime dependency on udisks-service. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226134 (code B ref 41911); Wed, 17 Jun 2020 10:51:02 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVeA-0001al-5B for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:22 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe7-0001Zq-4O for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:19 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 9839c1ff for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=56HUxsh1YIHMDDH99gw+X qTkJJQ=; b=BtneF53O9Ll1RM9Y8LHAekS3YY/NoP/vnR/ctowc8BSrlRu9rAKJy /CSMDrj1AfNlegFSlHeoq5dTD7WIOQIUcMemECw/9wvzofEO7UYB+2PF2Djf01Zq BlQRhoEcm2Kr8+pVtRs7HxavFm9hXe6A/Ftd4TsVTy6aWfcF2apwQbsd4sFCx5kL wuDxUhsS8D7+Tpwq8wAAN/4Irt6ooJM0mBkXh+MKJ87fwjiGpbGK6HPAd47poKLF SMutB7sTplVuFl5U1cHBLukBRWZZA5md+aByaKhue20VIFRq+V3xStt2NPZyIZTY R9747dZp4QgXGkYxTjzSwkkwimk9S2Lhw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 47b7c798 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:13 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:07 +0200 Message-Id: <20200617105008.11348-4-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> 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/kde-multimedia.scm (k3b)[description]: Note that udisks-service should be enabled. --- gnu/packages/kde-multimedia.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 9fab19f1f6..ecc1afe83b 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -372,7 +372,10 @@ This package is part of the KDE multimedia module.") (description "K3b is CD-writing software which intends to be feature-rich and provide an easily usable interface. Features include burning audio CDs from .WAV and .MP3 audio files, configuring external programs and configuring -devices.") +devices. + +The @code{udisks-service} should be enabled for @command{k3b} to discover the +available CD drives.") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) From patchwork Wed Jun 17 10:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 22759 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 0DF0D27BBE3; Wed, 17 Jun 2020 11:55:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C7EEE27BBE1 for ; Wed, 17 Jun 2020 11:55:35 +0100 (BST) Received: from localhost ([::1]:60994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlVjD-0000j9-AE for patchwork@mira.cbaines.net; Wed, 17 Jun 2020 06:55:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlVep-0002Fn-KR for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlVep-0003IE-8Z for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlVep-0001cQ-7f for guix-patches@gnu.org; Wed, 17 Jun 2020 06:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41911] [PATCH 5/5] gnu: k3b: Update to 20.04.2. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 10:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41911@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41911-submit@debbugs.gnu.org id=B41911.15923910226140 (code B ref 41911); Wed, 17 Jun 2020 10:51:03 +0000 Received: (at 41911) by debbugs.gnu.org; 17 Jun 2020 10:50:22 +0000 Received: from localhost ([127.0.0.1]:50505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVeA-0001at-EW for submit@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:22 -0400 Received: from araneo.si ([90.157.193.204]:50812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlVe7-0001Zq-Tr for 41911@debbugs.gnu.org; Wed, 17 Jun 2020 06:50:20 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id a8cdf8ad for <41911@debbugs.gnu.org>; Wed, 17 Jun 2020 10:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=tvc2W27toZ/5lstIJz7w3 Dd5tc0=; b=lrlqsdVG8teF/xIV8QHdKjetjFGbrgawqbjCkzPQgn3Oe7yUI2tE1 UPRCNzjTQD63vWncAtK4afBsOgn5PhGaLzgNcwQFwxAGQX7CxbQA2s+32VPEwMaa R72QtmsPVmJE8ytXSwoCo1Qgd2/zXJyEBFcmFZWAC+FBmFCsOCEOmqDEOEXJqGEv 0fCiBFGnIoJ4XthOohaA8nCdTqiKMg5pgFvlABVG3F0Dh08O7X+4+qZrBit3bA2L y9JCL5PqbJRY9vivrRZEnahxjmyi4l3M66OhULTEoWjSuYyji3hvpeWBuPb3aQuv xJ5vN7thrtF7nsr5xcbIJVGVb7SoWNxpA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 10820020 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 17 Jun 2020 10:50:14 +0000 (UTC) From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:08 +0200 Message-Id: <20200617105008.11348-5-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200617105008.11348-1-timotej.lazar@araneo.si> References: <20200617105008.11348-1-timotej.lazar@araneo.si> 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/kde-multimedia.scm (k3b): Update to 20.04.2. --- gnu/packages/kde-multimedia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ecc1afe83b..dd1355010e 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -288,14 +288,14 @@ This package is part of the KDE multimedia module.") (define-public k3b (package (name "k3b") - (version "20.04.1") + (version "20.04.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 - (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) + (base32 "15wm987hz6rfs9ds9l1gbs6gdsardj1ywvk6zmpvj2i2190y4b3q")))) (build-system qt-build-system) (arguments `(#:phases