From f3bd17281a325532b2305ef2e464237f0e3074b1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2017 22:16:46 +0300
Subject: gnu: obs: Mark as supported only on Intel systems.

* gnu/packages/video.scm (obs)[supported-systems]: New field.
[arguments]: Remove armhf and mips specific substitutions.
---
 gnu/packages/video.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'gnu/packages/video.scm')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 082826acaf..49408ab53f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -36,7 +36,6 @@
 (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)
@@ -1614,20 +1613,7 @@ be used for realtime video capture via Linux-specific APIs.")
                 "043f8mfdh4ll0hpivpyg3iniirckwsgri0gzamyrba1yhf2c2ibr"))))
     (build-system cmake-build-system)
     (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))))
-           '())))
+     `(#:tests? #f)) ; no tests
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
@@ -1654,6 +1640,7 @@ video recording and live streaming.  OBS supports capturing audio and video
 from many input sources such as webcams, X11 (for screencasting), PulseAudio,
 and JACK.")
     (home-page "https://obsproject.com")
+    (supported-systems '("x86_64-linux" "i686-linux"))
     (license license:gpl2+)))
 
 (define-public libvdpau
-- 
cgit v1.2.3


From b9af0564085baa71caf7b5d4d99ad8758d0a02bc Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2017 10:30:21 +0300
Subject: gnu: libsmpeg: Set source file-name.

* gnu/packages/video.scm (libsmpeg)[source]: Add file-name field.
---
 gnu/packages/video.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages/video.scm')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 49408ab53f..ffc3b0d761 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1733,6 +1733,7 @@ making @dfn{screencasts}.")
               (uri (svn-reference
                     (url "svn://svn.icculus.org/smpeg/trunk/")
                     (revision 401))) ; last revision before smpeg2 (for SDL 2.0)
+              (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
                 "18yfkr70lr1x1hc8snn2ldnbzdcc7b64xmkqrfk8w59gpg7sl1xn"))))
-- 
cgit v1.2.3


From 43ba5dd4ebd41df186017544f8aaf84cd396bedb Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2017 22:38:14 +0300
Subject: gnu: mpv: Update to 0.25.0.

* gnu/packages/video.scm (mpv): Update to 0.25.0.
[arguments]: Add explicit configure-flags to enable cdda, dvdread and dvdnav.
---
 gnu/packages/video.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/video.scm')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ffc3b0d761..cc07cc712d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -848,7 +848,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
 (define-public mpv
   (package
     (name "mpv")
-    (version "0.24.0")
+    (version "0.25.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -856,7 +856,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
                     ".tar.gz"))
               (sha256
                (base32
-                "059zblcj98fhrns1rwa66mf4km68czpam4nnk8q9qny31bx58654"))
+                "1khb7c4fdj1aak46lwyb3lq14w5jpxzws0zp6bdc87ljsvx3yhh7"))
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system waf-build-system)
     (native-inputs
@@ -906,6 +906,9 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
             (copy-file (assoc-ref inputs "waf") "waf")
             (setenv "CC" "gcc"))))
        #:configure-flags (list "--enable-libmpv-shared"
+                               "--enable-cdda"
+                               "--enable-dvdread"
+                               "--enable-dvdnav"
                                "--enable-zsh-comp"
                                "--disable-build-date")
        ;; No check function defined.
-- 
cgit v1.2.3