| --- Clementine-1.3rc1/CMakeLists.txt |
| +++ Clementine-1.3rc1/CMakeLists.txt |
| @@ -60,7 +60,7 @@ |
| |
| pkg_check_modules(CDIO libcdio) |
| pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint) |
| -pkg_search_module(CRYPTOPP cryptopp libcrypto++) |
| +#pkg_search_module(CRYPTOPP cryptopp libcrypto++) |
| pkg_check_modules(GIO gio-2.0) |
| pkg_check_modules(GLIB REQUIRED glib-2.0) |
| pkg_check_modules(GOBJECT REQUIRED gobject-2.0) |
| @@ -71,7 +71,7 @@ |
| pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0) |
| pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92) |
| pkg_check_modules(LIBMTP libmtp>=1.0) |
| -pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.9) |
| +pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.8) |
| pkg_check_modules(LIBPULSE libpulse) |
| pkg_check_modules(LIBXML libxml-2.0) |
| pkg_check_modules(QJSON REQUIRED QJson) |
| @@ -275,13 +275,14 @@ |
| |
| optional_component(VISUALISATIONS ON "Visualisations") |
| |
| -if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) |
| - message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " |
| - "code must be compiled in") |
| -elseif(CRYPTOPP_FOUND) |
| +#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) |
| +# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " |
| +# "code must be compiled in") |
| +#elseif(CRYPTOPP_FOUND) |
| set(HAVE_CRYPTOPP ON) |
| - set(HAVE_SPOTIFY_DOWNLOADER ON) |
| -endif() |
| + set(HAVE_SPOTIFY_DOWNLOADER OFF) |
| + set(HAVE_SPOTIFY_BLOB OFF) |
| +#endif() |
| |
| # Find DBus if it's enabled |
| if (HAVE_DBUS) |
