Makefile.build is only used when building from within SDK through a top-level SDK Makefile.
Signed-off-by: Jacob Stiffler <[email protected]> --- ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 ++++++++++++++++++++ .../dual-camera-demo/dual-camera-demo_1.0.bb | 8 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch new file mode 100644 index 0000000..a544c87 --- /dev/null +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch @@ -0,0 +1,31 @@ +From 42653f94bbaff15d04ec527add6eeb3082ab4873 Mon Sep 17 00:00:00 2001 +From: Jacob Stiffler <[email protected]> +Date: Wed, 4 Mar 2015 12:00:45 -0500 +Subject: [PATCH] Makefile.build: with Qt5 use qmake available in PATH + +Signed-off-by: Jacob Stiffler <[email protected]> +--- + Makefile.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.build b/Makefile.build +index d715722..fdea3d8 100644 +--- a/Makefile.build ++++ b/Makefile.build +@@ -9,11 +9,11 @@ all: release + .PHONY: qmake + qmake : dual_camera.pro + @. ${ENV_SETUP}; \ +- qmake2 CONFIG+=release dual_camera.pro ++ qmake CONFIG+=release dual_camera.pro + + qmake_debug : dual_camera.pro + @. ${ENV_SETUP}; \ +- qmake2 CONFIG+=debug dual_camera.pro ++ qmake CONFIG+=debug dual_camera.pro + + debug : qmake_debug + @. ${ENV_SETUP}; \ +-- +1.7.9.5 + diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb index 7893d01..4f7d835 100644 --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5" DEPENDS += "libdrm" require recipes-core/matrix/matrix-gui-paths.inc -PR = "r6" +PR = "r7" BRANCH = "drm" SRCREV = "0c48cb66cc995420dfec2f1fd620c8977f0170aa" @@ -19,6 +19,12 @@ SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=gi file://dual-camera.desktop \ " +QT5_DIFF = " \ + file://0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch \ +" + +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '', d)}" + S = "${WORKDIR}/git" DEMO_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'dual_camera_qt5.sh', 'dual_camera_qt4.sh', d)}" -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
