[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: synfig: Update to 1.4.4.
From: |
guix-commits |
Subject: |
02/06: gnu: synfig: Update to 1.4.4. |
Date: |
Tue, 3 Jan 2023 18:32:32 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 5c08ed09397ac01c29100c3c2a879de089f92f6f
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Jan 3 23:10:57 2023 +0100
gnu: synfig: Update to 1.4.4.
* gnu/packages/animation.scm (synfig): Update to 1.4.4.
[inputs]: Drop labels; remove ffmpeg.
[propagated-inputs]: Drop labels; add ffmpeg-4; replace glibmm with
glibmm-2.64; replace libxml++ with libxml++-2.
[arguments]: Remove.
---
gnu/packages/animation.scm | 83 +++++++++++++++-------------------------------
1 file changed, 26 insertions(+), 57 deletions(-)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index a7f0702ac0..e1a5ba3de1 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -123,68 +123,37 @@ C++ @dfn{Standard Template Library} (STL).")
(version synfig-version)
(source (origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/synfig/releases/"
- version "/source/synfig-" version
- ".tar.gz"))
+ (uri (string-append "https://github.com/synfig/synfig"
+ "/releases/download/v" version
+ "/synfig-" version ".tar.gz"))
(sha256
(base32
- "1vy27kl68sbg41sfasa58k3p2nc1xfalvzk3k9gich9h90rpnpsz"))))
+ "01kgfmjfjk5y0v9ldmxzc8zzvbiaakz7nzg4hkj24gj3j6h8566d"))))
(build-system gnu-build-system)
- (arguments
- `(#:configure-flags
- ;; The Boost library path is taken from the value of BOOST_LDFLAGS.
- (list (string-append "BOOST_LDFLAGS=-L"
- (assoc-ref %build-inputs "boost")
- "/lib"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-boost-build-error
- ;; A chain of Boost headers leads to this error: "make_array" is
- ;; not a member of "boost::serialization". This can be avoided by
- ;; loading the "array_wrapper" header first.
- (lambda _
- (substitute* "src/synfig/valuenodes/valuenode_dynamic.cpp"
- (("#include <boost/numeric/odeint/integrate/integrate.hpp>"
match)
- (string-append
- "#include <boost/serialization/array_wrapper.hpp>\n" match)))
- #t))
- (add-after 'unpack 'adapt-to-libxml++-changes
- (lambda _
- (substitute* "configure"
- (("libxml\\+\\+-2\\.6") "libxml++-3.0"))
- (substitute* (append (find-files "src/modules/" "\\.cpp$")
- (find-files "src/synfig/" "\\.(cpp|h)$"))
- (("add_child\\(") "add_child_element(")
- (("get_child_text\\(") "get_first_child_text(")
- (("set_child_text\\(") "set_first_child_text(")
- (("remove_child\\(") "remove_node("))
- (substitute* "src/modules/mod_svg/svg_parser.cpp"
- (("xmlpp::Node::NodeList") "xmlpp::Node::const_NodeList"))
- #t)))))
(inputs
- `(("boost" ,boost)
- ("ffmpeg" ,ffmpeg)
- ("libdv" ,libdv)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libmng" ,libmng)
- ("zlib" ,zlib)))
- ;; synfig.pc lists the following as required: Magick++ freetype2
- ;; fontconfig fftw OpenEXR ETL glibmm-2.4 giomm-2.4 libxml++-3.0 sigc++-2.0
- ;; cairo pango pangocairo mlt++
+ (list boost
+ libdv
+ libjpeg-turbo
+ libpng
+ libmng
+ zlib))
+ ;; synfig.pc lists the following as required: Magick++ libavcodec
+ ;; libavformat libswscale freetype2 fontconfig OpenEXR ETL glibmm-2.4
+ ;; giomm-2.4 libxml++-2.6 sigc++-2.0 cairo fftw3 pango pangocairo mlt++
(propagated-inputs
- `(("cairo" ,cairo)
- ("etl" ,etl)
- ("fftw" ,fftw)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glibmm" ,glibmm)
- ("imagemagick" ,imagemagick)
- ("libxml++" ,libxml++)
- ("libsigc++" ,libsigc++)
- ("mlt" ,mlt-6)
- ("openexr" ,openexr-2)
- ("pango" ,pango)))
+ (list cairo
+ etl
+ ffmpeg-4
+ fftw
+ fontconfig
+ freetype
+ glibmm-2.64
+ imagemagick
+ libxml++-2
+ libsigc++
+ mlt-6
+ openexr-2
+ pango))
(native-inputs
(list intltool pkg-config))
(home-page "https://www.synfig.org")
- branch master updated (2361086b7c -> 4a487941ad), guix-commits, 2023/01/03
- 03/06: gnu: synfigstudio: Use gexp., guix-commits, 2023/01/03
- 04/06: gnu: synfigstudio: Update to 1.4.4., guix-commits, 2023/01/03
- 02/06: gnu: synfig: Update to 1.4.4.,
guix-commits <=
- 01/06: gnu: etl: Update to 1.4.4., guix-commits, 2023/01/03
- 06/06: gnu: r-qs: Add missing inputs., guix-commits, 2023/01/03
- 05/06: gnu: Add r-multidplyr., guix-commits, 2023/01/03