From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: [PATCH] gnu: vlc: Add inputs. Date: Fri, 02 Sep 2016 12:22:55 +0800 Message-ID: <87oa479bhc.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfg0T-0002t3-Ov for guix-devel@gnu.org; Fri, 02 Sep 2016 00:23:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bfg0P-0005xP-Cs for guix-devel@gnu.org; Fri, 02 Sep 2016 00:23:08 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:35248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfg0P-0005x3-0N for guix-devel@gnu.org; Fri, 02 Sep 2016 00:23:05 -0400 Received: by mail-pa0-x22a.google.com with SMTP id hb8so36412593pac.2 for ; Thu, 01 Sep 2016 21:23:04 -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" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain 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'. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-vlc-Add-inputs.patch Content-Transfer-Encoding: quoted-printable >From 56ca3c305354522fdfb7fd9a7fe1e8d57f1a8d87 Mon Sep 17 00:00:00 2001 From: Alex Vong 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=3D-ffast-math -fno-finite-math-only" and "CXXFLAGS=3D-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 =C2=A9 2015, 2016 Efraim Flashner ;;; Copyright =C2=A9 2015 Andy Patterson ;;; Copyright =C2=A9 2015 Ricardo Wurmus -;;; Copyright =C2=A9 2015 Alex Vong +;;; Copyright =C2=A9 2015, 2016 Alex Vong ;;; Copyright =C2=A9 2016 Alex Griffin ;;; Copyright =C2=A9 2016 Kei Kebreau ;;; Copyright =C2=A9 2016 Dmitry Nikolaev @@ -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 bui= lding ;("qtbase" ,qtbase) with -std=3Dgnu++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 . + `(;; Gross workaround for . ;; In our case, this led to a test failure: ;; test_libvlc_equalizer: libvlc/equalizer.c:122: test_equalize= r: Assertion `isnan(libvlc_audio_equalizer_get_amp_at_index (equalizer, u_b= ands))' failed. "ac_cv_c_fast_math=3Dno" + ;; To compensate, we enable: + "CFLAGS=3D-ffast-math -fno-finite-math-only" + "CXXFLAGS=3D-ffast-math -fno-finite-math-only" =20 ,(string-append "LDFLAGS=3D-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") --=20 2.9.3 --=-=-= Content-Type: text/plain The next thing to do would be adding free-software intel drivers for libva! Cheers, Alex --=-=-=--