* Also add workaround to disable blinking cursor. Signed-off-by: Jacob Stiffler <[email protected]> --- ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 -------------------- .../dual-camera-demo/dual_camera_qt5.sh | 4 +++ .../dual-camera-demo/dual-camera-demo_1.0.bb | 10 ++----- 3 files changed, 6 insertions(+), 39 deletions(-) delete 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 deleted file mode 100644 index a544c87..0000000 --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/dual_camera_qt5.sh b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh index cd137d5..9bf560b 100644 --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh @@ -2,7 +2,11 @@ /etc/init.d/matrix-gui-2.0 stop +echo 0 > /sys/class/graphics/fbcon/cursor_blink + dual_camera +echo 1 > /sys/class/graphics/fbcon/cursor_blink + /etc/init.d/matrix-gui-2.0 start 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 4f7d835..e882cad 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,10 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5" DEPENDS += "libdrm" require recipes-core/matrix/matrix-gui-paths.inc -PR = "r7" +PR = "r8" BRANCH = "drm" -SRCREV = "0c48cb66cc995420dfec2f1fd620c8977f0170aa" +SRCREV = "4ede12a9c6b51b7693b005b00a715056e99fa7a0" SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=git;branch=${BRANCH} \ file://desc_dual-camera.html \ @@ -19,12 +19,6 @@ 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
