diff --git a/libs/qtav/0003-Add-craft-search-paths.patch b/libs/qtav/0003-Add-craft-search-paths.patch new file mode 100644 index 00000000..77fb8810 --- /dev/null +++ b/libs/qtav/0003-Add-craft-search-paths.patch @@ -0,0 +1,11 @@ +diff -r -u QtAV-1.13.0/.qmake.conf QtAV-1.13.0-fixed/.qmake.conf +--- QtAV-1.13.0/.qmake.conf 2020-04-03 21:58:14.028247283 +0200 ++++ QtAV-1.13.0-fixed/.qmake.conf 2020-04-03 21:57:55.575096164 +0200 +@@ -12,3 +12,7 @@ + android: CONFIG*=c++11 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + QMAKE_IOS_DEPLOYMENT_TARGET = 6.0 ++ ++# Craft paths ++INCLUDEPATH += $$[QT_INSTALL_PREFIX]/include ++LIBS += -L$$[QT_INSTALL_PREFIX]/lib diff --git a/libs/qtav/qtav.py b/libs/qtav/qtav.py index 1b713a0f..48de7f6f 100644 --- a/libs/qtav/qtav.py +++ b/libs/qtav/qtav.py @@ -1,34 +1,42 @@ # -*- coding: utf-8 -*- import info from Blueprints.CraftVersion import CraftVersion import subprocess import sys from info import DependencyRequirementType class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "A cross-platform multimedia framework based on Qt and FFmpeg." self.webpage = "https://github.com/wang-bin/QtAV" self.displayName = "QtAV" self.patchToApply['1.13.0'] = [ ("0001-Include-QSGMaterial.patch", 1), ("0002-Fix-install-prefix.patch", 1), + ("0003-Add-craft-search-paths.patch", 1), ] def setDependencies(self): self.buildDependencies["virtual/base"] = None self.runtimeDependencies["libs/ffmpeg"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None from Package.QMakePackageBase import * class Package(QMakePackageBase): def __init__(self): QMakePackageBase.__init__(self) def configureOptions(self, defines=""): return super().configureOptions(defines + ' "CONFIG += no-examples no-tests"') + + def install(self, options=None): + if not super().install(options): + return False + if OsUtils.isWin(): + return utils.system("sdk_install.bat", cwd=self.buildDir()) + return True