From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark H Weaver <mhw@netris.org>
Subject: Re: [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled
	libav.
Date: Tue, 14 Apr 2015 03:49:57 -0400
Message-ID: <87sic3b13u.fsf@netris.org>
References: <1428941622-19668-1-git-send-email-iyzsong@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35185)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1YhvbD-00009h-7Y
	for guix-devel@gnu.org; Tue, 14 Apr 2015 03:49:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1Yhvb7-0006wP-No
	for guix-devel@gnu.org; Tue, 14 Apr 2015 03:49:35 -0400
Received: from world.peace.net ([50.252.239.5]:37804)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1Yhvb7-0006wC-Kg
	for guix-devel@gnu.org; Tue, 14 Apr 2015 03:49:29 -0400
In-Reply-To: <1428941622-19668-1-git-send-email-iyzsong@gmail.com>
	(=?utf-8?B?IuWui+aWh+atpiIncw==?=
	message of "Tue, 14 Apr 2015 00:13:42 +0800")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: =?utf-8?B?5a6L5paH5q2m?= <iyzsong@gmail.com>
Cc: guix-devel@gnu.org

=E5=AE=8B=E6=96=87=E6=AD=A6 <iyzsong@gmail.com> writes:

> * gnu/packages/gstreamer.scm (gst-libav)[arguments]: Remove #:phases.
>   Add #:configure-flags.
>   [navite-inputs]: Remove yasm.

Typo: s/navite/native/

>   [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 c=
orrect 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)

How about ("ffmpeg" ,ffmpeg) instead?

>         ("orc" ,orc)
>         ("zlib" ,zlib)))
>      (home-page "http://gstreamer.freedesktop.org/")

Okay to push with these changes.

    Thanks!
      Mark