gnu: Add clementine.
* gnu/packages/music.scm (clementine): New variable. * gnu/packages/patches/clementine-use-openssl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Co-authored-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
Pierre Langlois
Ricardo Wurmus
parent
43925703e8
commit
d20b7384b7
|
|
@ -573,6 +573,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/chmlib-inttypes.patch \
|
||||
%D%/packages/patches/clang-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-3.8-libc-search-path.patch \
|
||||
%D%/packages/patches/clementine-use-openssl.patch \
|
||||
%D%/packages/patches/clisp-remove-failing-test.patch \
|
||||
%D%/packages/patches/clucene-pkgconfig.patch \
|
||||
%D%/packages/patches/clx-remove-demo.patch \
|
||||
|
|
|
|||
|
|
@ -56,8 +56,11 @@
|
|||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages cyrus-sasl)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages emacs)
|
||||
|
|
@ -75,12 +78,14 @@
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages graphics)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages java)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux) ; for alsa-utils
|
||||
#:use-module (gnu packages lirc)
|
||||
#:use-module (gnu packages llvm)
|
||||
|
|
@ -93,6 +98,7 @@
|
|||
#:use-module (gnu packages pdf)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages pulseaudio) ;libsndfile
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-web)
|
||||
|
|
@ -179,6 +185,114 @@ and play MIDI files with a few clicks in a user-friendly interface offering
|
|||
score, keyboard, guitar, drum and controller views.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
;; We don't use the latest release because it depends on Qt4. Instead we
|
||||
;; download the sources from the tip of the "qt5" branch.
|
||||
(define-public clementine
|
||||
(let ((commit "0a59257dc334b8df60a4d7d90b04f1766747efcf")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "clementine")
|
||||
(version (string-append "1.3.1-" revision "." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/clementine-player/Clementine.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(for-each
|
||||
(lambda (dir)
|
||||
(delete-file-recursively
|
||||
(string-append "3rdparty/" dir)))
|
||||
(list
|
||||
;; TODO: The following dependencies are still bundled:
|
||||
;; - "qxt": Appears to be unmaintained upstream.
|
||||
;; - "qsqlite"
|
||||
;; - "qtsingleapplication"
|
||||
;; - "qocoa"
|
||||
;; - "qtiocompressor"
|
||||
;; - "gmock": The tests crash when using our googletest
|
||||
;; package instead of the bundled gmock.
|
||||
"SPMediaKeyTap"
|
||||
"fancytabwidget"
|
||||
"google-breakpad"
|
||||
"libmygpo-qt"
|
||||
"libmygpo-qt5"
|
||||
"libprojectm"
|
||||
"qtwin"
|
||||
"sha2" ;; Replaced by openssl.
|
||||
"taglib"
|
||||
"tinysvcmdns")))
|
||||
(patches (search-patches "clementine-use-openssl.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:test-target "clementine_test"
|
||||
#:configure-flags
|
||||
(let ((crypto (assoc-ref %build-inputs "crypto++")))
|
||||
(list "-DENABLE_VISUALISATIONS=OFF" ; requires unpackaged "projectm"
|
||||
"-DCRYPTOPP_FOUND=TRUE"
|
||||
(string-append "-DCRYPTOPP_INCLUDE_DIRS=" crypto "/include")
|
||||
(string-append "-DCRYPTOPP_LIBRARY_DIRS=" crypto "/lib")
|
||||
(string-append "-DCRYPTOPP_LIBRARIES=" crypto "/lib/libcryptopp.a")
|
||||
"-DUSE_SYSTEM_SHA2=TRUE"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||
(wrap-program (string-append out "/bin/clementine")
|
||||
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("qtlinguist" ,qttools)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("chromaprint" ,chromaprint)
|
||||
("crypto++" ,crypto++)
|
||||
("fftw" ,fftw)
|
||||
("glib" ,glib)
|
||||
("glu" ,glu)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("libcdio" ,libcdio)
|
||||
("libmygpo-qt" ,libmygpo-qt)
|
||||
("libechonest" ,libechonest)
|
||||
;; TODO: Package libgpod.
|
||||
("libmtp" ,libmtp)
|
||||
("libxml2" ,libxml2)
|
||||
("openssl" ,openssl)
|
||||
("protobuf" ,protobuf)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("qtwebkit" ,qtwebkit)
|
||||
("sqlite" ,sqlite-with-fts3)
|
||||
("sparsehash" ,sparsehash)
|
||||
("taglib" ,taglib)))
|
||||
(home-page "http://clementine-player.org")
|
||||
(synopsis "Music player and library organizer")
|
||||
(description "Clementine is a multiplatform music player. It is inspired
|
||||
by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and
|
||||
playing your music.")
|
||||
(license (list
|
||||
;; clementine and qtiocompressor are under GPLv3.
|
||||
license:gpl3+
|
||||
;; gmock is under BSD-3.
|
||||
license:bsd-3
|
||||
;; qxt is under CPL1.0.
|
||||
license:cpl1.0
|
||||
;; qsqlite and qtsingleapplication are under LGPL2.1+.
|
||||
license:lgpl2.1+
|
||||
;; qocoa is under MIT and CC by-sa for the icons.
|
||||
license:cc-by-sa3.0)))))
|
||||
|
||||
(define-public cmus
|
||||
(package
|
||||
(name "cmus")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4022c383b..3202b8b69 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -83,6 +83,7 @@ pkg_check_modules(LIBPULSE libpulse)
|
||||
pkg_check_modules(LIBXML libxml-2.0)
|
||||
pkg_check_modules(SPOTIFY libspotify>=12.1.45)
|
||||
pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
|
||||
+pkg_check_modules(OPENSSL REQUIRED openssl)
|
||||
|
||||
if (WIN32)
|
||||
find_package(ZLIB REQUIRED)
|
||||
@@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS)
|
||||
endif(GTEST_INCLUDE_DIRS)
|
||||
endif(GMOCK_INCLUDE_DIRS)
|
||||
|
||||
-# Use the system's sha2 if it's available.
|
||||
-find_path(SHA2_INCLUDE_DIRS sha2.h)
|
||||
-find_library(SHA2_LIBRARIES sha2)
|
||||
-if(SHA2_LIBRARIES AND SHA2_INCLUDE_DIRS)
|
||||
- message(STATUS "Using system sha2 library")
|
||||
- set(USE_SYSTEM_SHA2 ON)
|
||||
-else()
|
||||
- message(STATUS "Using builtin sha2 library")
|
||||
- set(USE_SYSTEM_SHA2 OFF)
|
||||
- add_subdirectory(3rdparty/sha2)
|
||||
- set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
|
||||
- set(SHA2_LIBRARIES sha2)
|
||||
-endif()
|
||||
-
|
||||
# Use the system libmygpo-qt5 if a recent enough version was found
|
||||
if(LIBMYGPO_QT5_FOUND)
|
||||
set(MYGPOQT5_LIBRARIES ${LIBMYGPO_QT5_LIBRARIES})
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 6e24c9726..104d044d9 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -29,7 +29,6 @@ include_directories(${LIBPROJECTM_INCLUDE_DIRS})
|
||||
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
|
||||
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
|
||||
include_directories(${QXT_INCLUDE_DIRS})
|
||||
-include_directories(${SHA2_INCLUDE_DIRS})
|
||||
include_directories(${CHROMAPRINT_INCLUDE_DIRS})
|
||||
include_directories(${MYGPOQT5_INCLUDE_DIRS})
|
||||
|
||||
@@ -1223,7 +1222,7 @@ target_link_libraries(clementine_lib
|
||||
libclementine-common
|
||||
libclementine-tagreader
|
||||
libclementine-remote
|
||||
- ${SHA2_LIBRARIES}
|
||||
+ ${OPENSSL_LIBRARIES}
|
||||
${TAGLIB_LIBRARIES}
|
||||
${MYGPOQT5_LIBRARIES}
|
||||
${CHROMAPRINT_LIBRARIES}
|
||||
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
|
||||
index ce76f22da..80bf623fb 100644
|
||||
--- a/src/core/utilities.cpp
|
||||
+++ b/src/core/utilities.cpp
|
||||
@@ -52,7 +52,7 @@
|
||||
#include "config.h"
|
||||
#include "timeconstants.h"
|
||||
|
||||
-#include "sha2.h"
|
||||
+#include <openssl/sha.h>
|
||||
|
||||
#if defined(Q_OS_UNIX)
|
||||
#include <sys/statvfs.h>
|
||||
Loading…
Reference in New Issue