Skip to contentSkip to conversation

qtimageformats: allow empty qtimageformats package

PATCH Superseded Jonathan Liu 1 participant 3 messages Mar 2, 2014

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 qtimageformats: allow empty qtimageformats package

This fixes installing qtimageformats-dev with opkg as it depends on the qtimageformats package which wasn't created.

The qtimageformats package was not created as it is empty and BitBake avoids producing empty packages by default. The installed files consist of source files split into qtimageformats-dbg, CMake files split into qtimageformats-dev, plugins split into qtimageformats-plugins and debug build of plugins split into qtimageformats-plugins-dbg.

---
 recipes-qt/qt5/qtimageformats.inc | 1 +
 1 file changed, 1 insertion(+)
recipes-qt/qt5/qtimageformats.inc +1 -0
index 1b4bb4f..f90e58a 100644
@@ -1,3 +1,4 @@
 require qt5.inc
 
 DEPENDS += "qtbase tiff"
+ALLOW_EMPTY_${PN} = "1"
Signature · 1 line
1.9.0
#1 lore raw

PATCH v3 2/2 packagegroup-qt5-toolchain-target: include all modules for development

This adds the necessary target packages for development with all of the Qt 5 modules.

---
 .../packagegroup-qt5-toolchain-target.bb           | 69 +++++++++++++++++-----
 1 file changed, 55 insertions(+), 14 deletions(-)
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +55 -14
index 997df18..ac66f37 100644
@@ -11,30 +11,71 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 USE_RUBY = " \
     qtwebkit-mkspecs \
     qtwebkit-dev \
+    qtwebkit-qmlplugins \
+"
+
+# Requires X11 to work
+USE_X11 = " \
+    qtx11extras-dev \
+    qtx11extras-mkspecs \
 "
 
 RDEPENDS_${PN} += " \
     packagegroup-core-standalone-sdk-target \
     libsqlite3-dev \
-    qtbase-mkspecs \
-    qtscript-mkspecs \
-    qtxmlpatterns-mkspecs \
-    qtdeclarative-mkspecs \
-    qtsensors-mkspecs \
+    qt3d-dev \
     qt3d-mkspecs \
-    qtlocation-mkspecs \
-    qtsvg-mkspecs \
+    qt3d-qmlplugins \
     qtbase-dev \
+    qtbase-fonts \
+    qtbase-mkspecs \
+    qtbase-plugins \
+    qtbase-staticdev \
+    qtconnectivity-dev \
+    qtconnectivity-mkspecs \
+    qtconnectivity-qmlplugins \
     qtdeclarative-dev \
-    qtscript-dev \
-    qt3d-dev \
+    qtdeclarative-mkspecs \
+    qtdeclarative-plugins \
+    qtdeclarative-qmlplugins \
+    qtdeclarative-staticdev \
+    qtgraphicaleffects-qmlplugins \
+    qtimageformats-dev \
+    qtimageformats-plugins \
     qtlocation-dev \
+    qtlocation-mkspecs \
+    qtlocation-plugins \
+    qtlocation-qmlplugins \
+    qtmultimedia-dev \
+    qtmultimedia-mkspecs \
+    qtmultimedia-plugins \
+    qtmultimedia-qmlplugins \
+    qtquick1-dev \
+    qtquick1-mkspecs \
+    qtquick1-plugins \
+    qtquick1-qmlplugins \
+    qtquickcontrols-qmlplugins \
+    qtscript-dev \
+    qtscript-mkspecs \
     qtsensors-dev \
+    qtsensors-mkspecs \
+    qtsensors-plugins \
+    qtsensors-qmlplugins \
+    qtserialport-dev \
+    qtserialport-mkspecs \
     qtsvg-dev \
-    qtxmlpatterns-dev \
-    qtdeclarative-dev \
-    qtdeclarative-plugins \
-    qtdeclarative-qmlplugins \
-    qtgraphicaleffects-dev \
+    qtsvg-mkspecs \
+    qtsvg-plugins \
+    qtsystems-dev \
+    qtsystems-mkspecs \
+    qtsystems-qmlplugins \
+    qttools-dev \
+    qttools-mkspecs \
+    qttools-plugins \
+    qttools-staticdev \
+    qttools-tools \
     ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+    qtxmlpatterns-dev \
+    qtxmlpatterns-mkspecs \
 "
