* [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav.
@ 2015-04-13 16:13 宋文武
2015-04-14 7:49 ` Mark H Weaver
0 siblings, 1 reply; 3+ messages in thread
From: 宋文武 @ 2015-04-13 16:13 UTC (permalink / raw)
To: guix-devel
* 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav.
2015-04-13 16:13 [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav 宋文武
@ 2015-04-14 7:49 ` Mark H Weaver
2015-04-14 15:04 ` 宋文武
0 siblings, 1 reply; 3+ messages in thread
From: Mark H Weaver @ 2015-04-14 7:49 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <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 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)
How about ("ffmpeg" ,ffmpeg) instead?
> ("orc" ,orc)
> ("zlib" ,zlib)))
> (home-page "http://gstreamer.freedesktop.org/")
Okay to push with these changes.
Thanks!
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav.
2015-04-14 7:49 ` Mark H Weaver
@ 2015-04-14 15:04 ` 宋文武
0 siblings, 0 replies; 3+ messages in thread
From: 宋文武 @ 2015-04-14 15:04 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
Mark H Weaver <mhw@netris.org> writes:
> How about ("ffmpeg" ,ffmpeg) instead?
>
>> ("orc" ,orc)
>> ("zlib" ,zlib)))
>> (home-page "http://gstreamer.freedesktop.org/")
>
> Okay to push with these changes.
Pushed to master, thanks for review!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-14 15:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-13 16:13 [PATCH] gnu: gst-libav: Use system ffmpeg instead of bundled libav 宋文武
2015-04-14 7:49 ` Mark H Weaver
2015-04-14 15:04 ` 宋文武
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).