From 88af9b98d153d52178a33730bfae08c8851a680a Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 27 Dec 2009 15:27:45 +0000 Subject: [PATCH] add farsight2 svn path=/nixpkgs/trunk/; revision=19135 --- .../libraries/farsight2/default.nix | 21 +++++++++++ .../libraries/farsight2/makefile.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 64 insertions(+) create mode 100644 pkgs/development/libraries/farsight2/default.nix create mode 100644 pkgs/development/libraries/farsight2/makefile.patch diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix new file mode 100644 index 000000000000..b77540ce795e --- /dev/null +++ b/pkgs/development/libraries/farsight2/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase}: + +stdenv.mkDerivation { + name = "farsight2-0.0.16"; + + src = fetchurl { + url = http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.16.tar.gz; + sha256 = "07yjndkx1p7ij1ifxsnbqbr8943wmq768x4812khka7dx6ii1sv9"; + }; + + buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase ]; + + configureFlags = "--disable-python"; + + patches = [./makefile.patch]; + + meta = { + homepage = http://farsight.freedesktop.org/wiki/; + description = "Audio/Video Communications Framework"; + }; +} diff --git a/pkgs/development/libraries/farsight2/makefile.patch b/pkgs/development/libraries/farsight2/makefile.patch new file mode 100644 index 000000000000..e464d423df66 --- /dev/null +++ b/pkgs/development/libraries/farsight2/makefile.patch @@ -0,0 +1,37 @@ +diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.am farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am +--- farsight2-0.0.16/gst/rtcpfilter/Makefile.am 2009-05-08 23:34:14.000000000 +0200 ++++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.am 2009-12-27 16:17:32.000000000 +0100 +@@ -7,12 +7,14 @@ + libfsrtcpfilter_la_CFLAGS = \ + $(FS2_CFLAGS) \ + $(GST_BASE_CFLAGS) \ ++ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) + libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libfsrtcpfilter_la_LIBADD = \ + $(FS2_LIBS) \ + -lgstrtp-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) \ ++ $(GST_PLUGINS_BASE_LIBS) \ + $(GST_LIBS) + + +diff -ru farsight2-0.0.16/gst/rtcpfilter/Makefile.in farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in +--- farsight2-0.0.16/gst/rtcpfilter/Makefile.in 2009-10-06 20:24:00.000000000 +0200 ++++ farsight2-0.0.16.new/gst/rtcpfilter/Makefile.in 2009-12-27 16:23:36.000000000 +0100 +@@ -314,13 +314,14 @@ + libfsrtcpfilter_la_CFLAGS = \ + $(FS2_CFLAGS) \ + $(GST_BASE_CFLAGS) \ ++ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) + + libfsrtcpfilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libfsrtcpfilter_la_LIBADD = \ + $(FS2_LIBS) \ + -lgstrtp-@GST_MAJORMINOR@ \ +- $(GST_BASE_LIBS) \ ++ $(GST_PLUGINS_BASE_LIBS) \ + $(GST_LIBS) + + glib_enum_define = FS_RTCP_FILTER diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b04a75a78ac..a3b9f07b7f85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3259,6 +3259,12 @@ let inherit fetchurl stdenv; }; + farsight2 = import ../development/libraries/farsight2 { + inherit fetchurl stdenv libnice pkgconfig python; + inherit (gnome) glib; + inherit (gst_all) gstreamer gstPluginsBase; + }; + fcgi = import ../development/libraries/fcgi { inherit fetchurl stdenv; };