From 09b87aff46524b3e25640418cec1da52212539ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Jun 2016 12:27:50 +0200 Subject: gnu: Adjust to yasm change of module. This is a followup to 15a3fffc593a2385bbac60913909833babc1625f. * gnu/packages/gnuzilla.scm, gnu/packages/gstreamer.scm, gnu/packages/kodi.scm, gnu/packages/video.scm: Adjust import list to yasm move. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9685317bc0..78b277bc3f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -77,7 +77,7 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages zip)) (define-public aalib -- cgit v1.2.3 From 66fd9858f39f44d07a89b8648b0329be5c347e32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 Jun 2016 07:21:07 +0300 Subject: gnu: mpv: Update to 0.18.0. * gnu/packages/video.scm (mpv): Update to 0.18.0. [arguments]: Remove disabled '--enable-gpl3' configure flag. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 78b277bc3f..5d1141b205 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -755,7 +755,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (string-append @@ -763,7 +763,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "0vms3viwqcwl1mrgmf2yy4c69fvv7xpbkyrl693l6zpwynqd4b30")) + "0az0zqb2rakak51zsvfqzj9a8jiqpvc61jxap8hjdkkb9y6n6mmn")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs @@ -818,7 +818,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (lambda* (#:key inputs #:allow-other-keys) (copy-file (assoc-ref inputs "waf") "waf") (setenv "CC" "gcc")))) - #:configure-flags (list "--enable-gpl3" "--enable-zsh-comp") + #:configure-flags (list "--enable-zsh-comp") ;; No check function defined. #:tests? #f)) (home-page "https://mpv.io/") -- cgit v1.2.3 From 8ffa5a5798bca342ea3f5981c1f3161f2ae1b96d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Jul 2016 23:14:06 +0300 Subject: gnu: ffmpeg: Update to 3.1.1. * gnu/packages/video.scm (ffmpeg): Update to 3.1.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5d1141b205..0ded364132 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -373,14 +373,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).") (define-public ffmpeg (package (name "ffmpeg") - (version "3.0.2") + (version "3.1.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "08sjp4dxgcinmv9ly7nm24swmn2cnbbhvph44ihlplf4n33kr542")))) + "1nris3flwqd4v4b65yrrv9aqhsab7cb9lfp4wpxz6bi0m3r13g3i")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From fbb060fec81b3a353a6136c23709b87dd106fa08 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Jul 2016 00:40:24 +0300 Subject: gnu: ffmpeg-2.8: Update to 2.8.7. * gnu/packages/video.scm (ffmpeg): Update to 2.8.7. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0ded364132..2332a0d509 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -539,14 +539,14 @@ audio/video codec library.") (define-public ffmpeg-2.8 (package (inherit ffmpeg) - (version "2.8.6") + (version "2.8.7") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1yh7dvm7zwdlsspdaq524s5qaggma5md9h95qc4kvb5dmyyyvg15")))) + "0z0mcj2q3ysp9qdn1ks03g5sn2zxyr06vxs4al0m4b5b3in8mglp")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags flags) -- cgit v1.2.3 From 6cf83e3f83a9373d0da2ea3b29597c370133c9ff Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 6 Jul 2016 18:55:54 -0500 Subject: gnu: mpv: Enable shared library support. * gnu/packages/video.scm (mpv): Enable shared library support. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2332a0d509..ae1813db1d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2015 Andy Patterson ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Alex Vong +;;; Copyright © 2016 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -818,7 +819,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (lambda* (#:key inputs #:allow-other-keys) (copy-file (assoc-ref inputs "waf") "waf") (setenv "CC" "gcc")))) - #:configure-flags (list "--enable-zsh-comp") + #:configure-flags (list "--enable-libmpv-shared" "--enable-zsh-comp") ;; No check function defined. #:tests? #f)) (home-page "https://mpv.io/") -- cgit v1.2.3 From 0e74bb5bd6fe9e1839484edaaec98dbcefbdfdc7 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 6 Jul 2016 18:58:17 -0500 Subject: gnu: Add gnome-mpv. * gnu/packages/video.scm (gnome-mpv): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ae1813db1d..6888e36711 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -33,6 +33,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module (guix build-system waf) #:use-module (gnu packages) @@ -829,6 +830,34 @@ fork of mplayer2 and MPlayer. It shares some features with the former projects while introducing many more.") (license license:gpl2+))) +(define-public gnome-mpv + (package + (name "gnome-mpv") + (version "0.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/gnome-mpv/gnome-mpv/releases" + "/download/v" version "/gnome-mpv-" version + ".tar.xz")) + (sha256 + (base32 + "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0")))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+) + ("libepoxy" ,libepoxy) + ("mpv" ,mpv))) + (build-system glib-or-gtk-build-system) + (home-page "https://github.com/gnome-mpv/gnome-mpv") + (synopsis "GTK+ frontend for the mpv media player") + (description "GNOME MPV is a simple GTK+ frontend for the mpv media player. +GNOME MPV interacts with mpv via the client API exported by libmpv, allowing +access to mpv's powerful playback capabilities.") + (license license:gpl3+))) + (define-public libvpx (package (name "libvpx") -- cgit v1.2.3 From 5e3f68e67c0d660eb2e6f1b653a6ae5f3d813a98 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Jul 2016 21:00:33 +0300 Subject: gnu: libbluray: Update to 0.9.3. * gnu/packages/video.scm (libbluray): Update to 0.9.3. --- gnu/packages/video.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6888e36711..8492e5e029 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -940,15 +940,15 @@ YouTube.com and a few more sites.") (define-public libbluray (package (name "libbluray") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) - (uri (string-append "http://download.videolan.org/videolan/" + (uri (string-append "https://download.videolan.org/videolan/" name "/" version "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg")))) + "1q1whviqv5sr9nr372h31zwid1rvbfbx3z4lzr8lnj25xha6cdm6")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-bdjava"))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -956,7 +956,7 @@ YouTube.com and a few more sites.") `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libxml2" ,libxml2))) - (home-page "http://www.videolan.org/developers/libbluray.html") + (home-page "https://www.videolan.org/developers/libbluray.html") (synopsis "Blu-Ray Disc playback library") (description "libbluray is a library designed for Blu-Ray Disc playback for media -- cgit v1.2.3 From cf1dc4b7e640bdc84ae2a5e0136c774db693b066 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Jul 2016 21:22:29 +0300 Subject: gnu: obs: Update to 0.15.1. * gnu/packages/video.scm (obs): Update to 0.15.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8492e5e029..8d7d3323b8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1393,7 +1393,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "0.14.2") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/jp9000/obs-studio" @@ -1401,7 +1401,7 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cb8naa67kfnnngkzv1wpd4y241j29ggnk1w7jgnymp9j8dny1xl")))) + "18fycg7xlj2i89wdb9c5js0bnl964s1lpmnvmfyj11zi9k061wsg")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no tests (native-inputs -- cgit v1.2.3 From 08858812b57796fe5c2acee9f1675523333a149c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jul 2016 17:45:13 +0300 Subject: gnu: obs: Remove compiler flags for non-Intel hardware. * gnu/packages/video.scm (obs)[arguments]: If compiling for arm or mips devices then don't add Intel specific compiler flags. --- gnu/packages/video.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8d7d3323b8..eb0fdba9e4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -26,6 +26,8 @@ (define-module (gnu packages video) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) @@ -1403,7 +1405,21 @@ be used for realtime video capture via Linux-specific APIs.") (base32 "18fycg7xlj2i89wdb9c5js0bnl964s1lpmnvmfyj11zi9k061wsg")))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no tests + (arguments + `(#:tests? #f ; no tests + ,@(if (any (cute string-prefix? <> (or (%current-target-system) + (%current-system))) + '("arm" "mips")) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-architecture-specific-instructions + ;; non-Intel platforms fail to build with the architecture + ;; specific compiler flags included by default. + (lambda _ + (substitute* "libobs/CMakeLists.txt" + (("if\\(NOT MSVC\\)") "if(MSVC)")) + #t)))) + '()))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3