From ddf1e9e2c49cce9aa15de7b512bb0440c6a7e2a7 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 17 Oct 2014 14:42:18 +0200 Subject: qt4: replace version with % wildcard While at it replace Tegra machines with SOC family Conflicts: recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend --- recipes-qt/qt4/qt4-embedded_%.bbappend | 3 +++ recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 3 --- recipes-qt/qt4/qt4-x11-free_%.bbappend | 5 +++++ recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 9 --------- 4 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 recipes-qt/qt4/qt4-embedded_%.bbappend delete mode 100644 recipes-qt/qt4/qt4-embedded_4.8.5.bbappend create mode 100644 recipes-qt/qt4/qt4-x11-free_%.bbappend delete mode 100644 recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend (limited to 'recipes-qt') diff --git a/recipes-qt/qt4/qt4-embedded_%.bbappend b/recipes-qt/qt4/qt4-embedded_%.bbappend new file mode 100644 index 0000000..64d1d2f --- /dev/null +++ b/recipes-qt/qt4/qt4-embedded_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" + +QT_CONFIG_FLAGS += " -depths all" diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend deleted file mode 100644 index 64d1d2f..0000000 --- a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" - -QT_CONFIG_FLAGS += " -depths all" diff --git a/recipes-qt/qt4/qt4-x11-free_%.bbappend b/recipes-qt/qt4/qt4-x11-free_%.bbappend new file mode 100644 index 0000000..0f0fb17 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free_%.bbappend @@ -0,0 +1,5 @@ +# Build OpenGL/ES support if available + +QT_GLFLAGS_tegra = "-opengl es2 " + +DEPENDS_append_tegra += "virtual/libgles2" diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend deleted file mode 100644 index 64a6655..0000000 --- a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# Build OpenGL/ES support if available - -QT_GLFLAGS_colibri-t20 = "-opengl es2 " -QT_GLFLAGS_colibri-t30 = "-opengl es2 " -QT_GLFLAGS_apalis-t30 = "-opengl es2 " - -DEPENDS_append_colibri-t20 = " virtual/libgles2" -DEPENDS_append_colibri-t30 = " virtual/libgles2" -DEPENDS_append_apalis-t30 = " virtual/libgles2" -- cgit v1.2.3