guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity
57958 commits 81 branches 36 tags 328 MiB
Commit graph

1043 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice
c301dcef1c
gnu: handbrake: Update to 1.3.1. 
* gnu/packages/video.scm (handbrake): Update to 1.3.1.
 2020-01-16 19:51:56 +01:00
Oleg Pykhalov
67f9f57899
gnu: streamlink: Update to 1.3.0. 
* gnu/packages/video.scm (streamlink): Update to 1.3.0.
[source]: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove this.
 2020-01-09 04:59:59 +03:00
Tobias Geerinckx-Rice
1aab033215
gnu: youtube-dl: Update to 2020.01.01. 
* gnu/packages/video.scm (youtube-dl): Update to 2020.01.01.
 2020-01-02 00:47:13 +01:00
Riku Viitanen
b9d8aa0935
gnu: Add dvdbackup. 
* gnu/packages/video.scm (dvdbackup): New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2019-12-26 09:09:28 +02:00
Efraim Flashner
e661d5c257
gnu: xvid: Update source uri. 
This is a follow-up to e5f415e007.

* gnu/packages/video.scm (xvid)[source]: Update source uri.
 2019-12-25 12:31:40 +02:00
Tobias Geerinckx-Rice
ce5b71f98c
gnu: gaupol: Update to 1.7. 
* gnu/packages/video.scm (gaupol): Update to 1.7.
 2019-12-25 11:10:58 +01:00
Tobias Geerinckx-Rice
1cb256ab5d
gnu: libdvbpsi: Update to 1.3.3. 
* gnu/packages/video.scm (libdvbpsi): Update to 1.3.3.
 2019-12-25 11:10:58 +01:00
Tobias Geerinckx-Rice
3164932307
gnu: obs: Update to 24.0.4. 
* gnu/packages/video.scm (obs): Update to 24.0.4.
 2019-12-25 11:10:58 +01:00
Tobias Geerinckx-Rice
e5f415e007
gnu: xvid: Update to 1.3.6. 
* gnu/packages/video.scm (xvid): Update to 1.3.6.
 2019-12-25 11:10:58 +01:00
Tobias Geerinckx-Rice
f1b8ed3fbc
gnu: ffmpegthumbnailer: Update to 2.2.2. 
* gnu/packages/video.scm (ffmpegthumbnailer): Update to 2.2.2.
 2019-12-25 11:10:57 +01:00
Tobias Geerinckx-Rice
763925b21d
gnu: celluloid: Update to 0.18. 
* gnu/packages/video.scm (celluloid): Update to 0.18.
 2019-12-25 11:10:57 +01:00
Efraim Flashner
6ed192a293
gnu: Add mpv-mpris. 
* gnu/packages/video.scm (mpv-mpris): New variable.
 2019-12-23 22:32:50 +02:00
Pierre Neidhardt
97115892b9
gnu: Add theorafile. 
* gnu/packages/video.scm (theorafile): New variable.
 2019-12-15 16:21:19 +01:00
Marius Bakke
1e667df433
gnu: libvpx: Do not build static libraries. 
* gnu/packages/video.scm (libvpx)[arguments]: Add "--disable-static" to
  #:configure-flags.
 2019-12-11 22:28:21 +01:00
Marius Bakke
fd69abdef2
gnu: dav1d: Update to 0.5.2. 
* gnu/packages/video.scm (dav1d): Update to 0.5.2.
 2019-12-11 01:13:24 +01:00
Marius Bakke
1debba19db
gnu: frei0r-plugins: Update to 1.7.0. 
* gnu/packages/video.scm (frei0r-plugins): Update to 1.7.0.
[native-inputs]: Remove LIBTOOL, AUTOCONF and AUTOMAKE.
[arguments]: Remove 'autotools' phase.  Add 'patch-Makefile' phase.
 2019-12-11 01:13:23 +01:00
Julien Lepiller
5ffcd84a54
gnu: youtube-dl: Update to 2019.11.28. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.11.28.
 2019-12-08 19:19:04 +01:00
