* [PATCH 1/3] gnu: Add libbdplus.
@ 2016-09-09 19:52 Andy Patterson
2016-09-09 19:52 ` [PATCH 2/3] gnu: Add libaacs Andy Patterson
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andy Patterson @ 2016-09-09 19:52 UTC (permalink / raw)
To: guix-devel
* gnu/packages/video.scm (libbdplus): New variable.
---
gnu/packages/video.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 864e691..a6eac2b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
+;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1587,3 +1588,23 @@ and MPEG system streams.")
license:lgpl2.1
license:lgpl2.1+
license:gpl2))))
+
+(define-public libbdplus
+ (package
+ (name "libbdplus")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "ftp://ftp.videolan.org/pub/videolan/libbdplus/"
+ version "/" name "-" version ".tar.bz2"))
+ (sha256
+ (base32 "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6"))))
+ (inputs
+ `(("libgcrypt" ,libgcrypt)))
+ (build-system gnu-build-system)
+ (home-page "http://www.videolan.org/developers/libbdplus.html")
+ (synopsis "Library for decrypting certain Blu-Ray discs")
+ (description "libbdplus is a library which implements the BD+ System
+specifications.")
+ (license license:lgpl2.1+)))
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] gnu: Add libaacs.
2016-09-09 19:52 [PATCH 1/3] gnu: Add libbdplus Andy Patterson
@ 2016-09-09 19:52 ` Andy Patterson
2016-09-13 8:09 ` Ludovic Courtès
2016-09-09 19:52 ` [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support Andy Patterson
2016-09-13 8:07 ` [PATCH 1/3] gnu: Add libbdplus Ludovic Courtès
2 siblings, 1 reply; 6+ messages in thread
From: Andy Patterson @ 2016-09-09 19:52 UTC (permalink / raw)
To: guix-devel
* gnu/packages/video.scm (libaacs): New variable.
---
gnu/packages/video.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a6eac2b..d57393a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -48,11 +48,13 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages avahi)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bison)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages elf)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
@@ -1608,3 +1610,26 @@ and MPEG system streams.")
(description "libbdplus is a library which implements the BD+ System
specifications.")
(license license:lgpl2.1+)))
+
+(define-public libaacs
+ (package
+ (name "libaacs")
+ (version "0.8.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "ftp://ftp.videolan.org/pub/videolan/libaacs/"
+ version "/" name "-" version ".tar.bz2"))
+ (sha256
+ (base32 "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm"))))
+ (inputs
+ `(("libgcrypt" ,libgcrypt)))
+ (native-inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)))
+ (build-system gnu-build-system)
+ (home-page "http://www.videolan.org/developers/libaacs.html")
+ (synopsis "Library for decrypting certain Blu-Ray discs")
+ (description "libaacs is a library which implements the Advanced Access
+Content System specification.")
+ (license license:lgpl2.1+)))
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support.
2016-09-09 19:52 [PATCH 1/3] gnu: Add libbdplus Andy Patterson
2016-09-09 19:52 ` [PATCH 2/3] gnu: Add libaacs Andy Patterson
@ 2016-09-09 19:52 ` Andy Patterson
2016-09-13 8:14 ` Ludovic Courtès
2016-09-13 8:07 ` [PATCH 1/3] gnu: Add libbdplus Ludovic Courtès
2 siblings, 1 reply; 6+ messages in thread
From: Andy Patterson @ 2016-09-09 19:52 UTC (permalink / raw)
To: 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")
--
2.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] gnu: Add libbdplus.
2016-09-09 19:52 [PATCH 1/3] gnu: Add libbdplus Andy Patterson
2016-09-09 19:52 ` [PATCH 2/3] gnu: Add libaacs Andy Patterson
2016-09-09 19:52 ` [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support Andy Patterson
@ 2016-09-13 8:07 ` Ludovic Courtès
2 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-13 8:07 UTC (permalink / raw)
To: Andy Patterson; +Cc: guix-devel
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> * gnu/packages/video.scm (libbdplus): New variable.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] gnu: Add libaacs.
2016-09-09 19:52 ` [PATCH 2/3] gnu: Add libaacs Andy Patterson
@ 2016-09-13 8:09 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-13 8:09 UTC (permalink / raw)
To: Andy Patterson; +Cc: guix-devel
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> * gnu/packages/video.scm (libaacs): New variable.
Applied!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support.
2016-09-09 19:52 ` [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support Andy Patterson
@ 2016-09-13 8:14 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2016-09-13 8:14 UTC (permalink / raw)
To: Andy Patterson; +Cc: guix-devel
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> * gnu/packages/video.scm (libbluray) [inputs]: Add libaacs and
> libbdplus.
> [arguments]: Add 'fix-dlopen-paths' to #:phases.
Applied, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-13 8:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-09 19:52 [PATCH 1/3] gnu: Add libbdplus Andy Patterson
2016-09-09 19:52 ` [PATCH 2/3] gnu: Add libaacs Andy Patterson
2016-09-13 8:09 ` Ludovic Courtès
2016-09-09 19:52 ` [PATCH 3/3] gnu: libbluray: Enable libaacs and libbdplus support Andy Patterson
2016-09-13 8:14 ` Ludovic Courtès
2016-09-13 8:07 ` [PATCH 1/3] gnu: Add libbdplus Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).