diff options
author | wiz <wiz> | 2009-03-22 08:51:24 +0000 |
---|---|---|
committer | wiz <wiz> | 2009-03-22 08:51:24 +0000 |
commit | 3a31df893b60968177a63d5f6909fdb448c0d581 (patch) | |
tree | 7eb9621cd3a4bcd90f8b32a5a8e1ef06dd93a94c /net/ekiga/patches | |
parent | 90f50f6f04929db630ab7d5739372ced84f94c20 (diff) | |
download | pkgsrc-3a31df893b60968177a63d5f6909fdb448c0d581.tar.gz |
Add some patches from ekiga Subversion, addressing PR 41041 by Jared McNeill.
Bump PKGREVISION.
Diffstat (limited to 'net/ekiga/patches')
-rw-r--r-- | net/ekiga/patches/patch-ab | 35 | ||||
-rw-r--r-- | net/ekiga/patches/patch-ac | 34 | ||||
-rw-r--r-- | net/ekiga/patches/patch-ad | 32 |
3 files changed, 101 insertions, 0 deletions
diff --git a/net/ekiga/patches/patch-ab b/net/ekiga/patches/patch-ab new file mode 100644 index 00000000000..3584d2923df --- /dev/null +++ b/net/ekiga/patches/patch-ab @@ -0,0 +1,35 @@ +$NetBSD: patch-ab,v 1.3 2009/03/22 08:51:24 wiz Exp $ + +http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 + +--- lib/engine/components/gstreamer/gst-audiooutput.cpp.orig 2009-01-27 20:32:29.000000000 +0000 ++++ lib/engine/components/gstreamer/gst-audiooutput.cpp +@@ -354,8 +354,11 @@ GST::AudioOutputManager::detect_alsasink + descr = g_strdup_printf ("volume name=ekiga_volume ! alsasink device=%s", + g_value_get_string (device)); + +- devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; +- g_free (name); ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; ++ g_free (name); ++ } + g_free (descr); + } + g_value_array_free (array); +@@ -400,8 +403,12 @@ GST::AudioOutputManager::detect_pulsesin + descr = g_strdup_printf ("volume name=ekiga_volume ! pulsesink device=%s", + g_value_get_string (device)); + +- devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; +- g_free (name); ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; ++ ++ g_free (name); ++ } + g_free (descr); + } + g_value_array_free (array); diff --git a/net/ekiga/patches/patch-ac b/net/ekiga/patches/patch-ac new file mode 100644 index 00000000000..2720c01bf16 --- /dev/null +++ b/net/ekiga/patches/patch-ac @@ -0,0 +1,34 @@ +$NetBSD: patch-ac,v 1.1 2009/03/22 08:51:24 wiz Exp $ + +http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 + +--- lib/engine/components/gstreamer/gst-audioinput.cpp.orig 2009-01-18 15:45:41.000000000 +0000 ++++ lib/engine/components/gstreamer/gst-audioinput.cpp +@@ -304,8 +304,11 @@ GST::AudioInputManager::detect_alsasrc_d + descr = g_strdup_printf ("alsasrc device=%s ! volume name=ekiga_volume", + g_value_get_string (device)); + +- devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; +- g_free (name); ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; ++ g_free (name); ++ } + g_free (descr); + } + g_value_array_free (array); +@@ -350,8 +353,11 @@ GST::AudioInputManager::detect_pulsesrc_ + descr = g_strdup_printf ("pulsesrc device=%s ! volume name=ekiga_volume", + g_value_get_string (device)); + +- devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; +- g_free (name); ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; ++ g_free (name); ++ } + g_free (descr); + } + g_value_array_free (array); diff --git a/net/ekiga/patches/patch-ad b/net/ekiga/patches/patch-ad new file mode 100644 index 00000000000..c56946f17f2 --- /dev/null +++ b/net/ekiga/patches/patch-ad @@ -0,0 +1,32 @@ +$NetBSD: patch-ad,v 1.1 2009/03/22 08:51:24 wiz Exp $ + +http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 + +--- lib/engine/components/gstreamer/gst-videoinput.cpp.orig 2009-01-23 09:29:44.000000000 +0000 ++++ lib/engine/components/gstreamer/gst-videoinput.cpp +@@ -274,7 +274,11 @@ GST::VideoInputManager::detect_v4l2src_d + descr = g_strdup_printf ("v4l2src device=%s" + " ! videoscale ! ffmpegcolorspace", + g_value_get_string (device)); +- devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr; ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr; ++ g_free (name); ++ } + g_free (descr); + } + +@@ -339,7 +343,11 @@ GST::VideoInputManager::detect_dv1394src + " ! videoscale" + " ! ffmpegcolorspace", + g_value_get_uint64 (guid)); +- devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr; ++ if (name != 0) { ++ ++ devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr; ++ g_free (name); ++ } + g_free (descr); + } + |