Marius Bakke
66c15f72f8
gnu: ffmpeg: Update to 3.4.7. 
* gnu/packages/video.scm (ffmpeg-3.4): Update to 3.4.7.
 2019-12-04 21:26:56 +01:00
Marius Bakke
33b59c1a3e
Merge branch 'staging' 2019-12-04 20:12:41 +01:00
Marius Bakke
936aa05209
gnu: Remove duplicate nlohmann-json-cpp package. 
* gnu/packages/serialization.scm (nlohmann-json-cpp): Move variable ...
* gnu/packages/cpp.scm (nlohmann-json-cpp): ... here.  Mark as deprecated by
JSON-MODERN-CXX.
* gnu/packages/jupyter.scm (xeus)[inputs]: Change NLOHMANN-JSON-CPP to
JSON-MODERN-CXX.
* gnu/packages/video.scm (mkvtoolnix)[inputs]: Likewise.
 2019-12-04 20:10:34 +01:00
Eric Bavier
dc3e62a494
gnu: handbrake: Upgrade to 1.3.0. 
* gnu/packages/patches/handbrake-opt-in-nvenc.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/video.scm (handbrake)[source]: Upgrade to 1.3.0.  Remove
patch.
[native-inputs]: Remove cmake and curl.
[inputs]: Add dav1d and numactl.
[arguments]: Add "--disable-nvenc" to configure flags in place of patch.
Adjust "bootstrap" phase in response to upstream changes.
Add "patch-SHELL" and "relax-reqs" phases.
 2019-12-03 22:20:22 -06:00
Marius Bakke
34f849a945
Merge branch 'master' into staging 2019-11-28 16:47:01 +01:00
Efraim Flashner
a549802533
gnu: mplayer: Adjust inputs. 
* gnu/packages/video.scm (mplayer)[inputs]: Move yasm ...
[native-inputs]: ... to here.
 2019-11-28 15:58:58 +02:00
Efraim Flashner
4632e7c787
gnu: avidemux: Clean up inputs. 
* gnu/packages/video.scm (avidemux)[inputs]: Remove sdl. Move perl,
python-wrapper, qttools, yasm ...
[native-inputs]: ... to here.
[arguments]: Remove references to sdl.
 2019-11-28 12:30:42 +02:00
Marius Bakke
0897ad7fac
Merge branch 'master' into staging 2019-11-28 00:38:25 +01:00
Efraim Flashner
1a016d9dda
gnu: youtube-dl: Update to 2019.11.22. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.11.22.
 2019-11-26 11:00:09 +02:00
Marius Bakke
f056553c6b
Merge branch 'master' into staging 2019-11-15 20:11:35 +01:00
Tobias Geerinckx-Rice
3e1ccbefda
gnu: mlt: Update to 6.18.0. 
* gnu/packages/video.scm (mlt): Update to 6.18.0.
 2019-11-12 15:12:30 +01:00
Ludovic Courtès
c2cda7da05
gnu: youtube-dl: Update to 2019.11.05. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.11.05.
 2019-11-09 23:06:13 +01:00
Tobias Geerinckx-Rice
29f623637e
gnu: libdvdread: Update to 6.0.2. 
* gnu/packages/video.scm (libdvdread): Update to 6.0.2.
 2019-11-08 00:23:33 +01:00
Tobias Geerinckx-Rice
059a6e9a2d
gnu: libdvdnav: Update to 6.0.1. 
* gnu/packages/video.scm (libdvdnav): Update to 6.0.1.
 2019-11-08 00:23:32 +01:00
Tobias Geerinckx-Rice
0104ed80ca
gnu: libdvdnav: Don't use NAME in source URI. 
* gnu/packages/video.scm (libdvdnav)[source]: Hard-code NAME.
 2019-11-08 00:23:31 +01:00
Tobias Geerinckx-Rice
bf7b08c4fe
gnu: obs: Update to 24.0.3. 
* gnu/packages/video.scm (obs): Update to 24.0.3.
 2019-11-04 17:43:22 +01:00
