diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-04-16 14:39:48 +0300 |
| commit | fcc39864dba82e14895afbe841091091366c96bc (patch) | |
| tree | 6e0f05495fd6512051224dc85fd3ab495cbf1a24 /gnu/packages/photo.scm | |
| parent | 76fc36d0a7215979bb74c05840f5a4de4ab5ea93 (diff) | |
| parent | 44f9432705d04c069a8acf9e37e3ad856ac0bf82 (diff) | |
| download | guix-fcc39864dba82e14895afbe841091091366c96bc.tar guix-fcc39864dba82e14895afbe841091091366c96bc.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/boost.scm
gnu/packages/chez.scm
gnu/packages/compression.scm
gnu/packages/crates-io.scm
gnu/packages/docbook.scm
gnu/packages/engineering.scm
gnu/packages/gcc.scm
gnu/packages/gl.scm
gnu/packages/gtk.scm
gnu/packages/nettle.scm
gnu/packages/python-check.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/rust.scm
gnu/packages/sqlite.scm
guix/build-system/node.scm
Diffstat (limited to 'gnu/packages/photo.scm')
| -rw-r--r-- | gnu/packages/photo.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 3dc3d7b3b6..210d69522f 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -240,14 +240,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "1m5wxap3x9z6x8s2gj3sw9lqwlmbgz00dv6z3h3qk15prfizwh3p")))) + "1ms06b3dj1p33aypcb16gg5pn7fylbylsk9cnnqa0j29qiw59f7q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -271,14 +271,14 @@ from digital cameras.") (define-public gphoto2 (package (name "gphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn")))) + "0f4d3q381jnnkcqkb2dj1k709skp65qihl5xm80zandvl69lw19h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -355,15 +355,16 @@ and a wide variety of other metadata.") (define-public libpano13 (package (name "libpano13") - (version "2.9.19") + (version "2.9.20_rc3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/panotools/libpano13/" - "libpano13-" version "/" - "libpano13-" version ".tar.gz")) + "libpano13-" (first + (string-split version #\_)) + "/libpano13-" version ".tar.gz")) (sha256 (base32 - "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) + "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo) |