aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/video.scm
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2023-08-26 07:08:03 +0200
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2023-08-26 07:08:03 +0200
commit9d074e16c7a9879d67c348c7b2d70b725adfbdfa (patch)
treec4c8dc52508717b3b7aa7c988924a03aa6eb83d8 /gnu/packages/video.scm
parentca7e310f7ac32354b2e693e9a0f783320952a8fc (diff)
parenteeb71d778f149834015858467fbeeb1276d96d1d (diff)
downloadguix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.tar.gz
guix-9d074e16c7a9879d67c348c7b2d70b725adfbdfa.zip
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/video.scm')
-rw-r--r--gnu/packages/video.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7df68e8f53..ff52b9b38d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1701,6 +1701,11 @@ operate properly.")
;; --enable-libzvbi enable teletext support via libzvbi [no]
;; --enable-opencl enable OpenCL code
#~(list
+ #$@(if (target-powerpc?)
+ ;; These tests fail on powerpc64-le (see:
+ ;; https://trac.ffmpeg.org/ticket/9604).
+ '("--ignore-tests=checkasm-sw_scale,filter-scale2ref_keep_aspect")
+ '())
"--enable-gpl" ;enable optional gpl licensed parts
"--enable-shared"
"--enable-frei0r"
@@ -2158,7 +2163,7 @@ streaming protocols.")
(inputs
(list alsa-lib
cdparanoia
- ffmpeg-4
+ ffmpeg-5
fontconfig
freetype
giflib
@@ -4583,7 +4588,7 @@ tools for styling them, including a built-in real-time video preview.")
python-pygobject))
;; Propagate librsvg so that is is registered in GDK_PIXBUF_MODULE_FILE,
;; otherwise pitivi fails to launch.
- (propagated-inputs (list librsvg))
+ (propagated-inputs (list (librsvg-for-system)))
(arguments
`(#:glib-or-gtk? #t
#:phases