Tobias Geerinckx-Rice
1d34b527f9
gnu: vapoursynth: Update to 48. 
* gnu/packages/video.scm (vapoursynth): Update to 48.
 2019-11-04 16:25:17 +01:00
Nicolas Goaziou
520b18e6fa
gnu: vlc: Fix build. 
* gnu/packages/patches/vlc-fix-test_libvlc_slaves.patch: New file.
* gnu/local.mk (dist_patch_DATA): Reference new file.
* gnu/packages/video.scm (vlc): Apply patch.
 2019-11-02 21:13:43 +01:00
Tobias Geerinckx-Rice
9a3be6fc42
gnu: x265: Update to 3.2.1. 
* gnu/packages/video.scm (x265): Update to 3.2.1.
 2019-11-01 17:14:29 +01:00
Marius Bakke
998e6cdcd2
Merge branch 'master' into staging 2019-10-30 14:32:53 +01:00
Tobias Geerinckx-Rice
aee4e47c5e
gnu: youtube-dl: Update to 2019.10.29. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.10.29.
 2019-10-30 04:28:58 +01:00
Tobias Geerinckx-Rice
ce23c5ffd2
gnu: avidemux: Update to 2.7.4. 
* gnu/packages/video.scm (avidemux): Update to 2.7.4.
[arguments]: Update bundled ffmpeg version.
 2019-10-29 01:53:26 +01:00
Tobias Geerinckx-Rice
8ca565ec1a
gnu: x265: Update to 3.2. 
* gnu/packages/video.scm (x265): Update to 3.2.
 2019-10-28 20:39:31 +01:00
Tobias Geerinckx-Rice
17334e000e
gnu: mpv: Update to 0.30.0. 
* gnu/packages/video.scm (mpv): Update to 0.30.0.
[arguments]: Remove obsolete #:configure-flags.
 2019-10-27 15:20:12 +01:00
Marius Bakke
a557810ac7
Merge branch 'master' into staging 2019-10-27 10:17:14 +01:00
Marius Bakke
5fd4d02666
gnu: dav1d: Update to 0.5.1. 
* gnu/packages/patches/dav1d-aarch64-symbol-alignment.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/video.scm (dav1d): Update to 0.5.1.
[source](patches): Remove.
 2019-10-27 10:10:23 +01:00
Tobias Geerinckx-Rice
57ea822c43
gnu: youtube-dl: Update to 2019.10.22. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.10.22.
 2019-10-25 07:01:07 +02:00
Marius Bakke
4c1918db34
Merge branch 'master' into staging 2019-10-23 20:48:55 +02:00
Tobias Geerinckx-Rice
d2e1a0ac92
gnu: libdv: Don't use NAME in source URI. 
* gnu/packages/video.scm (libdv)[source]: Hard-code NAME.
 2019-10-21 02:03:22 +02:00
Marius Bakke
023522d3a1
Merge branch 'master' into staging 2019-10-21 00:33:43 +02:00
Marius Bakke
0fe041bd9f
gnu: Remove more GCC < 7 workarounds. 
* gnu/packages/abiword.scm (abiword)[arguments]: Do not pass "-std=c++11" to
the GCC command line.
* gnu/packages/aidc.scm (zbar)[arguments]: Likewise.
* gnu/packages/android.scm (android-libbase, android-libcutils,
android-libziparchive, fastboot)[arguments]: Likewise.
* gnu/packages/audio.scm (azr3, guitarix, suil)[arguments]: Likewise.
* gnu/packages/bioinformatics.scm (bless)[arguments]: Likewise.
* gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Likewise.
* gnu/packages/code.scm (rtags)[arguments]: Likewise.
* gnu/packages/coq.scm (coq-gappa)[arguments]: Likewise.
* gnu/packages/emulators.scm (dolphin-emu)[arguments]: Likewise.
* gnu/packages/engineering.scm (xyce-serial, xyce-parallel)[arguments]: Likewise.
* gnu/packages/gnupg.scm (pinentry-qt)[arguments]: Likewise.
* gnu/packages/gobby.scm (libnet6, obby)[arguments]: Likewise.
* gnu/packages/graph.scm (python-faiss)[arguments]: Likewise.
* gnu/packages/graphics.scm (povray)[arguments]: Likewise.
* gnu/packages/image-processing.scm (opencv, itk-snap)[arguments]: Likewise.
* gnu/packages/image.scm (freeimage)[arguments]: Likewise.
* gnu/packages/kodi.scm (crossguid)[arguments]: Likewise.
* gnu/packages/music.scm (amsynth, qmidiarp, qmidiroute, seq24)[arguments]: Likewise.
* gnu/packages/pdf.scm (python-poppler-qt5)[arguments]: Likewise.
* gnu/packages/sagemath.scm (lcalc)[arguments]: Likewise.
* gnu/packages/video.scm (vlc, mlt, v4l-utils)[arguments]: Likewise.
 2019-10-20 14:00:12 +02:00