Signature · 1 line
1.9.0
#2 lore raw

Re: [meta-qt5][PATCH v3 2/2] packagegroup-qt5-toolchain-target: include all modules for development

Quoted 88 lines · Jonathan Liu

This adds the necessary target packages for development with all of the Qt 5 modules.

---
  .../packagegroup-qt5-toolchain-target.bb           | 69 +++++++++++++++++-----
  1 file changed, 55 insertions(+), 14 deletions(-)
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +47 -14
index 997df18..ac66f37 100644
@@ -11,30 +11,71 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
  USE_RUBY = " \
      qtwebkit-mkspecs \
      qtwebkit-dev \
+    qtwebkit-qmlplugins \
+"
+
+# Requires X11 to work
+USE_X11 = " \
+    qtx11extras-dev \
+    qtx11extras-mkspecs \
  "
 
  RDEPENDS_${PN} += " \
      packagegroup-core-standalone-sdk-target \
      libsqlite3-dev \
-    qtbase-mkspecs \
-    qtscript-mkspecs \
-    qtxmlpatterns-mkspecs \
-    qtdeclarative-mkspecs \
-    qtsensors-mkspecs \
+    qt3d-dev \
      qt3d-mkspecs \
-    qtlocation-mkspecs \
-    qtsvg-mkspecs \
+    qt3d-qmlplugins \
      qtbase-dev \
+    qtbase-fonts \
+    qtbase-mkspecs \
+    qtbase-plugins \
+    qtbase-staticdev \
+    qtconnectivity-dev \
+    qtconnectivity-mkspecs \
+    qtconnectivity-qmlplugins \
      qtdeclarative-dev \
-    qtscript-dev \
-    qt3d-dev \
+    qtdeclarative-mkspecs \
+    qtdeclarative-plugins \
+    qtdeclarative-qmlplugins \
+    qtdeclarative-staticdev \
+    qtgraphicaleffects-qmlplugins \
+    qtimageformats-dev \
+    qtimageformats-plugins \
      qtlocation-dev \
+    qtlocation-mkspecs \
+    qtlocation-plugins \
+    qtlocation-qmlplugins \
+    qtmultimedia-dev \
+    qtmultimedia-mkspecs \
+    qtmultimedia-plugins \
+    qtmultimedia-qmlplugins \
+    qtquick1-dev \
+    qtquick1-mkspecs \
+    qtquick1-plugins \
+    qtquick1-qmlplugins \
+    qtquickcontrols-qmlplugins \
+    qtscript-dev \
+    qtscript-mkspecs \
      qtsensors-dev \
+    qtsensors-mkspecs \
+    qtsensors-plugins \
+    qtsensors-qmlplugins \
+    qtserialport-dev \
+    qtserialport-mkspecs \
      qtsvg-dev \
-    qtxmlpatterns-dev \
-    qtdeclarative-dev \
-    qtdeclarative-plugins \
-    qtdeclarative-qmlplugins \
-    qtgraphicaleffects-dev \
+    qtsvg-mkspecs \
+    qtsvg-plugins \
+    qtsystems-dev \
+    qtsystems-mkspecs \
+    qtsystems-qmlplugins \

recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" · line 81

Quoted 10 lines
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +8 -0
+    qttools-dev \
+    qttools-mkspecs \
+    qttools-plugins \
+    qttools-staticdev \
+    qttools-tools \
      ${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+    qtxmlpatterns-dev \
+    qtxmlpatterns-mkspecs \
  "

Patch v4 will add Wayland support.

Regards,
Jonathan