diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/animation.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/animation.scm')
| -rw-r--r-- | gnu/packages/animation.scm | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 6f116af63c..c281772563 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -82,8 +82,7 @@ "-Dlog=true" "-Dtest=true"))) (native-inputs - `(("googletest" ,googletest) - ("pkg-config" ,pkg-config))) + (list googletest pkg-config)) (synopsis "Lottie Animation Library") (description "Rlottie is a platform independent standalone c++ library for rendering vector based animations and art in realtime.") @@ -179,11 +178,10 @@ C++ @dfn{Standard Template Library} (STL).") ("libxml++" ,libxml++) ("libsigc++" ,libsigc++) ("mlt" ,mlt-6) - ("openexr" ,openexr) + ("openexr" ,openexr-2) ("pango" ,pango))) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + (list intltool pkg-config)) (home-page "https://www.synfig.org") (synopsis "Vector-based 2D animation renderer") (description @@ -225,13 +223,9 @@ for tweening, preventing the need to hand-draw each frame.") `("XDG_DATA_DIRS" ":" prefix (,gtk-share))) #t)))))) (inputs - `(("gtkmm" ,gtkmm) - ("gtk+" ,gtk+) - ("libsigc++" ,libsigc++) - ("synfig" ,synfig))) + (list gtkmm-3 gtk+ libsigc++ synfig)) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + (list pkg-config intltool)) (home-page "https://www.synfig.org") (synopsis "Vector-based 2D animation package (GUI)") (description @@ -454,7 +448,7 @@ language.") ("qtmultimedia" ,qtmultimedia) ("libsndfile" ,libsndfile))) (native-inputs - `(("qttools" ,qttools))) + (list qttools)) (home-page "https://www.lostmarble.com/papagayo/") (synopsis "Lip-syncing for animations") (description @@ -480,10 +474,7 @@ waveform until they line up with the proper sounds.") "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - `(("qtbase" ,qtbase-5) - ("qtxmlpatterns" ,qtxmlpatterns) - ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg)) (arguments `(#:phases (modify-phases %standard-phases |