Marius Bakke
9a8d4463e6
gnu: dav1d: Fix build on AArch64. 
* gnu/packages/patches/dav1d-aarch64-symbol-alignment.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/video.scm (dav1d)[source](patches): New field.
 2019-10-20 14:00:11 +02:00
Marius Bakke
10f2ae01c4
gnu: dav1d: Remove defunct mirror URL. 
* gnu/packages/video.scm (dav1d)[source](uri): Remove bz2 tarball origin.
 2019-10-20 14:00:11 +02:00
Marius Bakke
c50b07dde8
gnu: libmpeg2: Fix build on armhf-linux. 
* gnu/packages/patches/libmpeg2-arm-private-symbols.patch,
gnu/packages/patches/libmpeg2-global-symbol-test.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/video.scm (libmpeg2)[source](patches): New field.
 2019-10-20 00:31:15 +02:00
Marius Bakke
78febba988
gnu: dav1d: Update to 0.5.0. 
* gnu/packages/video.scm (dav1d): Update to 0.5.0.
 2019-10-20 00:31:15 +02:00
Marius Bakke
b95d1b3289
Merge branch 'master' into staging 2019-10-18 18:10:47 +02:00
Eric Bavier
bd04fe8786
gnu: HandBrake: Update to 1.2.2. 
* gnu/packages/video.scm (handbrake): Update to 1.2.2.
 2019-10-13 22:54:12 -05:00
Marius Bakke
d1f3b333e6
Merge branch 'master' into staging 2019-10-08 19:24:34 +02:00
Ricardo Wurmus
e08902d3cb
Merge branch 'master' into core-updates 2019-10-06 22:02:20 +02:00
Diego Nicola Barbato
c76d19a3fc
gnu: youtube-dl: Update to 2019.09.28. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.09.28.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
 2019-10-01 17:09:16 +02:00
Ludovic Courtès
0cf2b6f2db
Merge branch 'master' into core-updates 2019-10-01 12:06:00 +02:00
Tobias Geerinckx-Rice
dcedcc7c57
gnu: youtube-viewer: Update to 3.5.8. 
* gnu/packages/video.scm (youtube-viewer): Update to 3.5.8.
 2019-09-28 05:36:11 +02:00
Marius Bakke
e7f62a41b2
Merge branch 'master' into core-updates 2019-09-27 19:11:27 +02:00
Tobias Geerinckx-Rice
8aba8c7b74
gnu: youtube-dl: Update to 2019.09.12.1. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.09.12.1.
 2019-09-25 17:50:53 +02:00
Tobias Geerinckx-Rice
b7f5fa8285
gnu: celluloid: Update to 0.17 from gnome-mpv. 
* gnu/packages/video.scm (celluloid): ‘New’ public variable.
(gnome-mpv): Redefine as DEPRECATED-PACKAGE.
 2019-09-25 17:50:52 +02:00
Tobias Geerinckx-Rice
e0aa4e949e
gnu: mlt: Update to 6.16.0. 
* gnu/packages/video.scm (mlt): Update to 6.16.0.
 2019-09-25 17:50:49 +02:00
