Răsfoiți Sursa

qt: fix libQtMultimedia installation

With BR2_PACKAGE_QT_MULTIMEDIA=y, libQtMultimedia.so.* was not
copied to the target directory.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Luca Ceresoli 15 ani în urmă
părinte
comite
79ec8e88f3
2 a modificat fișierele cu 9 adăugiri și 1 ștergeri
  1. 1 1
      CHANGES
  2. 8 0
      package/qt/qt.mk

+ 1 - 1
CHANGES

@@ -7,7 +7,7 @@
 	New packages: cgilua, copas, coxpcall, luafilesystem,
 	luasocket, rings, wsapi, xavante
 
-	Updated/fixed packages: cdrkit, libidn, netperf
+	Updated/fixed packages: cdrkit, libidn, netperf, qt
 
 	Issues resolved (http://bugs.uclibc.org):
 

+ 8 - 0
package/qt/qt.mk

@@ -387,6 +387,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
 QT_LIBS+= qt-sql
 endif
+ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
+QT_LIBS+= qt-multimedia
+endif
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
 QT_LIBS+= qt-phonon
 endif
@@ -542,6 +545,11 @@ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
 endif
 
+qt-multimedia: $(STAGING_DIR)/usr/lib/libQtCore.la
+ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+	cp -dpf $(STAGING_DIR)/usr/lib/libQtMultimedia.so.* $(TARGET_DIR)/usr/lib/
+endif
+
 qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
 	$(call QT_INSTALL_PLUGINS,phonon_backend)
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)