[PR PATCH] New package: MLV-App-1.13

[PR PATCH] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

There is a new pull request by notthewave against master on the void-packages repository

https://github.com/notthewave/void-packages MLV-App
https://github.com/void-linux/void-packages/pull/32629

New package: MLV-App-1.13
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages (not yet) but briefly tested this PR 

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/32629.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-MLV-App-32629.patch --]
[-- Type: text/x-diff, Size: 6485 bytes --]

From b87f4944eaf1354aa8e96c4c29792a9fe72274d2 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Sun, 22 Aug 2021 12:09:50 +0200
Subject: [PATCH] New package: MLV-App-1.13

---
 srcpkgs/MLV-App/patches/arm-arch.patch     | 17 ++++++
 srcpkgs/MLV-App/patches/install-path.patch | 71 ++++++++++++++++++++++
 srcpkgs/MLV-App/patches/unistd-musl.patch  | 17 ++++++
 srcpkgs/MLV-App/template                   | 15 +++++
 4 files changed, 120 insertions(+)
 create mode 100644 srcpkgs/MLV-App/patches/arm-arch.patch
 create mode 100644 srcpkgs/MLV-App/patches/install-path.patch
 create mode 100644 srcpkgs/MLV-App/patches/unistd-musl.patch
 create mode 100644 srcpkgs/MLV-App/template

