|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/CMakeLists.txt clementine-0.4.2/CMakeLists.txt
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/CMakeLists.txt 2010-07-01 14:18:22.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/CMakeLists.txt 2010-07-16 22:31:50.000000000 -0400
|
|
|
a9c3d0d |
@@ -123,7 +123,16 @@ endif(NOT GETTEXT_XGETTEXT_EXECUTABLE)
|
|
|
a9c3d0d |
option(ENABLE_VISUALISATIONS "Use libprojectm visualisations" ON)
|
|
|
a9c3d0d |
option(BUNDLE_PROJECTM_PRESETS "Install Clementine's own copies of libprojectm presets - disable this if you want to use a system package instead" ON)
|
|
|
a9c3d0d |
if(ENABLE_VISUALISATIONS)
|
|
|
a9c3d0d |
- add_subdirectory(3rdparty/libprojectm)
|
|
|
a9c3d0d |
+ # When/if upstream accepts our patches then these options can be used to link
|
|
|
a9c3d0d |
+ # to system installed 3rdparty libraries instead.
|
|
|
a9c3d0d |
+ option(USE_SYSTEM_PROJECTM "Don't set this option unless your system projectM library has been compiled with the Clementine patches in 3rdparty" OFF)
|
|
|
a9c3d0d |
+ if(USE_SYSTEM_PROJECTM)
|
|
|
a9c3d0d |
+ pkg_check_modules(LIBPROJECTM libprojectM)
|
|
|
a9c3d0d |
+ else(USE_SYSTEM_PROJECTM)
|
|
|
a9c3d0d |
+ add_subdirectory(3rdparty/libprojectm)
|
|
|
a9c3d0d |
+ set(LIBPROJECTM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libprojectm)
|
|
|
a9c3d0d |
+ set(LIBPROJECTM_LIBRARIES projectM)
|
|
|
a9c3d0d |
+ endif(USE_SYSTEM_PROJECTM)
|
|
|
a9c3d0d |
endif(ENABLE_VISUALISATIONS)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
# Test whether libsqlite3 is available and if FTS3 is enabled in it
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/CMakeLists.txt clementine-0.4.2/src/CMakeLists.txt
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/CMakeLists.txt 2010-07-01 14:17:36.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/CMakeLists.txt 2010-07-16 22:34:36.000000000 -0400
|
|
|
a9c3d0d |
@@ -9,11 +9,11 @@ include_directories(../3rdparty/gmock/gt
|
|
|
a9c3d0d |
include_directories(../3rdparty/qtsingleapplication)
|
|
|
a9c3d0d |
include_directories(../3rdparty/qtiocompressor)
|
|
|
a9c3d0d |
include_directories(../3rdparty/qxt)
|
|
|
a9c3d0d |
-include_directories(../3rdparty/libprojectm)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
-include_directories(${GLIB_INCLUDE_DIRECTORIES})
|
|
|
a9c3d0d |
-include_directories(${LIBXML_INCLUDE_DIRECTORIES})
|
|
|
a9c3d0d |
-include_directories(${GOBJECT_INCLUDE_DIRECTORIES})
|
|
|
a9c3d0d |
+include_directories(${GLIB_INCLUDE_DIRS})
|
|
|
a9c3d0d |
+include_directories(${LIBXML_INCLUDE_DIRS})
|
|
|
a9c3d0d |
+include_directories(${GOBJECT_INCLUDE_DIRS})
|
|
|
a9c3d0d |
+include_directories(${LIBPROJECTM_INCLUDE_DIRS})
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
cmake_policy(SET CMP0011 NEW)
|
|
|
a9c3d0d |
include(../cmake/AddEngine.cmake)
|
|
|
a9c3d0d |
@@ -461,7 +461,7 @@ target_link_libraries(clementine_lib
|
|
|
a9c3d0d |
)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
if(ENABLE_VISUALISATIONS)
|
|
|
a9c3d0d |
- target_link_libraries(clementine_lib projectM)
|
|
|
a9c3d0d |
+ target_link_libraries(clementine_lib ${LIBPROJECTM_LIBRARIES})
|
|
|
a9c3d0d |
endif(ENABLE_VISUALISATIONS)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
if (APPLE)
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/config.h.in clementine-0.4.2/src/config.h.in
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/config.h.in 2010-07-01 14:17:34.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/config.h.in 2010-07-16 22:35:04.000000000 -0400
|
|
|
a9c3d0d |
@@ -27,6 +27,7 @@
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
#cmakedefine ENABLE_VISUALISATIONS
|
|
|
a9c3d0d |
#cmakedefine VISUALISATIONS_USE_INSTALL_PREFIX
|
|
|
a9c3d0d |
+#cmakedefine USE_SYSTEM_PROJECTM
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
#cmakedefine SNOW_LEOPARD
|
|
|
a9c3d0d |
#cmakedefine LEOPARD
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/visualisations/projectmpresetmodel.cpp clementine-0.4.2/src/visualisations/projectmpresetmodel.cpp
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/visualisations/projectmpresetmodel.cpp 2010-07-01 14:16:36.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/visualisations/projectmpresetmodel.cpp 2010-07-16 22:36:19.000000000 -0400
|
|
|
a9c3d0d |
@@ -14,10 +14,15 @@
|
|
|
a9c3d0d |
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
|
|
a9c3d0d |
*/
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
+#include "config.h"
|
|
|
a9c3d0d |
#include "projectmpresetmodel.h"
|
|
|
a9c3d0d |
#include "projectmvisualisation.h"
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
-#include <projectM.hpp>
|
|
|
a9c3d0d |
+#ifdef USE_SYSTEM_PROJECTM
|
|
|
a9c3d0d |
+# include <libprojectM/projectM.hpp>
|
|
|
a9c3d0d |
+#else
|
|
|
a9c3d0d |
+# include "projectM.hpp"
|
|
|
a9c3d0d |
+#endif
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
#include <QtDebug>
|
|
|
a9c3d0d |
#include <QDir>
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/visualisations/projectmvisualisation.cpp clementine-0.4.2/src/visualisations/projectmvisualisation.cpp
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/visualisations/projectmvisualisation.cpp 2010-07-01 14:16:36.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/visualisations/projectmvisualisation.cpp 2010-07-16 22:37:32.000000000 -0400
|
|
|
a9c3d0d |
@@ -30,7 +30,11 @@
|
|
|
a9c3d0d |
#include <QFile>
|
|
|
a9c3d0d |
#include <QDir>
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
-#include <projectM.hpp>
|
|
|
a9c3d0d |
+#ifdef USE_SYSTEM_PROJECTM
|
|
|
a9c3d0d |
+# include <libprojectM/projectM.hpp>
|
|
|
a9c3d0d |
+#else
|
|
|
a9c3d0d |
+# include "projectM.hpp"
|
|
|
a9c3d0d |
+#endif
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
#ifdef Q_OS_MAC
|
|
|
a9c3d0d |
# include "core/mac_startup.h"
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/visualisations/visualisationselector.cpp clementine-0.4.2/src/visualisations/visualisationselector.cpp
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/visualisations/visualisationselector.cpp 2010-07-01 14:16:36.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/visualisations/visualisationselector.cpp 2010-07-16 22:38:00.000000000 -0400
|
|
|
a9c3d0d |
@@ -14,6 +14,7 @@
|
|
|
a9c3d0d |
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
|
|
a9c3d0d |
*/
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
+#include "config.h"
|
|
|
a9c3d0d |
#include "projectmpresetmodel.h"
|
|
|
a9c3d0d |
#include "projectmvisualisation.h"
|
|
|
a9c3d0d |
#include "visualisationselector.h"
|
|
|
a9c3d0d |
@@ -21,7 +22,11 @@
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
#include <QPushButton>
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
-#include <projectM.hpp>
|
|
|
a9c3d0d |
+#ifdef USE_SYSTEM_PROJECTM
|
|
|
a9c3d0d |
+# include <libprojectM/projectM.hpp>
|
|
|
a9c3d0d |
+#else
|
|
|
a9c3d0d |
+# include "projectM.hpp"
|
|
|
a9c3d0d |
+#endif
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
VisualisationSelector::VisualisationSelector(QWidget *parent)
|
|
|
a9c3d0d |
: QDialog(parent),
|