From 2d2aef01a5ecdda0356a398c5bf5f31c96916183 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 6 Feb 2008 19:00:04 +0000 Subject: [PATCH] gstreamer moved to development/libraries/gstreamer, base and good plugins added. svn path=/nixpkgs/branches/stdenv-updates/; revision=10515 --- pkgs/applications/audio/GStreamer/default.nix | 13 --------- .../libraries/gstreamer/default.nix | 13 +++++++++ .../gstreamer/gst-plugins-base/0.10.17.nix | 24 +++++++++++++++++ .../gstreamer/gst-plugins-good/0.10.6.nix | 23 ++++++++++++++++ .../gst-plugins-good/tag_defines.patch | 22 +++++++++++++++ .../libraries/gstreamer/gstreamer/0.10.17.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 27 ++++++++++++------- 7 files changed, 120 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/audio/GStreamer/default.nix create mode 100644 pkgs/development/libraries/gstreamer/default.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch create mode 100644 pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix diff --git a/pkgs/applications/audio/GStreamer/default.nix b/pkgs/applications/audio/GStreamer/default.nix deleted file mode 100644 index 0239b29f7ee2..000000000000 --- a/pkgs/applications/audio/GStreamer/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, perl -, bison, flex, glib -, pkgconfig, libxml2}: - -stdenv.mkDerivation { - name = "GStreamer-0.10.10"; - src = fetchurl { - url = http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.10.tar.bz2; - md5 = "6875bf0bd3cf38b9ae1362b9e644e6fc"; - }; - - buildInputs = [perl bison flex glib pkgconfig libxml2]; -} diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix new file mode 100644 index 000000000000..678fbdb137a0 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -0,0 +1,13 @@ +args: with args; +rec { + gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.17") args; + gstreamer = gstreamerFun null; + + gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.17") + args { inherit gstreamer; }; + gstPluginsBase = gstPluginsBaseFun null; + + gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6") + args { inherit gstPluginsBase; }; + gstPluginsGood = gstPluginsGoodFun null; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix new file mode 100644 index 000000000000..036134c82c14 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix @@ -0,0 +1,24 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gst-plugins-base-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"; + sha256 = "03gpfhdaw7yz83y0wpq966b9dqpvw8v5kpixa1pp4mn7d5bgsb7q"; + }; + + patchPhase = "sed -i 's@/bin/echo@echo@g' configure"; + + configureFlags = "--enable-shared --disable-static"; + +# TODO : v4l, libvisual + propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia + gnomevfs libogg libtheora libvorbis freetype pango liboil gtk]; + + buildInputs = [pkgconfig python]; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix new file mode 100644 index 000000000000..104853307725 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix @@ -0,0 +1,23 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gst-plugins-good-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"; + sha256 = "0rid0gjj8nsk0r5yn4bz1xfsbp446r92wc6wp4099hilw6jxd74y"; + }; + + propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg + zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH + taglib ]; + buildInputs = [pkgconfig]; + + configureFlags = "--enable-shared --disable-static --enable-ladspa"; + + patches = [ ./tag_defines.patch ]; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch b/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch new file mode 100644 index 000000000000..0ece094229b9 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch @@ -0,0 +1,22 @@ +diff -Nur gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc +--- gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc 2007-06-13 11:21:10.000000000 +0200 ++++ gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc 2007-11-24 21:56:04.000000000 +0100 +@@ -532,6 +532,7 @@ + GST_TAG_TITLE, add_text_tag, "TIT2"}, { + GST_TAG_ALBUM, add_text_tag, "TALB"}, { + GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, { ++ GST_TAG_COMPOSER, add_text_tag, "TCOM"}, { + GST_TAG_GENRE, add_text_tag, "TCON"}, { + GST_TAG_COMMENT, add_comment_tag, ""}, { + GST_TAG_EXTENDED_COMMENT, add_comment_tag, ""}, { +@@ -544,7 +545,9 @@ + GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, { + GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, { + GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, { +- GST_TAG_MUSICBRAINZ_SORTNAME, add_text_tag, "TSOP"}, { ++ GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, { ++ GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, { ++ GST_TAG_TITLE_SORTNAME, add_text_tag, "TSOT"}, { + GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, { + GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, { + GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, { diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix new file mode 100644 index 000000000000..3508145c22c8 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix @@ -0,0 +1,20 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "gstreamer-" + version; + + src = fetchurl { + url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2"; + sha256 = "172nqf6l6mq4r1923bph53xd6h3svha3kkrvy5cald77jgf64a24"; + }; + + buildInputs = [perl bison flex pkgconfig python]; + propagatedBuildInputs = [glib libxml2]; + + configureFlags = "--enable-shared --disable-static --enable-failing-tests + --localstatedir=/var"; + + meta = { + homepage = http://gstreamer.freedesktop.org; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46d363ae5a9d..8125a35af53a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1970,6 +1970,16 @@ rec { inherit fetchurl stdenv gmp; }; + gst_all = import ../development/libraries/gstreamer { + inherit lib selectVersion stdenv fetchurl perl bison flex pkgconfig libxml2 + python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil + libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883 + dbus libavc1394 ladspaH taglib; + inherit (xorg) libX11 libXv libXext; + inherit (gtkLibs) glib pango gtk; + inherit (gnome) gnomevfs; + }; + gnet = import ../development/libraries/gnet { inherit fetchurl stdenv pkgconfig; inherit (gtkLibs) glib; @@ -2554,7 +2564,7 @@ rec { tapioca_qt = import ../development/libraries/tapioca-qt { inherit fetchsvn stdenv cmake telepathy_qt; - qt = qt4; + qt = qt4; }; telepathy_gabble = import ../development/libraries/telepathy-gabble { @@ -3837,6 +3847,8 @@ rec { inherit fetchurl stdenv ncurses; }; + cdparanoia = cdparanoiaIII; + cdparanoiaIII = import ../applications/audio/cdparanoia { inherit fetchurl stdenv; }; @@ -4113,7 +4125,9 @@ rec { }; pidgin = import ../applications/networking/instant-messengers/pidgin { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext ncurses; + inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss + gtkspell aspell gettext ncurses; + GStreamer = gst_all.gstreamer; inherit (gtkLibs) gtk; inherit (gnome) startupnotification; inherit (xlibs) libXScrnSaver; @@ -4141,8 +4155,8 @@ rec { }; gnash = assert mesaSupported; import ../applications/video/gnash { - inherit fetchurl stdenv SDL SDL_mixer GStreamer - libogg libxml2 libjpeg mesa libpng; + inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng; + GStreamer = gst_all.gstreamer; inherit (xlibs) libX11 libXext libXi libXmu; }; @@ -4161,11 +4175,6 @@ rec { inherit (gtkLibs) gtk; }; - GStreamer = import ../applications/audio/GStreamer { - inherit fetchurl stdenv perl bison flex pkgconfig libxml2; - inherit (gtkLibs) glib; - }; - gv = import ../applications/misc/gv { inherit fetchurl stdenv Xaw3d ghostscriptX; };