From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: [PATCH] gnu: Remove mplayer2. Date: Thu, 13 Aug 2015 15:51:14 +0200 Message-ID: <874mk3pa99.fsf@T420.taylan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPsum-0004Is-2d for guix-devel@gnu.org; Thu, 13 Aug 2015 09:51:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPsuh-0001xS-LT for guix-devel@gnu.org; Thu, 13 Aug 2015 09:51:28 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:38686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPsuh-0001x0-Av for guix-devel@gnu.org; Thu, 13 Aug 2015 09:51:23 -0400 Received: by wicja10 with SMTP id ja10so70910853wic.1 for ; Thu, 13 Aug 2015 06:51:21 -0700 (PDT) Received: from T420.taylan ([2a02:908:c38:5c00:221:ccff:fe66:68f0]) by smtp.gmail.com with ESMTPSA id k12sm3525947wjw.4.2015.08.13.06.51.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Aug 2015 06:51:15 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Remove-mplayer2.patch >From 67522a1c65a048055e7062c072c13dd554cc6f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= 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 --=-=-=--