colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

megasync: 4.9.0.0 -> 4.9.1.0 (#302394)

Browse Source 
* 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>
This commit is contained in:
Michal Minář 2024-04-08 02:43:32 +02:00 committed by GitHub
parent b8dc3e8f5f
commit c3160517fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/misc/megasync/default.nix
View File

@ -8,7 +8,6 @@
, doxygen
, fetchFromGitHub
, ffmpeg
, freeimage
, libmediainfo
, libraw
, libsodium
@ -28,13 +27,13 @@
}:
mkDerivation rec {
pname = "megasync";
version = "4.9.0.0";
version = "4.9.1.0";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM=";
sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY=";
fetchSubmodules = true;
};
@ -54,7 +53,6 @@ mkDerivation rec {
cryptopp
curl
ffmpeg
freeimage
libmediainfo
libraw
libsodium
@ -72,7 +70,6 @@ mkDerivation rec {
./noinstall-distro-version.patch
# megasync target is not part of the install rule thanks to a commented block
./install-megasync.patch
./ffmpeg_44.patch
];
postPatch = ''
@ -98,7 +95,7 @@ mkDerivation rec {
"--with-cryptopp"
"--with-curl"
"--with-ffmpeg"
"--with-freeimage"
"--without-freeimage"
"--without-readline"
"--without-termcap"
"--with-sodium"
@ -111,10 +108,10 @@ mkDerivation rec {
'';
preBuild = ''
qmake CONFIG+="release" MEGA.pro
qmake CONFIG+="nofreeimage release" MEGA.pro
pushd MEGASync
lrelease MEGASync.pro
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release
DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release"
popd
'';
@ -124,6 +121,6 @@ mkDerivation rec {
homepage = "https://mega.nz/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.michojel ];
maintainers = [ ];
};
}

14
pkgs/applications/misc/megasync/ffmpeg_44.patch
View File

@ -1,14 +0,0 @@
Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
===================================================================
--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp
+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp
@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg(
// Force seeking to key frames
formatContext->seek2any = false;
- videoStream->skip_to_keyframe = true;
+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient
+ //videoStream->skip_to_keyframe = true;
if (decoder->capabilities & CAP_TRUNCATED)
{
codecContext->flags |= CAP_TRUNCATED;