From 52b9f0ef1e1d80275ea39ba146f286f6a91c9585 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <paul@apatience.com>
Date: Thu, 15 Sep 2022 13:16:25 +0000
Subject: gnu: Add discregrid.
* gnu/packages/graphics.scm (discregrid): New variable.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/graphics.scm | 69 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index fe38e7d03f..93cbb23620 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2202,6 +2202,75 @@ (define-public azpainter
")
(license license:gpl3+)))
+(define-public discregrid
+ (let ((commit "4c27e1cc88be828c6ac5b8a05759ac7e01cf79e9")
+ (revision "0"))
+ (package
+ (name "discregrid")
+ (version (git-version "0.0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/InteractiveComputerGraphics/Discregrid")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01cwfpw19rc9k5glx9dhnqpihd0is28a9b53qvzp5kgjmdq2v1p0"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ (delete-file-recursively "extern/cxxopts")
+ (substitute* '("cmd/discrete_field_to_bitmap/main.cpp"
+ "cmd/generate_density_map/main.cpp"
+ "cmd/generate_sdf/main.cpp")
+ (("^#include <cxxopts/cxxopts\\.hpp>")
+ "#include <cxxopts.hpp>"))))))
+ (build-system cmake-build-system)
+ (outputs '("out" "bin"))
+ (arguments
+ (list #:tests? #f ; No tests
+ #:configure-flags
+ #~(list (string-append "-DCMAKE_INSTALL_BINDIR="
+ #$output:bin "/bin")
+ ;; Bespoke version of BUILD_SHARED_LIBS.
+ "-DBUILD_AS_SHARED_LIBS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake
+ (lambda _
+ (let ((port (open-file "cmd/CMakeLists.txt" "a")))
+ (display "install(TARGETS
+ DiscreteFieldToBitmap
+ GenerateDensityMap
+ GenerateSDF)
+"
+ port)
+ (close-port port)))))))
+ (inputs
+ (list cxxopts eigen))
+ (home-page "https://github.com/InteractiveComputerGraphics/Discregrid")
+ (synopsis "Discretize functions on regular grids")
+ (description "Discregrid is a C++ library for the parallel discretization
+of (preferably smooth) functions on regular grids. It generates a (cubic)
+polynomial discretization given a box-shaped domain, a grid resolution, and a
+3D scalar field. The library can also serialize and deserialize the generated
+discrete grid, and compute and discretize the signed distance field
+corresponding to a triangle mesh. The following programs are included with
+Discregrid:
+
+@itemize
+@item @code{GenerateSDF}: Computes a discrete (cubic) signed distance field
+from a triangle mesh in OBJ format.
+
+@item @code{DiscreteFieldToBitmap}: Generates an image in bitmap format of a
+two-dimensional slice of a previously computed discretization.
+
+@item @code{GenerateDensityMap}: Generates a density map from a previously
+generated discrete signed distance field using the cubic spline kernel.
+@end itemize")
+ (license license:expat))))
+
(define-public mmg
(package
(name "mmg")
--
cgit v1.2.3
From c3b0be1fa21e1513d835880c57b0ef8ca4015186 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 9 Oct 2022 21:31:42 +0200
Subject: gnu: directfb: Use 'librsvg-for-system'.
This fixes compilation on i686-linux.
* gnu/packages/graphics.scm (directfb)[inputs]: Use 'librsvg-for-system'
instead of 'librsvg'.
---
gnu/packages/graphics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 93cbb23620..3d67a85b4a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -210,7 +210,7 @@ (define-public directfb
("opengl" ,mesa)
("png" ,libpng)
("sdl" ,sdl)
- ("svg" ,librsvg)
+ ("svg" ,(librsvg-for-system))
("tiff" ,libtiff)
("tslib" ,tslib)
("vdpau" ,libvdpau)
--
cgit v1.2.3
From e3362e249a48489d51fe6a5a92f3ce0073af30cf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 9 Oct 2022 21:34:55 +0200
Subject: gnu: directfb: Remove input labels.
* gnu/packages/graphics.scm (directfb)[inputs]: Remove labels.
---
gnu/packages/graphics.scm | 60 +++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 3d67a85b4a..c6639c4c95 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -192,36 +192,36 @@ (define-public directfb
(native-inputs
(list autoconf automake libtool perl pkg-config))
(inputs
- `(("alsa" ,alsa-lib)
- ("ffmpeg" ,ffmpeg)
- ("freetype" ,freetype)
- ("glu" ,glu)
- ("gstreamer" ,gstreamer)
- ("imlib2" ,imlib2)
- ("jasper" ,jasper)
- ("jpeg" ,libjpeg-turbo)
- ("libcddb" ,libcddb)
- ("libdrm" ,libdrm)
- ("libtimidity" ,libtimidity)
- ("mad" ,libmad)
- ("mng" ,libmng)
- ("mpeg2" ,libmpeg2)
- ("mpeg3" ,libmpeg3)
- ("opengl" ,mesa)
- ("png" ,libpng)
- ("sdl" ,sdl)
- ("svg" ,(librsvg-for-system))
- ("tiff" ,libtiff)
- ("tslib" ,tslib)
- ("vdpau" ,libvdpau)
- ("vorbisfile" ,libvorbis)
- ("wayland" ,wayland)
- ("webp" ,libwebp)
- ("x11" ,libx11)
- ("xcomposite" ,libxcomposite)
- ("xext" ,libxext)
- ("xproto" ,xorgproto)
- ("zlib" ,zlib)))
+ (list alsa-lib
+ ffmpeg
+ freetype
+ glu
+ gstreamer
+ imlib2
+ jasper
+ libjpeg-turbo
+ libcddb
+ libdrm
+ libtimidity
+ libmad
+ libmng
+ libmpeg2
+ libmpeg3
+ mesa
+ libpng
+ sdl
+ (librsvg-for-system)
+ libtiff
+ tslib
+ libvdpau
+ libvorbis
+ wayland
+ libwebp
+ libx11
+ libxcomposite
+ libxext
+ xorgproto
+ zlib))
(propagated-inputs
(list flux))
(synopsis "DFB Graphics Library")
--
cgit v1.2.3
From 831e038dffa33ba1b167c777f71c4510cb022d7c Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Mon, 19 Sep 2022 12:56:13 +0200
Subject: gnu: openexr: Apply 'guix style'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/graphics.scm (openexr): apply guix style.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/graphics.scm | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c6639c4c95..168de7af3d 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1118,29 +1118,29 @@ (define-public openexr
(package
(name "openexr")
(version "3.1.3")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/AcademySoftwareFoundation/openexr")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/AcademySoftwareFoundation/openexr")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
(build-system cmake-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- ;; /var/tmp does not exist in the Guix build environment
- (add-after 'unpack 'patch-test-directory
- (lambda _
- (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
- "src/test/OpenEXRFuzzTest/tmpDir.h"
- "src/test/OpenEXRTest/tmpDir.h"
- "src/test/OpenEXRCoreTest/main.cpp")
- (("/var/tmp") "/tmp")))))))
- (inputs
- (list imath zlib))
+ '(#:phases (modify-phases %standard-phases
+ ;; /var/tmp does not exist in the Guix build environment
+ (add-after 'unpack 'patch-test-directory
+ (lambda _
+ (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
+ "src/test/OpenEXRFuzzTest/tmpDir.h"
+ "src/test/OpenEXRTest/tmpDir.h"
+ "src/test/OpenEXRCoreTest/main.cpp")
+ (("/var/tmp")
+ "/tmp")))))))
+ (inputs (list imath zlib))
(home-page "https://www.openexr.com/")
(synopsis "High-dynamic-range file format library")
(description
--
cgit v1.2.3
From 4133e50026c9f2fbc4fb52553d7538da00daea9a Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Mon, 19 Sep 2022 12:56:14 +0200
Subject: gnu: openexr: Skip failing tests on i686.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/graphics.scm (openexr)[arguments]: Add
'disable-broken-tests' phase.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/graphics.scm | 44 ++++++++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 10 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 168de7af3d..c5695ae408 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1130,16 +1130,40 @@ (define-public openexr
"0c9vla0kbsbbhkk42jlbf94nzfb1anqh7dy9b0b3nna1qr6v4bh6"))))
(build-system cmake-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- ;; /var/tmp does not exist in the Guix build environment
- (add-after 'unpack 'patch-test-directory
- (lambda _
- (substitute* '("src/test/OpenEXRUtilTest/tmpDir.h"
- "src/test/OpenEXRFuzzTest/tmpDir.h"
- "src/test/OpenEXRTest/tmpDir.h"
- "src/test/OpenEXRCoreTest/main.cpp")
- (("/var/tmp")
- "/tmp")))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-test-directory
+ (lambda _
+ (substitute* (list
+ "src/test/OpenEXRUtilTest/tmpDir.h"
+ "src/test/OpenEXRFuzzTest/tmpDir.h"
+ "src/test/OpenEXRTest/tmpDir.h"
+ "src/test/OpenEXRCoreTest/main.cpp")
+ (("/var/tmp")
+ "/tmp"))))
+ #$@(if (target-64bit?)
+ #~()
+ #~((add-after 'patch-test-directory 'disable-broken-tests
+ (lambda _
+ ;; Disable tests that fail at least on i686-linux.
+ (substitute* '("src/test/OpenEXRCoreTest/main.cpp"
+ "src/test/OpenEXRTest/main.cpp")
+ (("TEST \\(testCompression, \"basic\"\\);")
+ "")
+ (("TEST\\( testNoCompression, \"core_compression\" \\);")
+ "")
+ (("TEST\\( testRLECompression, \"core_compression\" \\);")
+ "")
+ (("TEST\\( testZIPCompression, \"core_compression\" \\);")
+ "")
+ (("TEST\\( testZIPSCompression, \"core_compression\" \\);")
+ "")
+ (("TEST\\( testB44Compression, \"core_compression\" \\);")
+ "")
+ (("TEST\\( testB44ACompression, \"core_compression\" \\);")
+ "")
+ (("TEST \\(testOptimizedInterleavePatterns, \"basic\"\\);")
+ "")))))))))
(inputs (list imath zlib))
(home-page "https://www.openexr.com/")
(synopsis "High-dynamic-range file format library")
--
cgit v1.2.3
From ff324d3814599857cb9b1133223d4d46b5161cdb Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 11 Oct 2022 15:20:31 +0200
Subject: gnu: mmg: Add dependency on Perl.
* gnu/packages/graphics.scm (mmg)[native-inputs]: Add PERL.
---
gnu/packages/graphics.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c5695ae408..59bc3a217d 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2373,7 +2373,8 @@ (define-public mmg
;; TODO: Fix failing LaTeX invocation (which results in equations
;; being inserted literally into PNGs rather than being typeset).
;;texlive-tiny
- ))
+
+ perl)) ;used to generate Fortran headers
(inputs
(list scotch))
(home-page "http://www.mmgtools.org/")
--
cgit v1.2.3
From 99cf2f4dfb6fd1eb1e4f9b2ae95b08ed2dd06919 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <monego@posteo.net>
Date: Sat, 29 Oct 2022 11:54:26 -0300
Subject: gnu: openxr: Update to 1.0.25.
* gnu/packages/graphics.scm (openxr): Update to 1.0.25.
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 1d19e1b388..8ac4a8dc6e 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2096,7 +2096,7 @@ (define-public drawpile
(define-public openxr
(package
(name "openxr")
- (version "1.0.24")
+ (version "1.0.25")
(source
(origin
(method git-fetch)
@@ -2110,7 +2110,7 @@ (define-public openxr
;; Delete bundled jsoncpp.
(delete-file-recursively "src/external/jsoncpp")))
(sha256
- (base32 "1lkbw03hpwnqcbn0fmxs4cnp5m04hc0ys6y111n7vlrg11sjdpq5"))))
+ (base32 "1p8nfxswgy40zxizh925a477jcsfngbwns65qzaid5rmrvvk8c45"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
--
cgit v1.2.3
From 451d2802f6471d1a5f2eea08ae7ce2ad8747f797 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 3 Nov 2022 15:06:55 -0400
Subject: gnu: fmt: Update to 9.1.0.
* gnu/packages/pretty-print.scm (fmt): Update to 9.1.0.
(fmt-8): New variable.
* gnu/packages/hyperledger.scm (hyperledger-iroha)
[snippet]: Delete trailing #t.
[native-inputs]: Re-indent. Replace fmt with fmt-8.
* gnu/packages/networking.scm (opendht) [inputs]: Replace fmt with fmt-8.
* gnu/packages/storage.scm (ceph): Likewise.
* gnu/packages/video.scm (mkvtoolnix): Likewise.
* gnu/packages/aidc.scm (zxing-cpp): Likewise.
* gnu/packages/wm.scm (waybar): Likewise.
* gnu/packages/geo.scm (osm2pgsql): Likewise.
* gnu/packages/graphics.scm (openimageio): Likewise.
* gnu/packages/build-tools.scm (bear): Likewise.
* gnu/packages/networking.scm (restinio): Likewise.
---
gnu/packages/aidc.scm | 3 +--
gnu/packages/build-tools.scm | 2 +-
gnu/packages/geo.scm | 2 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/hyperledger.scm | 9 ++++++---
gnu/packages/networking.scm | 4 ++--
gnu/packages/pretty-print.scm | 30 ++++++++++++++++++++----------
gnu/packages/storage.scm | 2 +-
gnu/packages/video.scm | 2 +-
gnu/packages/wm.scm | 2 +-
10 files changed, 35 insertions(+), 23 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 5e77ae3c5a..b0fc1b30d9 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -64,8 +64,7 @@ (define-public zxing-cpp
(base32
"1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5"))))
(build-system cmake-build-system)
- (native-inputs
- (list fmt googletest))
+ (native-inputs (list fmt-8 googletest))
(synopsis "C++ port of ZXing")
(description "ZXing-CPP is a barcode scanning library.")
(home-page "https://github.com/nu-book/zxing-cpp")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 376c4d3486..9cd11f08ea 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -135,7 +135,7 @@ (define-public bear
(invoke "ctest")))))))
(inputs
`(("c-ares" ,c-ares)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("grpc" ,grpc)
("json-modern-cxx" ,json-modern-cxx)
("protobuf" ,protobuf)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index dc5a77e820..9895756864 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1384,7 +1384,7 @@ (define-public osm2pgsql
(list boost
bzip2
expat
- fmt
+ fmt-8
libosmium
lua
postgresql
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8ac4a8dc6e..e15a533f5b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1251,7 +1251,7 @@ (define-public openimageio
(list pkg-config))
(inputs
`(("boost" ,boost)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("libheif" ,libheif)
("libpng" ,libpng)
("libjpeg" ,libjpeg-turbo)
diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm
index 2a4b87e927..45436da7db 100644
--- a/gnu/packages/hyperledger.scm
+++ b/gnu/packages/hyperledger.scm
@@ -166,8 +166,7 @@ (define-public hyperledger-iroha
;; https://github.com/hyperledger/iroha/commit/4dc710d2e9a067af866771318f673c7392797e48
;; Backport unversioned fmt dependency, remove next update:
(substitute* "libs/logger/logger.hpp"
- (("fmt::v5") "fmt"))
- #t))))
+ (("fmt::v5") "fmt"))))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
@@ -179,7 +178,11 @@ (define-public hyperledger-iroha
#:test-target "."))
;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST
(native-inputs
- (list fmt googletest rapidjson rxcpp spdlog))
+ (list fmt-8
+ googletest
+ rapidjson
+ rxcpp
+ spdlog))
(inputs
(list boost
gflags
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index cd095a0ed8..b0393a7e69 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3649,7 +3649,7 @@ (define-public restinio
pcre2
sobjectizer))
(propagated-inputs
- (list asio fmt http-parser))
+ (list asio fmt-8 http-parser))
(arguments
`(#:configure-flags '("-DRESTINIO_INSTALL=on")
#:tests? #f ; TODO: The tests are called from the root CMakelist, need RESTINIO_TEST=on.
@@ -3737,7 +3737,7 @@ (define-public opendht
(chmod dhtcluster #o555)
(wrap-program dhtcluster
`("GUIX_PYTHONPATH" prefix (,site-packages)))))))))
- (inputs (list bash-minimal fmt readline))
+ (inputs (list bash-minimal fmt-8 readline))
(propagated-inputs
(list msgpack ;included in several installed headers
restinio ;included in opendht/http.h
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 6dcf1675c4..7bc54c4a0b 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -166,28 +167,37 @@ (define-public enscript
(define-public fmt
(package
(name "fmt")
- (version "8.1.1")
+ (version "9.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
version "/fmt-" version ".zip"))
(sha256
- (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))
+ (base32 "15n9yi6xzzs7g9rm87kg8y5yhl2zrqj3bjr845saa63f6swlrsyc"))))
(build-system cmake-build-system)
- (arguments
- '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
- (native-inputs
- (list unzip))
+ (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+ (native-inputs (list unzip))
(home-page "https://fmt.dev")
(synopsis "Small and fast C++ formatting library")
- (description
- "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++.
-It can be used as a safe alternative to @code{printf} or as a fast alternative
-to @code{IOStreams}.")
+ (description "@code{fmt} (formerly @code{cppformat}) is a formatting
+library for C++. It can be used as a safe alternative to @code{printf} or as
+a fast alternative to @code{IOStreams}.")
;; The library is bsd-2, but documentation and tests include other licenses.
(license (list bsd-2 bsd-3 psfl))))
+(define-public fmt-8
+ (package
+ (inherit fmt)
+ (version "8.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/fmtlib/fmt/releases/download/"
+ version "/fmt-" version ".zip"))
+ (sha256
+ (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3"))))))
+
(define-public fmt-8.0
(package
(inherit fmt)
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 86ae1c883f..9d360e8eb3 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -201,7 +201,7 @@ (define-public ceph
("cryptsetup" ,cryptsetup)
("expat" ,expat)
("fcgi" ,fcgi)
- ("fmt" ,fmt)
+ ("fmt" ,fmt-8)
("fuse" ,fuse)
("icu4c" ,icu4c)
("jemalloc" ,jemalloc)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c95bb02507..c8f3c6f8a5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1029,7 +1029,7 @@ (define-public mkvtoolnix
libebml
file
flac
- fmt
+ fmt-8
libdvdread
libmatroska
libogg
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index eedd339c6c..54e1c9c016 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1734,7 +1734,7 @@ (define-public waybar
(base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k"))))
(build-system meson-build-system)
(inputs (list date
- fmt
+ fmt-8
gtk-layer-shell
gtkmm-3
jsoncpp
--
cgit v1.2.3
From 474070facbb6c718788b8e9ba7abcc473804d8f4 Mon Sep 17 00:00:00 2001
From: dan <i@dan.games>
Date: Tue, 8 Nov 2022 23:29:04 +0800
Subject: gnu: mangohud: Update to 0.6.8.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/graphics.scm (mangohud): Update to 0.6.8.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e15a533f5b..4125c8078c 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -979,7 +979,7 @@ (define-public alembic
(define-public mangohud
(package
(name "mangohud")
- (version "0.6.7")
+ (version "0.6.8")
(source
(origin
(method git-fetch)
@@ -988,7 +988,7 @@ (define-public mangohud
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0n2x6agv2j8nd6h1998dqsphb7k57zx8vsayv47dqix28kg5kixz"))))
+ (base32 "19dp8l5njzl9xah0bhwlkl39vc8w2rnpvpdrhgaz3hnhz8b0r5df"))))
(build-system meson-build-system)
(arguments
(list
--
cgit v1.2.3
From 45fe602602d83a85b67bb6ed6c7ff5964af9e68d Mon Sep 17 00:00:00 2001
From: dan <i@dan.games>
Date: Sat, 12 Nov 2022 02:35:19 +0800
Subject: gnu: blender: Update to 3.3.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/graphics.scm (blender): Update to 3.3.1.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/graphics.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 4125c8078c..54637fa55a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -32,6 +32,7 @@
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2022 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -429,14 +430,14 @@ (define-public openvdb
(define-public blender
(package
(name "blender")
- (version "3.0.1")
+ (version "3.3.1")
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz"))
(sha256
(base32
- "0hblgls5pclqamsxk0vb14f4fm30hdiq7fb2bm5mq2ly4sb0mfqr"))))
+ "1jlc26axbhh97d2j6kfg9brgiq8j412mgmw7p41ah34apzq4inia"))))
(build-system cmake-build-system)
(arguments
(let ((python-version (version-major+minor (package-version python))))
--
cgit v1.2.3
From bd0ff2d39bc7d3b497d74c3431ef77a1cf2515c4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sat, 19 Nov 2022 18:06:36 +0100
Subject: gnu: Remove coin3D@3.
* gnu/packages/graphics.scm (coin3D): Take the body from ...
(coin3D-4): ... this now-deprecated variable.
* gnu/packages/engineering.scm (freecad)[inputs]: Change from COIN3D-4 to COIN3D.
* gnu/packages/python-xyz.scm (python-pivy)[inputs]: Likewise.
* gnu/packages/qt.scm (soqt)[inputs]: Likewise.
---
gnu/packages/engineering.scm | 2 +-
gnu/packages/graphics.scm | 118 ++++++++++++++-----------------------------
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/qt.scm | 2 +-
4 files changed, 40 insertions(+), 84 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 6388c64101..21569b07c9 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2463,7 +2463,7 @@ (define-public freecad
swig))
(inputs
(list boost
- coin3D-4
+ coin3D
double-conversion
eigen
fontconfig
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 54637fa55a..60c6a979c5 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -134,6 +134,7 @@ (define-module (gnu packages graphics)
#:use-module (guix hg-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix deprecation)
#:use-module (guix utils))
(define-public mmm
@@ -1799,102 +1800,57 @@ (define-public opencsg
(license license:gpl2))))
(define-public coin3D
- ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release. See:
- ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified
- (let ((revision 1)
- (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d"))
- (package
- (name "coin3D")
- (version
- (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7)))
- (source
- (origin
- (method hg-fetch)
- (uri (hg-reference
- (url "https://bitbucket.org/Coin3D/coin")
- (changeset changeset)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (for-each delete-file
- '("cfg/csubst.exe"
- "cfg/wrapmsvc.exe"))
- #t))))
- (build-system cmake-build-system)
- (native-inputs
- (list doxygen graphviz))
- (inputs
- (list boost freeglut glew))
- (arguments
- `(#:configure-flags
- (list
- "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
- (string-append "-DBOOST_ROOT="
- (assoc-ref %build-inputs "boost")))))
- (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
- (synopsis
- "High-level 3D visualization library with Open Inventor 2.1 API")
- (description
- "Coin is a 3D graphics library with an Application Programming Interface
-based on the Open Inventor 2.1 API. For those who are not familiar with
-Open Inventor, it is a scene-graph based retain-mode rendering and model
-interaction library, written in C++, which has become the de facto
-standard graphics library for 3D visualization and visual simulation
-software in the scientific and engineering community.")
- (license license:bsd-3))))
-
-(define-public coin3D-4
- (package
+ (package
(name "coin3D")
(version "4.0.0")
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coin3d/coin")
- (commit (string-append "Coin-" version))
- (recursive? #t)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Delete binaries
- (for-each delete-file
- '("cfg/csubst.exe"
- "cfg/wrapmsvc.exe"))
- ;; Delete references to packaging tool cpack. Otherwise the build
- ;; fails with "add_subdirectory given source "cpack.d" which is not
- ;; an existing directory."
- (substitute* "CMakeLists.txt"
- ((".*cpack.d.*") ""))
- #t))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coin3d/coin")
+ (commit (string-append "Coin-" version))
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete binaries
+ (for-each delete-file
+ '("cfg/csubst.exe"
+ "cfg/wrapmsvc.exe"))
+ ;; Delete references to packaging tool cpack. Otherwise the build
+ ;; fails with "add_subdirectory given source "cpack.d" which is not
+ ;; an existing directory."
+ (substitute* "CMakeLists.txt"
+ ((".*cpack.d.*") ""))
+ #t))))
(build-system cmake-build-system)
(native-inputs
- (list doxygen graphviz))
+ (list doxygen graphviz))
(inputs
- (list boost freeglut glew))
+ (list boost freeglut glew))
(arguments
- `(#:configure-flags
- (list
- "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
- (string-append "-DBOOST_ROOT="
- (assoc-ref %build-inputs "boost")))))
+ `(#:configure-flags
+ (list
+ "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
+ (string-append "-DBOOST_ROOT="
+ (assoc-ref %build-inputs "boost")))))
(home-page "https://github.com/coin3d/coin")
(synopsis
- "High-level 3D visualization library with Open Inventor 2.1 API")
+ "High-level 3D visualization library with Open Inventor 2.1 API")
(description
- "Coin is a 3D graphics library with an Application Programming Interface
+ "Coin is a 3D graphics library with an Application Programming Interface
based on the Open Inventor 2.1 API. For those who are not familiar with Open
Inventor, it is a scene-graph based retain-mode rendering and model interaction
library, written in C++, which has become the de facto standard graphics
library for 3D visualization and visual simulation software in the scientific
and engineering community.")
- (license license:bsd-3)))
+ (license license:bsd-3)))
+
+(define-deprecated coin3D-4 coin3D)
+(export coin3D-4)
(define-public skia
;; Releases follow those of Chromium, about every 6 weeks. The release
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 93e17c3f1a..b0bf16e3da 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -28118,7 +28118,7 @@ (define-public python-pivy
libice
soqt
glew
- coin3D-4))
+ coin3D))
(home-page "https://github.com/coin3d/pivy")
(synopsis "Python bindings to Coin3D")
(description
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8ad9dd4cc0..5ed8ec2c8e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4234,7 +4234,7 @@ (define-public soqt
(native-inputs
(list pkg-config cmake))
(inputs
- (list qtbase-5 coin3D-4))
+ (list qtbase-5 coin3D))
(home-page "https://github.com/coin3d/soqt")
(synopsis "Qt GUI component toolkit library for Coin")
(description "SoQt is a Qt GUI component toolkit library for Coin. It is
--
cgit v1.2.3
From c3e4163aaf8d3dd5c8a8970b79bb044563783d47 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <monego@posteo.net>
Date: Mon, 5 Dec 2022 19:32:00 -0300
Subject: gnu: openxr: Update to 1.0.26.
* gnu/packages/graphics.scm (openxr): Update to 1.0.26.
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 60c6a979c5..efe1deede4 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2053,7 +2053,7 @@ (define-public drawpile
(define-public openxr
(package
(name "openxr")
- (version "1.0.25")
+ (version "1.0.26")
(source
(origin
(method git-fetch)
@@ -2067,7 +2067,7 @@ (define-public openxr
;; Delete bundled jsoncpp.
(delete-file-recursively "src/external/jsoncpp")))
(sha256
- (base32 "1p8nfxswgy40zxizh925a477jcsfngbwns65qzaid5rmrvvk8c45"))))
+ (base32 "0s66xgwkdj5vn05l493hqydrxfpxxidd6mcb8l7l5awhn88cy16f"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; there are no tests
--
cgit v1.2.3
From 79564bf9977ebba0b31d8dc291eb039142f51f68 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Mon, 12 Dec 2022 14:27:05 +0100
Subject: gnu: ffmpeg: Promote version 5 to the default.
* gnu/packages/video.scm (ffmpeg): Alias to FFMPEG-5.
(mlt-6)[inpust]: Replace "ffmpeg" with FFMPEG-4.
(transcode, libquicktime, ffmpegthumbnailer, mplayer, obs,
simplescreenrecorder, handbrake, ffms2, libopenshot, wlstream)[inputs]: Change
from FFMPEG to FFMPEG-4.
* gnu/packages/arcan.scm (arcan)[inputs]: Likewise.
* gnu/packages/astronomy.scm (stackistry, libskry)[inputs]: Likewise.
* gnu/packages/audio.scm (aubio, bs1770gain)[inputs]: Likewise.
* gnu/packages/education.scm (openboard)[inputs]: Likewise.
* gnu/packages/emulators.scm (dolphin-emu, retroarch, pcsxr, ppsspp)[inputs]:
Likewise.
* gnu/packages/game-development.scm (warsow-qfusion)[inputs]: Likewise.
* gnu/packages/games.scm (oshu, hedgewars)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/graphics.scm (openscenegraph)[inputs]: Likewise.
* gnu/packages/image-processing.scm (opencv, paraview-5.9)[inputs]: Likewise.
* gnu/packages/julia-jll.scm (julia-ffmpeg-jll)[inputs]: Likewise.
* gnu/packages/kde-multimedia.scm (kid3)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/linphone.scm (mediastreamer2)[inputs]: Likewise.
* gnu/packages/linux.scm (pipewire)[inputs]: Likewise.
(pipewire-0.3)[inputs]: Replace "ffmpeg" with FFMPEG.
* gnu/packages/mp3.scm (chromaprint)[inputs]: Change from FFMPEG to FFMPEG-4.
* gnu/packages/music.scm (musikcube)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/qt.scm (qtwebengine-5)[inputs]: Likewise.
---
gnu/packages/arcan.scm | 2 +-
gnu/packages/astronomy.scm | 4 ++--
gnu/packages/audio.scm | 8 ++++++--
gnu/packages/education.scm | 2 +-
gnu/packages/emulators.scm | 8 ++++----
gnu/packages/game-development.scm | 2 +-
gnu/packages/games.scm | 4 ++--
gnu/packages/gnunet.scm | 2 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/image-processing.scm | 4 ++--
gnu/packages/julia-jll.scm | 2 +-
gnu/packages/kde-multimedia.scm | 2 +-
gnu/packages/kodi.scm | 2 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 3 ++-
gnu/packages/mp3.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/rdesktop.scm | 2 +-
gnu/packages/video.scm | 23 ++++++++++++-----------
20 files changed, 43 insertions(+), 37 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index c25d64903c..7483777ff0 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -123,7 +123,7 @@ (define-public arcan
(files '("share/arcan/scripts")))))
(inputs
`(("apr" ,apr)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype)
("glib" ,glib)
("glu" ,glu)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c59f4d02a4..f99dbcbf06 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -813,7 +813,7 @@ (define-public stackistry
(native-inputs
(list pkg-config))
(inputs
- (list gtkmm-3 libskry ffmpeg))
+ (list gtkmm-3 libskry ffmpeg-4))
(home-page "https://github.com/GreatAttractor/stackistry")
(synopsis "Astronomical lucky imaging/image stacking tool")
(description
@@ -1714,7 +1714,7 @@ (define-public libskry
(copy-recursively "include" include))
#t)))))
(inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(home-page "https://github.com/GreatAttractor/libskry")
(synopsis "Astronimical lucky imaging library")
(description
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e480ce9e58..5e471d34e9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -603,7 +603,11 @@ (define-public aubio
"--enable-samplerate"
"--enable-avcodec")))
(inputs
- (list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec
+ (list jack-1
+ libsndfile
+ libsamplerate
+ ffmpeg-4 ;for libavcodec
+ fftwf))
(native-inputs
(list pkg-config))
(home-page "https://aubio.org/")
@@ -4442,7 +4446,7 @@ (define-public bs1770gain
,home-page))
#t))))
(build-system gnu-build-system)
- (inputs (list ffmpeg sox))
+ (inputs (list ffmpeg-4 sox))
(synopsis "Tool to adjust loudness of media files")
(description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index c0f7778c1c..0e3dd08c23 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -547,7 +547,7 @@ (define-public openboard
(inputs
(list alsa-lib
coreutils-minimal ;for patched 'env' shebang
- ffmpeg
+ ffmpeg-4
freetype
lame
libass
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5054ae3da5..11d1cda46f 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -323,7 +323,7 @@ (define-public dolphin-emu
bluez
curl
eudev
- ffmpeg
+ ffmpeg-4
font-wqy-microhei
freetype
glew
@@ -1471,7 +1471,7 @@ (define-public retroarch
"--disable-builtinminiupnpc")))))))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype)
("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon)
@@ -2035,7 +2035,7 @@ (define-public pcsxr
(list libcdio
sdl2
gtk+
- ffmpeg
+ ffmpeg-4
libxv
libarchive
pulseaudio))
@@ -2322,7 +2322,7 @@ (define-public ppsspp
(native-inputs (list pkg-config python))
(inputs (list bash
cityhash
- ffmpeg
+ ffmpeg-4
glew
glslang
libpng
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 4a0435045b..8fec474d0b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2665,7 +2665,7 @@ (define-public warsow-qfusion
`(("alsa-lib" ,alsa-lib)
("curl" ,curl)
("freetype" ,freetype)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libpng" ,libpng)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d8c5a34a41..4c5f28a55c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8478,7 +8478,7 @@ (define-public oshu
(native-inputs
(list pkg-config))
(inputs
- (list cairo ffmpeg pango sdl2 sdl2-image))
+ (list cairo ffmpeg-4 pango sdl2 sdl2-image))
(home-page "https://github.com/fmang/oshu/")
(synopsis "Rhythm game in which you click on circles")
(description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,
@@ -9318,7 +9318,7 @@ (define-public hedgewars
(string-append "../hedgewars-src-" #$version)
(install-file "misc/hedgewars.png" icons))))))))
(inputs
- (list ffmpeg
+ (list ffmpeg-4
freeglut
ghc-entropy
ghc-hslogger
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index b477fee537..c98ceefad7 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -100,7 +100,7 @@ (define-public libextractor
`(("exiv2" ,exiv2)
("bzip2" ,bzip2)
("flac" ,flac)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("file" ,file) ;libmagic, for the MIME plug-in
("glib" ,glib)
("giflib" ,giflib)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index efe1deede4..4642dfbe36 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1308,7 +1308,7 @@ (define-public openscenegraph
("jasper" ,jasper)
("librsvg" ,librsvg)
("libxrandr" ,libxrandr)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("mesa" ,mesa)))
(synopsis "High-performance real-time graphics toolkit")
(description
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index fb45e9b141..ab796d7719 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -620,7 +620,7 @@ (define-public opencv
(sha256
(base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26"))))))
(inputs
- (list ffmpeg
+ (list ffmpeg-4
gtk+
gtkglext
hdf5
@@ -925,7 +925,7 @@ (define-public paraview-5.9
double-conversion
eigen
expat
- ffmpeg
+ ffmpeg-4
freetype
gdal
gl2ps
diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm
index 594c36b6ce..2b0f644736 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -254,7 +254,7 @@ (define-public julia-ffmpeg-jll
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")))))))
(inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(propagated-inputs
(list julia-jllwrappers
julia-bzip2-jll
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 9fb3572909..d635eca26d 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -334,7 +334,7 @@ (define-public kid3
(native-inputs
(list docbook-xsl
extra-cmake-modules
- ffmpeg
+ ffmpeg-4
kdoctools
libxslt
python-wrapper
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 402ee221c5..18791359f2 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -399,7 +399,7 @@ (define-public kodi
("dcadec" ,dcadec)
("dbus" ,dbus)
("eudev" ,eudev)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("flac" ,flac)
("flatbuffers" ,flatbuffers)
("fmt" ,fmt-7)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7b5efeb588..130097ef40 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -645,7 +645,7 @@ (define-public mediastreamer2
("bcg729" ,bcg729)
("bcmatroska2" ,bcmatroska2)
("bctoolbox" ,bctoolbox)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("glew" ,glew)
("glu" ,glu)
("glx" ,mesa-utils)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c476940eed..9ea77069ca 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8991,7 +8991,7 @@ (define-public pipewire
(list alsa-lib
dbus
eudev
- ffmpeg
+ ffmpeg-4
gstreamer
gst-plugins-base
libva
@@ -9035,6 +9035,7 @@ (define-public pipewire-0.3
(modify-inputs (package-native-inputs pipewire)
(prepend python-docutils)))
(inputs (modify-inputs (package-inputs pipewire)
+ (replace "ffmpeg" ffmpeg)
(prepend avahi
bluez
jack-2
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index e2b112832b..03e4485618 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -643,7 +643,7 @@ (define-public chromaprint
(inputs
;; requires one of FFmpeg (prefered), FFTW3 or vDSP
;; use the same ffmpeg version as for acoustid-fingerprinter
- (list ffmpeg boost))
+ (list ffmpeg-4 boost))
(home-page "https://acoustid.org/chromaprint")
(synopsis "Audio fingerprinting library")
(description "Chromaprint is a library for calculating audio
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 026bb22770..e3cb67b413 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6806,7 +6806,7 @@ (define-public musikcube
(list alsa-lib
boost
curl
- ffmpeg
+ ffmpeg-4
lame
libev
libmicrohttpd
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 519a7d1548..6406fd5c49 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2546,7 +2546,7 @@ (define-public qtwebengine-5
cups-minimal
curl
dbus
- ffmpeg
+ ffmpeg-4
fontconfig
harfbuzz
icu4c
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 12a1d3e9eb..84a07e6ba9 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -101,7 +101,7 @@ (define-public freerdp
(inputs
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo)
("libusb" ,libusb)
("libx11" ,libx11)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a2cbc53f8c..a15c86ee07 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -273,7 +273,7 @@ (define-public transcode
python-wrapper))
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
freetype
imagemagick
lame
@@ -450,7 +450,7 @@ (define-public libquicktime
(list gettext-minimal doxygen pkg-config))
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
gtk+-2
lame
libdv
@@ -1876,7 +1876,7 @@ (define-public ffmpeg-2.8
(format #t "setting LD_LIBRARY_PATH to ~s~%" path)
(setenv "LD_LIBRARY_PATH" path)))))))))
-(define-public ffmpeg ffmpeg-4)
+(define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania
(hidden-package
@@ -1923,7 +1923,7 @@ (define-public ffmpegthumbnailer
(native-inputs
(list pkg-config))
(inputs
- (list ffmpeg libjpeg-turbo libpng gvfs))
+ (list ffmpeg-4 libjpeg-turbo libpng gvfs))
(arguments
`(#:configure-flags (list "-DENABLE_GIO=ON" "-DENABLE_THUMBNAILER=ON")))
(home-page "https://github.com/dirkvdb/ffmpegthumbnailer")
@@ -2102,7 +2102,7 @@ (define-public mplayer
(inputs
`(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("giflib" ,giflib)
@@ -3296,6 +3296,7 @@ (define-public mlt-6
,@(package-arguments mlt)))
(inputs
(modify-inputs (package-inputs mlt)
+ (replace "ffmpeg" ffmpeg-4)
(replace "gtk+" gtk+-2)))))
(define-public v4l-utils
@@ -3409,7 +3410,7 @@ (define-public obs
bash-minimal
curl
eudev
- ffmpeg
+ ffmpeg-4
fontconfig
freetype
glib
@@ -3679,7 +3680,7 @@ (define-public simplescreenrecorder
;; As a result, they are omitted. Please add them back if problems appear.
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
glu
jack-1
libxi
@@ -3872,7 +3873,7 @@ (define-public handbrake
(inputs
`(("bzip2" ,bzip2)
("dbus-glib" ,dbus-glib)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
@@ -4313,7 +4314,7 @@ (define-public ffms2
(inputs
(list zlib))
(propagated-inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(native-inputs
(list pkg-config))
(synopsis "Cross-platform wrapper around ffmpeg/libav")
@@ -4743,7 +4744,7 @@ (define-public libopenshot
(list alsa-lib zlib))
(propagated-inputs ;all referenced in installed headers
(list cppzmq
- ffmpeg
+ ffmpeg-4
imagemagick
jsoncpp
libopenshot-audio
@@ -4968,7 +4969,7 @@ (define-public wlstream
"01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp"))))
(build-system meson-build-system)
(native-inputs (list libdrm pkg-config))
- (inputs (list ffmpeg pulseaudio wayland wayland-protocols))
+ (inputs (list ffmpeg-4 pulseaudio wayland wayland-protocols))
(home-page "https://github.com/atomnuker/wlstream")
(synopsis "Screen capture tool for Wayland sessions")
(description "Wlstream is a screen capture tool for recording audio and
--
cgit v1.2.3
From ceeef9a923065d3f0ae45535112b9055223d59ca Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 11 Dec 2022 01:00:01 +0100
Subject: gnu: alembic: Update to 1.8.4.
* gnu/packages/graphics.scm (alembic): Update to 1.8.4.
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 4642dfbe36..0132f4fe66 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -957,7 +957,7 @@ (define-public pstoedit
(define-public alembic
(package
(name "alembic")
- (version "1.8.3")
+ (version "1.8.4")
(source
(origin
(method git-fetch)
@@ -966,7 +966,7 @@ (define-public alembic
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0glfx3cm7r8zn3cn7j4x4ch1ab6igfis0i2lcy23jc56q87r8yj2"))))
+ (base32 "04cvzr87zqx55si4j3dqiidbmfx92ja3mc1dj0v6ddvl0cwj3m7i"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DUSE_HDF5=ON")))
--
cgit v1.2.3
From ae60376b3068a61e96dcf3acc2bab4fa2abbfe3d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 11 Dec 2022 01:00:01 +0100
Subject: gnu: assimp: Update to 5.2.5.
* gnu/packages/graphics.scm (assimp): Update to 5.2.5.
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 0132f4fe66..f23fad7c50 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -570,7 +570,7 @@ (define-public goxel
(define-public assimp
(package
(name "assimp")
- (version "5.2.2")
+ (version "5.2.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -579,7 +579,7 @@ (define-public assimp
(file-name (git-file-name name version))
(sha256
(base32
- "1kjifakjnpm89410pw27wq21fn975gfq46kn9zs3h8bryldvvlgk"))))
+ "0j0pd279n6xyy95x782ha8j75kbx0ck7vs5wv3krhbyfim9bw64l"))))
(build-system cmake-build-system)
(inputs
(list zlib))
--
cgit v1.2.3
From 6393f01ab06cd5cb2976fcb0a46a28f17ac0fbea Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Tue, 17 Jan 2023 14:38:33 +0100
Subject: gnu: Add assimp-5.0.
* gnu/packages/graphics.scm (assimp-5.0): New variable.
---
gnu/packages/graphics.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f23fad7c50..421522b7e0 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -33,6 +33,7 @@
;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 dan <i@dan.games>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -594,6 +595,20 @@ (define-public assimp
more.")
(license license:bsd-3)))
+(define-public assimp-5.0
+ (package
+ (inherit assimp)
+ (version "5.0.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/assimp/assimp")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "assimp" version))
+ (sha256
+ (base32
+ "1w2484lg823bql7lpfq84vnsfsnag5v65qrbphslj866z9ia68l7"))))))
+
(define-public mikktspace
;; The latest commit is used as there is no release.
(let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409")
--
cgit v1.2.3
From 2f2846404ddf50ad2c751e855b5b3dda32ecf65c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 9 Jan 2023 00:42:31 +0400
Subject: gnu: azpainter: Update to 3.0.6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/graphics.scm (azpainter): Update to 3.0.6.
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
gnu/packages/graphics.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/graphics.scm')
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 421522b7e0..ebf571d93e 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -2136,7 +2136,7 @@ (define-public monado
(define-public azpainter
(package
(name "azpainter")
- (version "3.0.5")
+ (version "3.0.6")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2145,7 +2145,7 @@ (define-public azpainter
(file-name (git-file-name name version))
(sha256
(base32
- "1iplp3p8pw9q44kb43hrk89sv2aff6bdy9fk58j2v6k5lqbk6kvf"))))
+ "0lk74drrksk340fzyzvrq0ixwj498adshbp505cj163qsqnndj7y"))))
(build-system gnu-build-system) ;actually a home grown build system
(arguments
(list #:tests? #f
--
cgit v1.2.3