Differential D28600

libs/qtav: fixed package installation
ClosedPublic
Actions

Authored by maxrd2 on Apr 5 2020, 6:27 PM.

Details

Reviewers
vonreth
Group Reviewers
Craft
Commits
R877:967b59ee19bf: libs/qtav: fixed package installation
Summary

Install method was copying files directly to craftroot. Files are now properly
copied to craftroot/build/libs/qtav/image-xxx and package gets created
correctly. Changed to CMake build.

Diff Detail

Repository
R877 Craft Blueprints for KDE
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
maxrd2 requested review of this revision.Apr 5 2020, 6:27 PM
maxrd2 created this revision.
vonreth added a comment.Apr 6 2020, 7:42 AM

As it looks like the install script sucks... and I expect it to just copy the binaries and some headers...
Can we just do it with our functions?

maxrd2 added a comment.Apr 6 2020, 12:55 PM
In D28600#642572, @vonreth wrote:

As it looks like the install script sucks... and I expect it to just copy the binaries and some headers...
Can we just do it with our functions?

Like hardcode install file list into python install() method? I can do that if you think it's better.

Install shell scripts are generated here: https://github.com/wang-bin/QtAV/blob/master/tools/install_sdk/install_sdk.pro
What if I generate a patch the replaces QT_INSTALL_LIBS/QT_INSTALL_HEADERS/QT_INSTALL_QML/MKSPECS_DIR there before script?

maxrd2 updated this revision to Diff 79490.Apr 6 2020, 2:45 PM
  • libs/qtav: moved to cmake build

Don't shoot me... Think this might be cleaner.
QtAV recently introduced CMake build (which was broken under mingw) so have moved to that.

CMake was unable to find ffmpeg libraries in craft so have added 0004-cmake-fixes.patch from open PR: https://github.com/wang-bin/QtAV/pull/1211
CMake was trying to build EGL stuff which is unavailable on mingw - have corrected that with 0005-cmake-fix-mingw-build.patch

maxrd2 edited the summary of this revision. (Show Details)Apr 6 2020, 2:50 PM
vonreth added a comment.Apr 6 2020, 5:56 PM

besides the qml install path this looks much more sane.

libs/qtav/0004-cmake-fixes.patch
6

Sounds wrong, why?

maxrd2 added inline comments.Apr 6 2020, 6:42 PM
libs/qtav/0004-cmake-fixes.patch
6

I should probably remove that... craft's QMLs are installed to CRAFTROOT/qml and not CRAFTROOT/lib/qml

Guy mentioned https://api.kde.org/ecm/kde-module/KDEInstallDirs.html#QMLDIR

Have checked in KDEInstallDirs.cmake... when KDE_INSTALL_USE_QT_SYS_PATHS is ON it uses qmake's QT_INSTALL_QML, otherwise uses lib/qml

Original code used PREFIX/qml
This change uses PREFIX/lib/qml which is same as KDEInstallDirs.cmake when KDE_INSTALL_USE_QT_SYS_PATHS is OFF.

maxrd2 updated this revision to Diff 79519.Apr 6 2020, 6:44 PM

Reverted QML install path back to PREFIX/qml

vonreth accepted this revision.Apr 8 2020, 7:48 AM

Lets hope for the best

This revision is now accepted and ready to land.Apr 8 2020, 7:48 AM
Closed by commit R877:967b59ee19bf: libs/qtav: fixed package installation (authored by maxrd2). · Explain WhyApr 8 2020, 3:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 79649

View Options

libs/qtav/0002-Fix-install-prefix.patch

Loading...
View Options

libs/qtav/0004-cmake-fixes.patch

Loading...
View Options

libs/qtav/0005-cmake-fix-mingw-build.patch

Loading...
View Options

libs/qtav/qtav.py

Loading...