From patchwork Fri Sep 9 19:52:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Patterson X-Patchwork-Id: 15473 Received: (qmail 112908 invoked by uid 89); 9 Sep 2016 20:55:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Disc, Hx-spam-relays-external:sk:mailser, H*RU:sk:mailser, H*r:sk:mailser X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Sep 2016 20:54:58 +0000 Received: from localhost ([::1]:60183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSp7-0007K8-2z for patchwork@sourceware.org; Fri, 09 Sep 2016 16:54:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSVh-0006QQ-QQ for guix-devel@gnu.org; Fri, 09 Sep 2016 16:34:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biSVe-0005Xc-QD for guix-devel@gnu.org; Fri, 09 Sep 2016 16:34:53 -0400 Received: from mailservices.uwaterloo.ca ([129.97.128.141]:55169 helo=minos.uwaterloo.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSVe-0005XD-LR for guix-devel@gnu.org; Fri, 09 Sep 2016 16:34:50 -0400 Received: from jalisou.gateway.2wire.net (bas1-jockvale05-3096538526.dsl.bell.ca [184.145.109.158]) (authenticated bits=0) by minos.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id u89Jrmu0003560 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Fri, 9 Sep 2016 15:53:59 -0400 From: Andy Patterson To: guix-devel@gnu.org Subject: [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support. Date: Fri, 9 Sep 2016 15:52:26 -0400 Message-Id: <20160909195226.24339-3-ajpatter@uwaterloo.ca> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160909195226.24339-1-ajpatter@uwaterloo.ca> References: <20160909195226.24339-1-ajpatter@uwaterloo.ca> X-UUID: 634b32bd-da96-450f-9f77-471d6325bf83 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.97.128.141 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/video.scm (libbluray) [inputs]: Add libaacs and libbdplus. [arguments]: Add 'fix-dlopen-paths' to #:phases. --- gnu/packages/video.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d57393a..d5f3b32 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -979,11 +979,27 @@ YouTube.com and a few more sites.") (base32 "1q1whviqv5sr9nr372h31zwid1rvbfbx3z4lzr8lnj25xha6cdm6")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--disable-bdjava"))) + (arguments + `(#:configure-flags '("--disable-bdjava") + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dlopen-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((libaacs (assoc-ref inputs "libaacs")) + (libbdplus (assoc-ref inputs "libbdplus"))) + (substitute* "src/libbluray/disc/aacs.c" + (("\"libaacs\"") + (string-append "\"" libaacs "/lib/libaacs\""))) + (substitute* "src/libbluray/disc/bdplus.c" + (("\"libbdplus\"") + (string-append "\"" libbdplus "/lib/libbdplus\""))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) + ("libaacs" ,libaacs) + ("libbdplus" ,libbdplus) ("libxml2" ,libxml2))) (home-page "https://www.videolan.org/developers/libbluray.html") (synopsis "Blu-Ray Disc playback library")