mlv-app: unbreak, modernize, 1.14 -> 1.15 (#400723)

This commit is contained in:
Yohann Boniface
2025-04-26 00:09:25 +02:00
committed by GitHub
4 changed files with 77 additions and 80 deletions
@@ -1,13 +0,0 @@
diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
index ebdc552..3e37573 100644
--- a/platform/qt/MLVApp.pro
+++ b/platform/qt/MLVApp.pro
@@ -120,7 +120,7 @@ win32{
# Linux
linux-g++*{
- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
LIBS += -lgomp
}
@@ -1,65 +0,0 @@
{
fetchFromGitHub,
lib,
mkDerivation,
qmake,
qtbase,
qtmultimedia,
stdenv,
}:
mkDerivation rec {
pname = "mlv-app";
version = "1.14";
src = fetchFromGitHub {
owner = "ilia3101";
repo = "MLV-App";
rev = "QTv${version}";
sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU=";
};
patches = lib.optionals stdenv.hostPlatform.isAarch64 [
# remove optimization flags with x86 only instruction sets
./aarch64-flags.patch
];
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin mlvapp
install -Dm444 -t $out/share/applications mlvapp.desktop
install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
runHook postInstall
'';
qmakeFlags = [ "MLVApp.pro" ];
preConfigure = ''
export HOME=$TMPDIR
cd platform/qt/
'';
buildInputs = [
qtmultimedia
qtbase
];
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/mlvapp"
'';
nativeBuildInputs = [
qmake
];
meta = with lib; {
description = "All in one MLV processing app that is pretty great";
homepage = "https://mlv.app";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.linux;
mainProgram = "mlvapp";
};
}
+77
View File
@@ -0,0 +1,77 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
libsForQt5,
writableTmpDirAsHomeHook,
ffmpeg-headless,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mlv-app";
version = "1.15";
src = fetchFromGitHub {
owner = "ilia3101";
repo = "MLV-App";
rev = "QTv${finalAttrs.version}";
hash = "sha256-boYnIGDowV4yRxdE98U5ngeAwqi5HTRDFh5gVwW/kN8=";
};
patches = [
(fetchpatch {
url = "https://github.com/ilia3101/MLV-App/commit/b7643b1031955f085ade30e27974ddd889a4641f.patch";
hash = "sha256-DQkoB+fjshWDLzKouhEQXzpqn78WL+eqo5oTfE9ltEk=";
})
];
postPatch = ''
substituteInPlace platform/qt/MainWindow.cpp \
--replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg-headless}"'
'';
qmakeFlags = [ "MLVApp.pro" ];
preConfigure = ''
cd platform/qt/
'';
nativeBuildInputs = [
libsForQt5.wrapQtAppsHook
libsForQt5.qmake
writableTmpDirAsHomeHook
];
buildInputs = [
libsForQt5.qtmultimedia
libsForQt5.qtbase
];
dontWrapQtApps = true;
preFixup = ''
wrapQtApp "$out/bin/mlvapp"
'';
installPhase = ''
runHook preInstall
install -Dm555 -t $out/bin mlvapp
install -Dm444 -t $out/share/applications mlvapp.desktop
install -Dm444 -t $out/share/icons/hicolor/512x512/apps RetinaIMG/MLVAPP.png
runHook postInstall
'';
updateScript = nix-update-script { };
meta = {
description = "All in one MLV processing app that is pretty great";
homepage = "https://mlv.app";
downloadPage = "https://github.com/ilia3101/MLV-App";
changelog = "https://github.com/ilia3101/MLV-App/releases/tag/QTv${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "mlvapp";
};
})
-2
View File
@@ -10477,8 +10477,6 @@ with pkgs;
mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
mpeg2dec = libmpeg2;
msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;