Tobias Geerinckx-Rice
49dc1669a8
gnu: you-get: Update to 0.4.1355. 
* gnu/packages/video.scm (you-get): Update to 0.4.1355.
 2019-09-25 17:50:47 +02:00
Marius Bakke
6bdf8af5e6
gnu: ffmpeg: Update to 4.2.1. 
* gnu/packages/video.scm (ffmpeg): Update to 4.2.1.
 2019-09-24 20:12:56 +02:00
Ludovic Courtès
11da634a6e
Merge branch 'master' into core-updates 2019-09-24 10:11:38 +02:00
Tobias Geerinckx-Rice
900ddbf53d
gnu: obs: Update to 24.0.1. 
* gnu/packages/video.scm (obs): Update to 24.0.1.
[inputs]: Add qtsvg.
 2019-09-23 17:58:32 +02:00
Ludovic Courtès
27130ee8f7
gnu: libsmpeg: Fix build failure with GCC 7. 
* gnu/packages/video.scm (libsmpeg)[arguments]: New field.
 2019-09-23 00:11:13 +02:00
Ludovic Courtès
9ff87bb996
Merge branch 'master' into core-updates 2019-09-17 16:27:15 +02:00
Efraim Flashner
ff1d80f304
gnu: youtube-dl: Update source uri. 
* gnu/packages/video.scm (youtube-dl)[source]: Update to new upstream uri.
 2019-09-17 14:00:40 +03:00
Rutger Helling
e8cfac22c7
gnu: youtube-dl: Update to 2019.09.12. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.09.12.
 2019-09-11 21:03:02 +02:00
Tobias Geerinckx-Rice
db05b57205
gnu: youtube-dl: Update to 2019.09.01. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.09.01.
 2019-09-10 21:38:55 +02:00
Mark H Weaver
0481289cbc
Merge branch 'master' into core-updates 2019-08-29 17:19:18 -04:00
Rutger Helling
65ff644e16
gnu: libvdpau: Update to 1.3. 
* gnu/packages/video.scm (libvdpau): Update to 1.3.
[source]: Switch to git-fetch.
[build-system]: Switch to meson-build-system.
 2019-08-29 15:46:38 +02:00
Rutger Helling
6f0d8197df
gnu: youtube-dl: Update to 2019.08.13. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.08.13.
 2019-08-27 14:52:02 +02:00
Tobias Geerinckx-Rice
07272bd8e0
gnu: mkvtoolnix:gui: Don't require :out to be installed. 
* gnu/packages/video.scm (mkvtoolnix)[arguments]: Add a
‘patch-relative-file-names’ phase to call ‘mkvmerge’ from :out.
 2019-08-27 08:49:14 +02:00
Tobias Geerinckx-Rice
df14dc48fb
gnu: mkvtoolnix: Use @command{}. 
* gnu/packages/video.scm (mkvtoolnix)[description]:
Substitute @command{} for @code{}.
 2019-08-27 08:49:14 +02:00
Tobias Geerinckx-Rice
296b3de614
gnu: mkvtoolnix: Update to 37.0.0. 
* gnu/packages/video.scm (mkvtoolnix): Update to 37.0.0.
 2019-08-26 19:23:34 +02:00
Tobias Geerinckx-Rice
908d8bedd8
gnu: mkvtoolnix: Don't use NAME in source URI. 
* gnu/packages/video.scm (mkvtoolnix)[source]: Hard-code NAME.
 2019-08-26 19:23:34 +02:00
Mark H Weaver
893c2df00d
Merge branch 'master' into core-updates 2019-08-22 15:53:27 -04:00
Leo Famulari
ad64f271de
gnu: vidstab: Update to 1.1.0-0.aeabc8d. 
* gnu/packages/video.scm (vidstab): Update to 1.1.0-0.aeabc8d.
 2019-08-22 11:49:02 -04:00
Kei Kebreau
178f1d1f75
gnu: vlc: Update to 3.0.8. 
* gnu/packages/video.scm (vlc): Update to 3.0.8.
 2019-08-21 13:51:06 -04:00
