aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/video.scm
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2018-12-01 09:36:43 -0600
committerEric Bavier <bavier@member.fsf.org>2018-12-01 09:42:25 -0600
commit37b82ccc390396a078351fd9f7b522cca275a8c9 (patch)
tree1f1a2a3db9eb059e11ac0d046ac9a671a2ae4770 /gnu/packages/video.scm
parentb5944fcbc3c9275ca0ac8498f24b6e7974bd093c (diff)
downloadguix-37b82ccc390396a078351fd9f7b522cca275a8c9.tar
guix-37b82ccc390396a078351fd9f7b522cca275a8c9.tar.gz
handbrake: Update to 1.1.2.
* gnu/packages/video.scm (handbrake): Update to 1.1.2. [source]: Use direct download url. Remove upstreamed patch. Patch make fragments in snippet. [inputs]: Use latest ffmpeg. Add jansson and opus. [arguments]: Remove 'disable-contrib phase, which is now in source snippet. Move 'fix-x265-linking phase fix to #:configure-flags. [license]: Use 'gpl2' as clarified in LICENSE. * gnu/packages/patches/handbrake-pkg-config-path.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r--gnu/packages/video.scm52
1 files changed, 25 insertions, 27 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 0dece9f52f..c80e429ff1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2426,22 +2426,27 @@ supported players in addition to this package.")
(define-public handbrake
(package
(name "handbrake")
- (version "0.10.5")
+ (version "1.1.2")
(source (origin
(method url-fetch)
- (uri (string-append "https://handbrake.fr/rotation.php?file="
- "HandBrake-" version ".tar.bz2"))
- (file-name (string-append "handbrake-" version ".tar.bz2"))
+ (uri (string-append "https://download.handbrake.fr/releases/"
+ version "/HandBrake-" version "-source.tar.bz2"))
(sha256
(base32
- "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv"))
- (patches (search-patches "handbrake-pkg-config-path.patch"))
+ "0bny0hwlr55g2c69rsamv0xvwmfh1s4a582b9vq20xv5ly84m6ms"))
(modules '((guix build utils)))
(snippet
- ;; Remove bundled libraries and source not necessary for
- ;; running under a GNU environment.
+ ;; Remove "contrib" and source not necessary for
+ ;; building/running under a GNU environment.
'(begin
- (for-each delete-file-recursively '("contrib" "macosx" "win"))
+ (for-each delete-file-recursively
+ '("contrib" "macosx" "win"))
+ (substitute* "make/include/main.defs"
+ ;; Disable unconditional inclusion of "contrib" libraries
+ ;; (ffmpeg, libvpx, libdvdread, libdvdnav, and libbluray),
+ ;; which would lead to fetching and building of these
+ ;; libraries. Use our own instead.
+ (("MODULES \\+= contrib") "# MODULES += contrib"))
#t))))
(build-system glib-or-gtk-build-system)
(native-inputs
@@ -2455,13 +2460,14 @@ supported players in addition to this package.")
(inputs
`(("bzip2" ,bzip2)
("dbus-glib" ,dbus-glib)
- ("ffmpeg" ,ffmpeg-3.4) ;compilation errors with ffmpeg-4
+ ("ffmpeg" ,ffmpeg)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+)
+ ("jansson" ,jansson)
("lame" ,lame)
("libass" ,libass)
("libbluray" ,libbluray)
@@ -2471,6 +2477,7 @@ supported players in addition to this package.")
("libmpeg2" ,libmpeg2)
("libnotify" ,libnotify)
("libogg" ,libogg)
+ ("libopus" ,opus)
("libsamplerate" ,libsamplerate)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
@@ -2481,6 +2488,11 @@ supported players in addition to this package.")
("zlib" ,zlib)))
(arguments
`(#:tests? #f ;tests require Ruby and claim to be unsupported
+ #:configure-flags
+ (list (string-append "CPPFLAGS=-I"
+ (assoc-ref %build-inputs "libxml2")
+ "/include/libxml2")
+ "LDFLAGS=-lx265")
#:phases
(modify-phases %standard-phases
(replace 'bootstrap
@@ -2492,21 +2504,6 @@ supported players in addition to this package.")
(substitute* "gtk/module.rules"
((".*autogen\\.sh.*") ""))
(invoke "sh" "./gtk/autogen.sh")))
- (add-before 'configure 'disable-contrib
- (lambda _
- (substitute* "make/include/main.defs"
- ;; Disable unconditional inclusion of some "contrib"
- ;; libraries (ffmpeg, libvpx, libdvdread, libdvdnav,
- ;; and libbluray), which would lead to fetching and
- ;; building of these libraries. Use our own instead.
- (("MODULES \\+= contrib") "# MODULES += contrib"))
- #t))
- (add-before 'configure 'fix-x265-linking
- (lambda _
- (substitute* "test/module.defs"
- ;; Fix missing library during linking error
- (("TEST.GCC.l =") "TEST.GCC.l = x265"))
- #t))
(replace 'configure
(lambda* (#:key outputs configure-flags #:allow-other-keys)
;; 'configure' is not an autoconf-generated script, and
@@ -2523,8 +2520,9 @@ supported players in addition to this package.")
(description
"HandBrake is a tool for converting video from any format to a selection
of modern, widely supported codecs.")
- ;; Most under GPL version 2 or later, and portions under BSD 3 Clause
- (license (list license:gpl2+ license:bsd-3))))
+ ;; Some under GPLv2+, some under LGPLv2.1+, and portions under BSD3.
+ ;; Combination under GPLv2. See LICENSE.
+ (license license:gpl2)))
(define-public openh264
(package