diff --git a/srcpkgs/MLV-App/patches/arm-arch.patch b/srcpkgs/MLV-App/patches/arm-arch.patch
new file mode 100644
index 000000000000..c0ce16c14910
--- /dev/null
+++ b/srcpkgs/MLV-App/patches/arm-arch.patch
@@ -0,0 +1,17 @@
+diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
+index df513af..4f39aa2 100644
+--- a/platform/qt/MLVApp.pro
++++ b/platform/qt/MLVApp.pro
+@@ -84,7 +84,11 @@ win32{
+ 
+ # Linux
+ linux-g++*{
+-    QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
++    contains(QT_ARCH, x86_64, x86){
++        QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize
++    } else {
++        QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize
++    }
+     QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize
+     LIBS += -lgomp
+ }
diff --git a/srcpkgs/MLV-App/patches/install-path.patch b/srcpkgs/MLV-App/patches/install-path.patch
new file mode 100644
index 000000000000..3895e24c0c0c
--- /dev/null
+++ b/srcpkgs/MLV-App/patches/install-path.patch
@@ -0,0 +1,71 @@
+diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
+index df513af..a099ae5 100644
+--- a/platform/qt/MLVApp.pro
++++ b/platform/qt/MLVApp.pro
+@@ -412,22 +412,22 @@ windows{
+ 
+ #to deploy the project with QT Creators "Deploy [All|Project]" feature in Menu->Build.
+ #in "Projects->Run Settings->Add Deploy Step->Make->Make arguments" field put argument "install". Qt Creator deploy feature will get active.
+-linux-g++ {
+-    target.path = $$(HOME)/bin
+-    desktop.path = $$(HOME)/.local/share/applications
+-    desktop.files += mlvapp.desktop
+-    icon512.path = $$(HOME)/.local/share/icons/hicolor/512x512/apps
+-    icon512.files += RetinaIMG/MLVAPP.png
+-    tools.path = target.path
+-    tools.extra = mkdir -p $$(HOME)/bin; tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/FFmpeg/ffmpegLinux.tar.xz --strip-components=1 --wildcards */ffmpeg; tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/raw2mlv/raw2mlvLinux.tar.xz --strip-components=1 --wildcards */raw2mlv
+-
+-    INSTALLS += target desktop icon512 tools
+-}
++#linux-g++ {
++#    target.path = $$(HOME)/bin
++#    desktop.path = $$(HOME)/.local/share/applications
++#    desktop.files += mlvapp.desktop
++#    icon512.path = $$(HOME)/.local/share/icons/hicolor/512x512/apps
++#    icon512.files += RetinaIMG/MLVAPP.png
++#    tools.path = target.path
++#    tools.extra = mkdir -p $$(HOME)/bin; tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/FFmpeg/ffmpegLinux.tar.xz --strip-components=1 --wildcards */ffmpeg; tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/raw2mlv/raw2mlvLinux.tar.xz --strip-components=1 --wildcards */raw2mlv
++#
++#    INSTALLS += target desktop icon512 tools
++#}
+ 
+ #for using linuxdeployqt
+ #->run "make INSTALL_ROOT=. -j$(nproc) install" (is possible via QtCreators Project tab, add build step (make))
+ #->run via terminal "linuxdeployqt-continuous-x86_64.AppImage path/to/appdir/usr/share/applications/mlvapp.desktop -appimage -qmake=pathToQmake/qmake"
+-#linux-g++ {
++linux-g++ {
+ #    DEFINES += APP_IMAGE
+ 
+ #    QMAKE_POST_LINK += tar -C ../qt/FFmpeg/ -xvJf ../qt/FFmpeg/ffmpegLinux.tar.xz --strip=1 --wildcards */ffmpeg $$escape_expand(\n\t)
+@@ -436,19 +436,19 @@ linux-g++ {
+ #    QMAKE_POST_LINK += tar -C ../qt/raw2mlv/ -xvJf ../qt/raw2mlv/raw2mlvLinux.tar.xz --strip=1 --wildcards */raw2mlv $$escape_expand(\n\t)
+ #    QMAKE_POST_LINK += chmod a+x ../qt/raw2mlv/raw2mlv $$escape_expand(\n\t)
+ 
+-#    isEmpty(PREFIX) {
+-#        PREFIX = /usr
+-#    }
+-#    target.path = $$PREFIX/bin
++    isEmpty(PREFIX) {
++        PREFIX = /usr
++    }
++    target.path = $$PREFIX/bin
+ #    ffmpegSt.path = $$PREFIX/bin
+ #    ffmpegSt.files += FFmpeg/ffmpeg
+ #    ffmpegSt.files += raw2mlv/raw2mlv
+-#    desktop.path = $$PREFIX/share/applications
+-#    desktop.files += mlvapp.desktop
+-#    icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
+-#    icon512.files += RetinaIMG/MLVAPP.png
++    desktop.path = $$PREFIX/share/applications
++    desktop.files += mlvapp.desktop
++    icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
++    icon512.files += RetinaIMG/MLVAPP.png
+ #    INSTALLS += ffmpegSt
+-#    INSTALLS += icon512
+-#    INSTALLS += desktop
+-#    INSTALLS += target
+-#}
++    INSTALLS += icon512
++    INSTALLS += desktop
++    INSTALLS += target
++}
diff --git a/srcpkgs/MLV-App/patches/unistd-musl.patch b/srcpkgs/MLV-App/patches/unistd-musl.patch
new file mode 100644
index 000000000000..c49ae2214460
--- /dev/null
+++ b/srcpkgs/MLV-App/patches/unistd-musl.patch
@@ -0,0 +1,17 @@
+diff --git a/src/mlv/video_mlv.c b/src/mlv/video_mlv.c
+index 7238d286..0ff00552 100644
+--- a/src/mlv/video_mlv.c
++++ b/src/mlv/video_mlv.c
+@@ -9,11 +9,9 @@
+ #include <inttypes.h>
+ #include "camid/camera_id.h"
+ 
++#include <unistd.h>
+ #if defined(__linux)
+ #include <alloca.h>
+-extern int usleep (__useconds_t __useconds);
+-#else
+-#include <unistd.h>
+ #endif
+ 
+ #include "video_mlv.h"
diff --git a/srcpkgs/MLV-App/template b/srcpkgs/MLV-App/template
new file mode 100644
index 000000000000..8319eb38a475
--- /dev/null
+++ b/srcpkgs/MLV-App/template
@@ -0,0 +1,15 @@
+# Template file for 'MLV-App'
+pkgname=MLV-App
+version=1.13
+revision=1
+wrksrc=${pkgname}-QTv${version}
+build_wrksrc="platform/qt"
+build_style=qmake
+hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-devel libgomp-devel ffmpeg"
+short_desc="All in one MLV processing app for Magic Lantern"
+maintainer="notthewave <winklbauer_m@zoho.eu>"
+license="GPL-3.0-or-later"
+homepage="https://mlv.app"
+distfiles="https://github.com/ilia3101/MLV-App/archive/refs/tags/QTv${version}.tar.gz"
+checksum=1ec87a4b325cc73ce1d512f2cd65df407fbe9eb751602cdfe26371258f81b329

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693496555

Comment:
should ffmpeg be in `depends=`?

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 247 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693496555

Comment:
should ffmpeg be in `depends=`? It needs it, but runs without it (but can't export in that case).

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693497405

Comment:
By default, it installs a static binary of FFmpeg, but seems to work fine with regular FFmpeg.

The AUR package build does also not install this binary. 

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693496555

Comment:
should ffmpeg be in `depends=`? It needs it to work properly, but runs without it (but can't export in that case).

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693499356

Comment:
Is there a better way to do this?

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693499356

Comment:
Is there a better way to do this? Made this change because it did not compile on ARM.

Re: [PR REVIEW] New package: MLV-App-1.13

[notthewave]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/32629#discussion_r693499356

Comment:
Is there a better way to do this? Made this change because it did not compile on ARM.