From d09e31bdf66b12c9756aede3b306909a9b0235f4 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 11 Apr 2018 09:54:42 +0100 Subject: gnu: libmygpo-qt: Update to 1.1.0. * gnu/packages/music.scm (libmygpo-qt): Update to 1.1.0. [source]: Remove 'patches'. [arguments]: Do not set BUILD_WITH_QT4=OFF, it is the default. * gnu/packages/patches/libmygpo-qt-fix-jsoncreatortest.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index bb98f5b6a1..aea7395d41 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Rodger Fox ;;; Copyright © 2017, 2018 Nicolas Goaziou -;;; Copyright © 2017 Pierre Langlois +;;; Copyright © 2017, 2018 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee @@ -3846,19 +3846,15 @@ by The Echo Nest.") (define-public libmygpo-qt (package (name "libmygpo-qt") - (version "1.0.9") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "http://stefan.derkits.at/files/" "libmygpo-qt/libmygpo-qt." version ".tar.gz")) (sha256 (base32 - "1wsgh2vjnd52rkvpncj1ycpbp84sj9hh12ija46b42z9mmqf2jm4")) - (patches - (search-patches "libmygpo-qt-fix-jsoncreatortest.patch")))) + "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")))) (build-system cmake-build-system) - (arguments - '(#:configure-flags '("-DBUILD_WITH_QT4=OFF"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:18:41 +0200 Subject: gnu: Use ffmpeg@3.4 in packages not ready for 4.0. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4. * gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise. * gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise. --- gnu/packages/cdrom.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 3d35ff51f4..5f9117c637 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -392,7 +392,7 @@ capacity is user-selectable.") ("fontconfig" ,fontconfig) ("libexif" ,libexif) ("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aea7395d41..c27055e0c1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2391,7 +2391,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://6xq.net/projects/pianobar/") @@ -2792,7 +2792,7 @@ available memory.") `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("faad2" ,faad2) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ("jack" ,jack-1) ("libid3tag" ,libid3tag) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1966d44dfd..dc5a375664 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1847,7 +1847,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) @@ -2082,7 +2082,7 @@ making @dfn{screencasts}.") ;; As a result, they are omitted. Please add them back if problems appear. (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("glu" ,glu) ("jack" ,jack-1) ("libxi" ,libxi) @@ -2794,7 +2794,7 @@ It counts more than 100 plugins.") ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2784b35f90a7e659ae30c0e24380ecea42557f7d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 19:55:58 +0200 Subject: gnu: moc: Remove obsolete snippet. * gnu/packages/music.scm (moc)[source](snippet): Remove. --- gnu/packages/music.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c27055e0c1..4a7a3157dd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2780,13 +2780,7 @@ available memory.") name "-" version ".tar.bz2")) (sha256 (base32 - "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")) - (modules '((guix build utils))) - (snippet - ;; Remove use of __DATE__ and __TIME__ for reproducibility. - '(substitute* "main.c" - (("printf \\(\" Built : %s\", __DATE__\\);") "") - (("printf \\(\" %s\", __TIME__\\);") ""))))) + "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3