Author: eelco
Date: Mon Jul 25 20:10:13 2011
New Revision: 27951
URL: https://svn.nixos.org/websvn/nix/?rev=27951&sc=1
Log:
* Updated gst-plugins-good and gst-ffmpeg.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
Mon Jul 25 19:08:00 2011 (r27950)
+++
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
Mon Jul 25 20:10:13 2011 (r27951)
@@ -1,27 +1,29 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, liboil }:
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, yasm
+, useInternalFfmpeg ? false, ffmpeg ? null }:
stdenv.mkDerivation rec {
- name = "gst-ffmpeg-0.10.11";
+ name = "gst-ffmpeg-0.10.12";
src = fetchurl {
urls = [
"http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2";
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
- sha256 = "0bk9k9sccx9nvhjakacvq8gd6vp63x9ddmjrqkfdhkmgwlwa2dpz";
+ sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
};
- propagatedBuildInputs = [ gstPluginsBase ];
-
- buildInputs = [ pkgconfig bzip2 liboil ];
-
- configureFlags = "--enable-ladspa";
+ # Upstream strongly recommends against using --with-system-ffmpeg,
+ # but we do it anyway because we're so hardcore (and we don't want
+ # multiple copies of ffmpeg).
+ configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg)
"--with-system-ffmpeg";
+
+ buildInputs =
+ [ pkgconfig bzip2 gstPluginsBase ]
+ ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
meta = {
homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg";;
-
description = "GStreamer's plug-in using FFmpeg";
-
license = "GPLv2+";
};
}
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
Mon Jul 25 19:08:00 2011 (r27950)
+++
nixpkgs/branches/kde-4.7/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
Mon Jul 25 20:10:13 2011 (r27951)
@@ -1,26 +1,29 @@
{ fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
-, flac, hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
-, libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
-, gnome, libcap, libtasn1, liboil
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
+, libiec61883, libavc1394, taglib, pulseaudio
+, glib, gstreamer, bzip2
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-good-0.10.25";
+ name = "gst-plugins-good-0.10.30";
src = fetchurl {
urls = [
"${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"
"mirror://gentoo/distfiles/${name}.tar.bz2"
];
- sha256 = "1xlr8rzb6pxi91g6jxhqa7cwl0kg5y21qfd9bgc4fb212867bmdm";
+ sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i";
};
- propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
- zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
- taglib gdbm pulseaudio gnome.libsoup libcap libtasn1 liboil];
- buildInputs = [pkgconfig];
+ configureFlags = "--disable-oss";
- configureFlags = "--enable-ladspa";
+ buildInputs =
+ [ pkgconfig glib gstreamer gstPluginsBase libavc1394 libiec61883
+ aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
+ taglib bzip2
+ ];
+
+ enableParallelBuilding = true;
meta = {
homepage = http://gstreamer.freedesktop.org;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
