From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Subject: [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav. Date: Tue, 14 Apr 2015 00:13:42 +0800 Message-ID: <1428941622-19668-1-git-send-email-iyzsong@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yhgz6-0005Pj-K9 for guix-devel@gnu.org; Mon, 13 Apr 2015 12:13:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yhgz1-0001ii-K2 for guix-devel@gnu.org; Mon, 13 Apr 2015 12:13:16 -0400 Received: from mail-pd0-x235.google.com ([2607:f8b0:400e:c02::235]:35502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yhgz1-0001iZ-8y for guix-devel@gnu.org; Mon, 13 Apr 2015 12:13:11 -0400 Received: by pddn5 with SMTP id n5so111989243pdd.2 for ; Mon, 13 Apr 2015 09:13:10 -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 * gnu/packages/gstreamer.scm (gst-libav)[arguments]: Remove #:phases. Add #:configure-flags. [navite-inputs]: Remove yasm. [inputs]: Add ffmpeg. --- gnu/packages/gstreamer.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 9758806..c3e9f1f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages video) #:use-module (gnu packages xorg) #:use-module (gnu packages xiph) #:use-module (gnu packages pkg-config) @@ -262,19 +263,13 @@ developers consider to have good quality code and correct functionality.") "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before configure patch-/bin/sh - (lambda _ - (substitute* "gst-libs/ext/libav/configure" - (("#! /bin/sh") - (string-append "#! "(which "sh"))))))))) + '(#:configure-flags '("--with-system-libav"))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python) - ("yasm" ,yasm))) + ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) + ("libav" ,ffmpeg) ("orc" ,orc) ("zlib" ,zlib))) (home-page "http://gstreamer.freedesktop.org/") -- 2.2.1