pyrox.dev
megasync: 4.9.0.0 -> 4.9.1.0 (#302394)
* megasync: 4.9.0.0 -> 4.9.1.0
and removed freeimage dependency
Resolves: #290949
Signed-off-by: Michal Minář <mm@michojel.cz>
* removed orphaned patch
Signed-off-by: Michal Minář <mm@michojel.cz>
---------
Signed-off-by: Michal Minář <mm@michojel.cz>
authored by Michal Minář and committed by GitHub c3160517 b8dc3e8f
+6
-9
pkgs/applications/misc/megasync/default.nix
+6
-9
pkgs/applications/misc/megasync/default.nix
···
8
8
, doxygen
9
9
, fetchFromGitHub
10
10
, ffmpeg
11
-
, freeimage
12
11
, libmediainfo
13
12
, libraw
14
13
, libsodium
···
28
27
}:
29
28
mkDerivation rec {
30
29
pname = "megasync";
31
-
version = "4.9.0.0";
30
+
version = "4.9.1.0";
32
31
33
32
src = fetchFromGitHub {
34
33
owner = "meganz";
35
34
repo = "MEGAsync";
36
35
rev = "v${version}_Linux";
37
-
sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM=";
36
+
sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
38
37
fetchSubmodules = true;
39
38
};
40
39
···
54
53
cryptopp
55
54
curl
56
55
ffmpeg
57
-
freeimage
58
56
libmediainfo
59
57
libraw
60
58
libsodium
···
72
70
./noinstall-distro-version.patch
73
71
# megasync target is not part of the install rule thanks to a commented block
74
72
./install-megasync.patch
75
-
./ffmpeg_44.patch
76
73
];
77
74
78
75
postPatch = ''
···
98
95
"--with-cryptopp"
99
96
"--with-curl"
100
97
"--with-ffmpeg"
101
-
"--with-freeimage"
98
+
"--without-freeimage"
102
99
"--without-readline"
103
100
"--without-termcap"
104
101
"--with-sodium"
···
111
108
'';
112
109
113
110
preBuild = ''
114
-
qmake CONFIG+="release" MEGA.pro
111
+
qmake CONFIG+="nofreeimage release" MEGA.pro
115
112
pushd MEGASync
116
113
lrelease MEGASync.pro
117
-
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release
114
+
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release"
118
115
popd
119
116
'';
120
117
···
124
121
homepage = "https://mega.nz/";
125
122
license = licenses.unfree;
126
123
platforms = [ "i686-linux" "x86_64-linux" ];
127
-
maintainers = [ maintainers.michojel ];
124
+
maintainers = [ ];
128
125
};
129
126
}
-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;