farsight-0.0.31

svn path=/nixpkgs/trunk/; revision=33041
This commit is contained in:
Yury G. Kudryashov 2012-03-13 19:06:32 +00:00
parent c6830bdf6a
commit fb422d45dd
3 changed files with 7 additions and 50 deletions

View file

@ -1,24 +1,19 @@
{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase,
pygobject, gst_python}:
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gstPluginsBase
, pygobject, gst_python, gupnp_igd }:
stdenv.mkDerivation rec {
name = "farsight2-0.0.22";
name = "farsight2-0.0.31";
src = fetchurl {
url = "http://farsight.freedesktop.org/releases/farsight2/${name}.tar.gz";
sha256 = "07yjndkx1p7ij1ifxsnbqbr8943wmq768x4812khka7dx6ii1sv9";
sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
};
buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase
pygobject gst_python ];
buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
preBuild = ''
sed -e '/^[[] -z/d' -i python/Makefile
find . -name Makefile -execdir sed -e '/^[.]NOEXPORT:/d' -i '{}' ';'
find . -name Makefile -execdir sed -r -e 's/^ {8,8}/\t/' -i '{}' ';'
'';
buildNativeInputs = [ pkgconfig ];
patches = [./makefile.patch];
propagatedBuildInputs = [ gstreamer gstPluginsBase ];
meta = {
homepage = http://farsight.freedesktop.org/wiki/;

View file

@ -1,37 +0,0 @@
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

View file

@ -3431,7 +3431,6 @@ let
faad2 = callPackage ../development/libraries/faad2 { };
farsight2 = callPackage ../development/libraries/farsight2 {
inherit (gnome) glib;
inherit (gst_all) gstreamer gstPluginsBase gst_python;
};