diff --git a/qcma.pro b/qcma.pro index 5555337..42986a8 100644 --- a/qcma.pro +++ b/qcma.pro @@ -156,16 +156,11 @@ isEmpty(QCMA_GIT_VERSION) { DEFINES += QCMA_VER=\\\"$$VERSION\\\" } else { DEFINES += QCMA_VER=\\\"$$QCMA_GIT_VERSION\\\" -} -GET_HASHES { - # try to get the current git commit and branch - QCMA_GIT_HASH=$$system(git rev-parse --short HEAD) - QCMA_GIT_BRANCH=$$system(git rev-parse --abbrev-ref HEAD) - - # pass the current git commit hash - !isEmpty(QCMA_GIT_HASH):!isEmpty(QCMA_GIT_BRANCH) { - DEFINES += QCMA_BUILD_HASH=\\\"$$QCMA_GIT_HASH\\\" - DEFINES += QCMA_BUILD_BRANCH=\\\"$$QCMA_GIT_BRANCH\\\" + # git executable and metadata are available, might as well get commit hash and branch name + GET_HASHES { + DEFINES += QCMA_BUILD_HASH=\\\"$$system(git rev-parse --short HEAD)\\\" + DEFINES += QCMA_BUILD_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\" } + } diff --git a/rpmbuild/qcma-fedora.spec b/rpmbuild/qcma-fedora.spec index b5d658d..b099d29 100644 --- a/rpmbuild/qcma-fedora.spec +++ b/rpmbuild/qcma-fedora.spec @@ -12,6 +12,7 @@ Source: https://github.com/codestation/qcma.git Group: Productivity/File utilities Requires: ffmpeg Requires: qt5-qtbase +Requires: qt5-qtimageformats Requires: libvitamtp3 >= 2.5.0 BuildRequires: pkgconfig BuildRequires: ffmpeg-devel diff --git a/rpmbuild/qcma-openSUSE.spec b/rpmbuild/qcma-openSUSE.spec index a79e0b6..3c41d72 100644 --- a/rpmbuild/qcma-openSUSE.spec +++ b/rpmbuild/qcma-openSUSE.spec @@ -12,6 +12,7 @@ Source: https://github.com/codestation/qcma.git Group: Productivity/File utilities Requires: ffmpeg Requires: libqt5-qtbase +Requires: libqt5-qtimageformats Requires: libvitamtp3 >= 2.5.0 BuildRequires: pkg-config BuildRequires: ffmpeg-devel