pyrox.dev
megasync: 4.5.3.0 -> 4.6.1.0
with ffmpeg
with freeimage
Signed-off-by: Michal Minář <mm@michojel.cz>
+9
-8
pkgs/applications/misc/megasync/default.nix
+9
-8
pkgs/applications/misc/megasync/default.nix
···
7
7
, curl
8
8
, doxygen
9
9
, fetchFromGitHub
10
-
#, ffmpeg
10
+
, ffmpeg
11
+
, freeimage
11
12
, libmediainfo
12
13
, libraw
13
14
, libsodium
···
27
28
}:
28
29
mkDerivation rec {
29
30
pname = "megasync";
30
-
version = "4.5.3.0";
31
+
version = "4.6.1.0";
31
32
32
33
src = fetchFromGitHub {
33
34
owner = "meganz";
34
35
repo = "MEGAsync";
35
36
rev = "v${version}_Linux";
36
-
sha256 = "1lwjmdbqyxx5wd8nx4mc830fna37jad4h93viwfh5x7sxn104js7";
37
+
sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb";
37
38
fetchSubmodules = true;
38
39
};
39
40
···
52
53
c-ares
53
54
cryptopp
54
55
curl
55
-
# temporarily disable until patched for ffmpeg 4.4
56
-
#ffmpeg
56
+
ffmpeg
57
+
freeimage
57
58
libmediainfo
58
59
libraw
59
60
libsodium
···
71
72
./noinstall-distro-version.patch
72
73
# megasync target is not part of the install rule thanks to a commented block
73
74
./install-megasync.patch
75
+
./ffmpeg_44.patch
74
76
];
75
77
76
78
postPatch = ''
···
95
97
"--with-cares"
96
98
"--with-cryptopp"
97
99
"--with-curl"
98
-
# temporarily disable until patched for ffmpeg 4.4
99
-
#"--with-ffmpeg"
100
-
"--without-freeimage" # unreferenced even when found
100
+
"--with-ffmpeg"
101
+
"--with-freeimage"
101
102
"--without-readline"
102
103
"--without-termcap"
103
104
"--with-sodium"
+14
pkgs/applications/misc/megasync/ffmpeg_44.patch
+14
pkgs/applications/misc/megasync/ffmpeg_44.patch
···
1
+
Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
2
+
===================================================================
3
+
--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp
4
+
+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
5
+
@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg(
6
+
7
+
// Force seeking to key frames
8
+
formatContext->seek2any = false;
9
+
- videoStream->skip_to_keyframe = true;
10
+
+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient
11
+
+ //videoStream->skip_to_keyframe = true;
12
+
if (decoder->capabilities & CAP_TRUNCATED)
13
+
{
14
+
codecContext->flags |= CAP_TRUNCATED;
+3
-1
pkgs/top-level/all-packages.nix
+3
-1
pkgs/top-level/all-packages.nix
···
3288
3288
3289
3289
medusa = callPackage ../tools/security/medusa { };
3290
3290
3291
-
megasync = libsForQt515.callPackage ../applications/misc/megasync { };
3291
+
megasync = libsForQt5.callPackage ../applications/misc/megasync {
3292
+
ffmpeg = ffmpeg-full;
3293
+
};
3292
3294
3293
3295
megacmd = callPackage ../applications/misc/megacmd { };
3294
3296