unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: vlc: Add inputs.
@ 2016-09-02  4:22 Alex Vong
  2016-09-03 16:15 ` David Craven
  0 siblings, 1 reply; 6+ messages in thread
From: Alex Vong @ 2016-09-02  4:22 UTC (permalink / raw)
  To: guix-devel

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

Hi guix,

While test-driving vlc on my laptop, I notice our vlc isn't build with
subtitle support. So, I go ahead and add as many inputs as possible.

There are 3 points to pay attention:
1. Add liba52 as input and remove the old FIXME
2. Add a new FIXME since gnome-vfs is not detected by the vlc build system
3. Our vlc was built with fast-math disabled as explained in the
comment. However, this is actually not necessary, vlc would built with
'-ffast-math -fno-finite-math-only'.



[-- Attachment #2: 0001-gnu-vlc-Add-inputs.patch --]
[-- Type: text/x-diff, Size: 5012 bytes --]

From 56ca3c305354522fdfb7fd9a7fe1e8d57f1a8d87 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Tue, 30 Aug 2016 02:30:57 +0800
Subject: [PATCH] gnu: vlc: Add inputs.

* gnu/packages/video.scm (vlc)[inputs]: Add eudev, faad2, fluidsynth,
  gnome-vfs, gst-plugins-base, gtk+-2, jack-2, liba52, libass,
  libavc1394, libbluray, libcaca, libdca, libdvdnav, libdvdread,
  libmpeg2, libmodplug, libmtp, libnotify, libraw1394, libshout,
  librsvg, libupnp, libva, libvdpau, samba, taglib, twolame.
  [arguments]: Pass "CFLAGS=-ffast-math -fno-finite-math-only" and
  "CXXFLAGS=-ffast-math -fno-finite-math-only" to #:configure-flags.
---
 gnu/packages/video.scm | 42 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 5c59ee2..da03b71 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2015 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2015, 2016 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@@ -60,9 +60,13 @@
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages libupnp)
+  #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mp3)
@@ -74,6 +78,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages samba)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages texinfo)
@@ -611,19 +616,44 @@ audio/video codec library.")
      `(("alsa-lib" ,alsa-lib)
        ("avahi" ,avahi)
        ("dbus" ,dbus)
+       ("eudev" ,eudev)
+       ("faad2" ,faad2)
        ("flac" ,flac)
        ("ffmpeg" ,ffmpeg-2.8)               ;fails to build against ffmpeg 3.0
+       ("fluidsynth" ,fluidsynth)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
+       ("gnome-vfs" ,gnome-vfs) ; FIXME: the build system cannot detect it
        ("gnutls" ,gnutls)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+-2)
+       ("jack" ,jack-2)
+       ("liba52" ,liba52)
+       ("libass" ,libass)
+       ("libavc1394" ,libavc1394)
+       ("libbluray" ,libbluray)
+       ("libcaca" ,libcaca)
+       ("libdca" ,libdca)
        ("libcddb" ,libcddb)
+       ("libdvdnav" ,libdvdnav)
+       ("libdvdread" ,libdvdread)
        ("libgcrypt" ,libgcrypt)
        ("libkate" ,libkate)
        ("libmad" ,libmad)
+       ("libmpeg2" ,libmpeg2)
+       ("libmodplug" ,libmodplug)
+       ("libmtp" ,libmtp)
+       ("libnotify" ,libnotify)
        ("libogg" ,libogg)
        ("libpng" ,libpng)
+       ("libraw1394" ,libraw1394)
        ("libsamplerate" ,libsamplerate)
+       ("libshout" ,libshout)
        ("libssh2" ,libssh2)
+       ("librsvg" ,librsvg)
+       ("libupnp" ,libupnp)
+       ("libva" ,libva)
+       ("libvdpau" ,libvdpau)
        ("libvorbis" ,libvorbis)
        ("libtheora" ,libtheora)
        ("libxext" ,libxext)
@@ -640,18 +670,22 @@ audio/video codec library.")
        ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
        ;("qtbase" ,qtbase) with -std=gnu++11.
        ;("qtx11extras" ,qtx11extras)
+       ("samba" ,samba)
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
        ("speex" ,speex)
+       ("taglib" ,taglib)
+       ("twolame" ,twolame)
        ("xcb-util-keysyms" ,xcb-util-keysyms)))
     (arguments
      `(#:configure-flags
-       `("--disable-a52" ; FIXME: reenable once available
-
-         ;; Gross workaround for <https://trac.videolan.org/vlc/ticket/16907>.
+       `(;; Gross workaround for <https://trac.videolan.org/vlc/ticket/16907>.
          ;; In our case, this led to a test failure:
          ;;   test_libvlc_equalizer: libvlc/equalizer.c:122: test_equalizer: Assertion `isnan(libvlc_audio_equalizer_get_amp_at_index (equalizer, u_bands))' failed.
          "ac_cv_c_fast_math=no"
+         ;; To compensate, we enable:
+         "CFLAGS=-ffast-math -fno-finite-math-only"
+         "CXXFLAGS=-ffast-math -fno-finite-math-only"
 
          ,(string-append "LDFLAGS=-Wl,-rpath -Wl,"
                          (assoc-ref %build-inputs "ffmpeg")
-- 
2.9.3


[-- Attachment #3: Type: text/plain, Size: 93 bytes --]



The next thing to do would be adding free-software intel drivers for libva!


Cheers,
Alex

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-10  2:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-02  4:22 [PATCH] gnu: vlc: Add inputs Alex Vong
2016-09-03 16:15 ` David Craven
2016-09-05 19:56   ` Efraim Flashner
2016-09-06 10:36     ` Alex Vong
2016-09-06 11:11       ` David Craven
2016-09-10  2:27         ` Alex Vong

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).