From 79ec8e88f3a5afacff27e8eb94a5aeda17cf734a Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 3 Jun 2010 22:31:02 +0200 Subject: [PATCH] qt: fix libQtMultimedia installation With BR2_PACKAGE_QT_MULTIMEDIA=y, libQtMultimedia.so.* was not copied to the target directory. Signed-off-by: Luca Ceresoli Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/qt/qt.mk | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index b653124e52..0a2c1893cf 100644 --- a/CHANGES +++ b/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): diff --git a/package/qt/qt.mk b/package/qt/qt.mk index aaf965e3c8..e2ebbb2a22 100644 --- a/package/qt/qt.mk +++ b/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)