phonon: Improve chances of finding libvlc.so.*

Search the install library path as well as the hard coded /usr/lib
and /usr/local/lib (this is particularly important on system that
use the 64 suffix on x86_64.
(cherry picked from commit 47ffd252b036e4047054e3926ba0a9f94170c35e)

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/bindings/phonon/CMakeLists.txt b/bindings/phonon/CMakeLists.txt
index f40f760898138c3f60ba0b2d282867672ed82977..73b5acf5abfc0e512d41e333eb4666e36f685786 100644 (file)
--- a/bindings/phonon/CMakeLists.txt
+++ b/bindings/phonon/CMakeLists.txt
@@ -197,6 +197,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
                                   LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
                                   ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
 
+add_definitions(-DPHONON_LIB_INSTALL_DIR="${LIB_INSTALL_DIR}")
 # on the Mac support an extra install directory for application bundles
 if(APPLE)
    set(INSTALL_TARGETS_DEFAULT_ARGS  ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/bindings/phonon/vlc/vlcloader.cpp b/bindings/phonon/vlc/vlcloader.cpp
index 6b01e949868d916ce55b96d95698c98d26a0015b..df3757a32ed35cd6f6b79aaeb37633ef0d9e6869 100644 (file)
--- a/bindings/phonon/vlc/vlcloader.cpp
+++ b/bindings/phonon/vlc/vlcloader.cpp
@@ -140,7 +140,7 @@ static QStringList findAllLibVlc()
 #if defined(Q_OS_UNIX)
     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH"))
             .split(QLatin1Char(':'), QString::SkipEmptyParts);
-    paths << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
+    paths << QLatin1String(PHONON_LIB_INSTALL_DIR) << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
 
     QStringList foundVlcs;
     foreach (const QString &path, paths) {