diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-02-02 00:22:51 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-02-02 03:54:42 -0500 |
| commit | 3b02429c8a0b476120cb1bc63c9ddd4a3a44a37b (patch) | |
| tree | 370417e7b1ba27396851ac22e503ec169019f9b0 /gnu/packages/video.scm | |
| parent | 38012ed5cdf211050d64be7eb1f6164defcb9a68 (diff) | |
| download | guix-3b02429c8a0b476120cb1bc63c9ddd4a3a44a37b.tar guix-3b02429c8a0b476120cb1bc63c9ddd4a3a44a37b.tar.gz | |
gnu: libvpx: Apply bug fixes.
Fixes build on armhf.
* gnu/packages/patches/libvpx-fix-armhf-link.patch,
gnu/packages/patches/libvpx-fix-ssse3-quantize.patch,
gnu/packages/patches/libvpx-vp9-out-of-bounds-access.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/video.scm (libvpx): Add patches. On armhf, add additional
configure flags to avoid requiring support for NEON.
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9cdfbf11da..098f6eb215 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 David Thompson <davet@gnu.org> -;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +26,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages avahi) #:use-module (gnu packages cdrom) @@ -371,10 +372,14 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") version ".tar.bz2")) (sha256 (base32 - "1aai0h0z1bhp89pxmg4fkrwpmqq24k39fhr15cw6q77m9bccip6k")))) + "1aai0h0z1bhp89pxmg4fkrwpmqq24k39fhr15cw6q77m9bccip6k")) + (patches + (list (search-patch "libvpx-vp9-out-of-bounds-access.patch") + (search-patch "libvpx-fix-ssse3-quantize.patch") + (search-patch "libvpx-fix-armhf-link.patch"))))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace + `(#:phases (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) (setenv "CONFIG_SHELL" (which "bash")) @@ -382,6 +387,23 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (zero? (system* "./configure" "--enable-shared" "--as=yasm" + ,@(if (and (not (%current-target-system)) + (string-prefix? + "armhf-" + (%current-system))) + ;; When building on ARMv7, libvpx + ;; assumes that NEON will be + ;; available. On Guix, armhf + ;; does not require NEON, so we + ;; build for ARMv6 and -marm (since + ;; no thumb2 on ARMv6) to ensure + ;; compatibility with all ARMv7 + ;; cores we support. Based on + ;; the Debian libvpx package. + '("--target=armv6-linux-gcc" + "--extra-cflags=-marm" + "--enable-small") + '()) (string-append "--prefix=" out))))) %standard-phases) #:tests? #f)) ; no check target |