[PATCH] gnu: Remove mplayer2.

[PATCH] gnu: Remove mplayer2.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

mplayer2 has been crashing at startup since a while.  It might be
related to incompatibilities with new FFmpeg versions.  I was the one
who added the mplayer2 recipe despite the project being abandoned, but I
switched to mpv after all and don't have motivation to support this
package anymore.

Unless someone else wants to keep supporting mplayer2 despite the
project being abandoned, I propose we simply remove it from Guix.

By the way, the description field of the mpv package mentions mplayer2,
so users who search for mplayer2 will find mpv.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Remove-mplayer2.patch --]
[-- Type: text/x-diff, Size: 5693 bytes --]

From 67522a1c65a048055e7062c072c13dd554cc6f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Thu, 13 Aug 2015 15:43:53 +0200
Subject: [PATCH] gnu: Remove mplayer2.

* gnu/packages/video.scm (mplayer2): Removed variable.
---
 gnu/packages/video.scm | 120 -------------------------------------------------
 1 file changed, 120 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 0da938b..a49125c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -669,126 +669,6 @@ NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files.  One can watch VideoCD,
 SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
     (license license:gpl2)))
 
-;;; This is not version 2; it's a fork literally named "mplayer2".
-(define-public mplayer2
-  (package
-    (name "mplayer2")
-    ;; There are no tarballs.  The 2.0 git tag, which is actually the first
-    ;; release is from 2011.  The latest commit is from 2013 October, so we
-    ;; use that commit.
-    (version "201310")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    ;; XXX Change this if mplayer2.org goes up again.
-                    (url "http://repo.or.cz/mplayer2.git")
-                    (commit "2c378c71a4d9b1df382db9aa787b646628b4e3f9")))
-              (sha256
-               (base32
-                "0s8554sanj6cvnf0h148nsmjgy5v0568nmcza7grpv6fnmddpfam"))
-              (file-name (string-append name "-" version "-checkout"))
-              ;; Warning: after using this patch, one must pass the -ltheora
-              ;; linker flag manually to configure; see below.
-              (patches (list (search-patch "mplayer2-theora-fix.patch")))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("perl" ,perl)
-       ("python" ,python)
-       ("python-2" ,python-2)
-       ("python-docutils" ,python-docutils)
-       ;; ./configure uses which(1) to find rst2man.py.
-       ("which" ,which)))
-    ;; Missing features: DirectFB, Xss screensaver extensions, VDPAU, MNG,
-    ;; libnut, DirectShow TV interface, Radio interfaces of all kinds, vstream
-    ;; client, XMSS inputplugin support, joystick, lirc/lircc, and openal.
-    ;; OpenAL support is experimental and causes compilation to fail with
-    ;; linker errors.
-    (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("faad2" ,faad2)
-       ("ffmpeg" ,ffmpeg)
-       ("gettext" ,gnu-gettext)
-       ("jack" ,jack-2)
-       ("ladspa" ,ladspa)
-       ("lcms" ,lcms)
-       ("liba52" ,liba52)
-       ("libass" ,libass)
-       ("libbluray" ,libbluray)
-       ("libbs2b" ,libbs2b)
-       ("libcaca" ,libcaca)
-       ("libcdio-paranoia" ,libcdio-paranoia)
-       ("libdca" ,libdca)
-       ("libdv" ,libdv)
-       ("libdvdread" ,libdvdread)
-       ("libdvdnav" ,libdvdnav-4)
-       ("libjpeg" ,libjpeg)
-       ("libmad" ,libmad)
-       ("libpng" ,libpng)
-       ("libquvi" ,libquvi)
-       ("libtheora" ,libtheora)
-       ("libungif" ,libungif)
-       ("libvorbis" ,libvorbis)
-       ("libx11" ,libx11)
-       ("libxinerama" ,libxinerama)
-       ("libxv" ,libxv)
-       ("mesa" ,mesa)
-       ("mpg123" ,mpg123)
-       ("ncurses" ,ncurses)
-       ("portaudio" ,portaudio)
-       ("pulseaudio" ,pulseaudio)
-       ("rsound" ,rsound)
-       ("samba" ,samba)
-       ("sdl" ,sdl)
-       ("speex" ,speex)
-       ("xvid" ,xvid)))
-    (arguments
-     '(#:phases
-       (alist-replace
-        'configure
-        ;; ./configure does not work followed by "SHELL=..." and
-        ;; "CONFIG_SHELL=..."; set environment variables instead.
-        (lambda* (#:key inputs outputs #:allow-other-keys)
-          (setenv "SHELL" (which "bash"))
-          (setenv "CONFIG_SHELL" (which "bash"))
-          (substitute* "configure"
-            (("/usr/X11") (assoc-ref inputs "libx11")))
-          (zero?
-           (system* "./configure"
-                    (string-append "--prefix=" (assoc-ref outputs "out"))
-                    "--enable-translation"
-                    "--enable-runtime-cpudetection"
-                    ;; This is needed in accordance with the theora patch.
-                    "--extra-libs=-ltheoradec")))
-        (alist-cons-before
-         'build 'fix-TOOLS-shebangs
-         (lambda _
-           (substitute* (find-files "TOOLS" "\\.(sh|pl|py)$")
-             (("/usr/bin/env") (which "env"))
-             (("/usr/bin/perl") (which "perl"))
-             (("/usr/bin/python3") (which "python3"))
-             (("/usr/bin/python") (which "python"))))
-         (alist-cons-before
-          'build 'fix-input-buffer-padding-size
-          (lambda _
-            (substitute* "libmpdemux/demuxer.h"
-              ;; This has to match with FFmpeg's FF_INPUT_BUFFER_PADDING_SIZE,
-              ;; which has changed at some point.
-              (("(#define MP_INPUT_BUFFER_PADDING_SIZE )[0-9]*" all)
-               (string-append all "32"))))
-          %standard-phases)))
-       ;; No 'check' target.
-       #:tests? #f))
-    ;; XXX Change this if mplayer2.org goes up again.
-    (home-page "http://repo.or.cz/w/mplayer2.git")
-    (synopsis "Audio and video player")
-    (description "mplayer2 is a general-purpose audio and video player.  It's
-a fork of the original MPlayer project, and contains further development in
-several areas.")
-    ;; See file Copyright.  Most files are gpl2+ or compatible, but talloc.c
-    ;; is under lgpl3+, thus the whole project becomes gpl3+.
-    (license license:gpl3+)))
-
 (define-public mpv
   (package
     (name "mpv")
-- 
2.4.3

Re: [PATCH] gnu: Remove mplayer2.

[Thompson, David]

On Thu, Aug 13, 2015 at 9:51 AM, Taylan Ulrich Bayırlı/Kammer
<taylanbayirli@gmail.com> wrote:
> mplayer2 has been crashing at startup since a while.  It might be
> related to incompatibilities with new FFmpeg versions.  I was the one
> who added the mplayer2 recipe despite the project being abandoned, but I
> switched to mpv after all and don't have motivation to support this
> package anymore.
>
> Unless someone else wants to keep supporting mplayer2 despite the
> project being abandoned, I propose we simply remove it from Guix.
>
> By the way, the description field of the mpv package mentions mplayer2,
> so users who search for mplayer2 will find mpv.

Sounds reasonable to me.

- Dave

Re: [PATCH] gnu: Remove mplayer2.

[Taylan Ulrich Bayırlı/Kammer]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> mplayer2 has been crashing at startup since a while.  It might be
> related to incompatibilities with new FFmpeg versions.  I was the one
> who added the mplayer2 recipe despite the project being abandoned, but I
> switched to mpv after all and don't have motivation to support this
> package anymore.
>
> Unless someone else wants to keep supporting mplayer2 despite the
> project being abandoned, I propose we simply remove it from Guix.
>
> By the way, the description field of the mpv package mentions mplayer2,
> so users who search for mplayer2 will find mpv.

Pushed since there were no objections.

Taylan