Marius Bakke
462ad9f56b
Merge branch 'master' into core-updates 2019-08-13 20:42:06 +02:00
Marius Bakke
1b1b006afd
Merge branch 'staging' 2019-08-13 18:51:12 +02:00
Leo Famulari
89ccc9ce91
gnu: dav1d: Update to 0.4.0. 
* gnu/packages/video.scm (dav1d): Update to 0.4.0.
 2019-08-12 16:21:49 -04:00
Marius Bakke
8e7f97b9ff
Merge branch 'master' into staging 2019-08-08 00:35:37 +02:00
Efraim Flashner
1d05b683ef
gnu: libmediainfo: Remove extra build phase. 
* gnu/packages/video.scm (libmediainfo)[arguments]: Remove unneeded
'autogen phase.
 2019-08-07 20:05:58 +03:00
Efraim Flashner
d05e607c9d
gnu: libsmpeg: Remove extra build phase. 
* gnu/packages/video.scm (libsmpeg)[arguments]: Remove unnecessary
'autogen phase.
 2019-08-07 20:05:57 +03:00
Efraim Flashner
2230039427
gnu: vapoursynth: Remove extra build phase. 
* gnu/packages/video.scm (vapoursynth)[arguments]: Remove unneeded
'autogen phase.
 2019-08-07 20:05:57 +03:00
Rutger Helling
86445c8e35
gnu: ffmpeg: Update to 4.2. 
* gnu/packages/video.scm (ffmpeg): Update to 4.2.
[inputs]: Add dav1d.
* gnu/packages/video.scm (ffmpeg-3.4)[arguments]: Adjust inheritance.
 2019-08-06 18:59:28 +02:00
Marius Bakke
5b689de58d
gnu: x265: Update to 3.1.2. 
* gnu/packages/video.scm (x265): Update to 3.1.2.
 2019-08-05 00:17:09 +02:00
Marius Bakke
621ce95cfe
gnu: x265: Update source URI. 
* gnu/packages/video.scm (x265)[source](uri): Add the canonical upstream at
<https://bitbucket.org/multicoreware/x265>.
 2019-08-05 00:17:09 +02:00
Marius Bakke
81e74dc80b
gnu: libva: Update to 2.5.0. 
* gnu/packages/video.scm (libva): Update to 2.5.0.
 2019-08-04 13:49:56 +02:00
Alex Vong
144cb83a71
gnu: youtube-dl: Update to 2019.08.02. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.08.02.
 2019-08-03 21:54:08 +08:00
Tobias Geerinckx-Rice
82ebb785f1
gnu: you-get: Update to 0.4.1328. 
* gnu/packages/video.scm (you-get): Update to 0.4.1328.
 2019-08-03 01:13:47 +02:00
Tobias Geerinckx-Rice
3935507f0f
gnu: intel-vaapi-driver: Restrict supported systems. 
As noted at <https://debbugs.gnu.org/36814> and then promptly forgotten.
This follows up on commit d8d7565b82.

* gnu/packages/video.scm (intel-vaapi-driver)[supported-systems]:
Build onl on Intel systems.
 2019-08-01 05:43:33 +02:00
Marius Bakke
6a2e54236e
Merge branch 'master' into core-updates 2019-07-31 14:28:56 +02:00
Rutger Helling
be27b8f2e1
gnu: youtube-dl: Update to 2019.07.30. 
* gnu/packages/video.scm (youtube-dl): Update to 2019.07.30.
 2019-07-30 10:48:51 +02:00
Tobias Geerinckx-Rice
3563220e1e
gnu: Add libva-utils. 
* gnu/packages/video.scm (libva-utils): New public variable.
 2019-07-27 23:25:22 +02:00
Tobias Geerinckx-Rice
d8d7565b82
gnu: Add intel-vaapi-driver. 
* gnu/packages/video.scm (intel-vaapi-driver): New public variable.
 2019-07-27 23:25:21 +02:00