diff options
author | wiz <wiz> | 2009-03-22 08:51:24 +0000 |
---|---|---|
committer | wiz <wiz> | 2009-03-22 08:51:24 +0000 |
commit | a43e1559e051183543d6544c8097ceee1909af75 (patch) | |
tree | 7eb9621cd3a4bcd90f8b32a5a8e1ef06dd93a94c | |
parent | 7d0e05ac9173b59a9171b1db611b1dbd3c8ee9d2 (diff) | |
download | pkgsrc-a43e1559e051183543d6544c8097ceee1909af75.tar.gz |
Add some patches from ekiga Subversion, addressing PR 41041 by Jared McNeill.
Bump PKGREVISION.
-rw-r--r-- | net/ekiga/Makefile | 16 | ||||
-rw-r--r-- | net/ekiga/distinfo | 5 | ||||
-rw-r--r-- | net/ekiga/options.mk | 13 | ||||
-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 |
6 files changed, 122 insertions, 13 deletions
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index 9205e5d6971..e3895f41928 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2009/03/18 13:08:07 jmcneill Exp $ +# $NetBSD: Makefile,v 1.8 2009/03/22 08:51:24 wiz Exp $ # DISTNAME= ekiga-3.2.0 +PKGREVISION= 1 CATEGORIES= net comms MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ekiga/3.2/} EXTRACT_SUFX= .tar.bz2 @@ -20,16 +21,7 @@ USE_PKGLOCALEDIR= yes CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client:Q} CONFIGURE_ARGS+= --enable-gstreamer -PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga -PKG_SUPPORTED_OPTIONS+= avahi -PKG_SUGGESTED_OPTIONS+= avahi -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mavahi) -.include "../../net/avahi/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-avahi -.endif +.include "options.mk" GCONF_SCHEMAS= ekiga.schemas @@ -67,9 +59,9 @@ pre-configure: .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXv/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo index 71677852b0c..844e3fb49a0 100644 --- a/net/ekiga/distinfo +++ b/net/ekiga/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.5 2009/03/18 13:08:07 jmcneill Exp $ +$NetBSD: distinfo,v 1.6 2009/03/22 08:51:24 wiz Exp $ SHA1 (ekiga-3.2.0.tar.bz2) = 6a8d6f203cd982cbfb37822b2a96f176176cd763 RMD160 (ekiga-3.2.0.tar.bz2) = f31e94dbe03038e39fb5b50bd71372992c13ae8b Size (ekiga-3.2.0.tar.bz2) = 7679645 bytes SHA1 (patch-aa) = feecff1e35c7c55d63354393f2d4c4d14e36a57d +SHA1 (patch-ab) = 58f5d5c7bd341bba963a01f4aca1b08807b18127 +SHA1 (patch-ac) = e78684eaa3d26817571dd374d4beed61ee529d1b +SHA1 (patch-ad) = ae3d7eb1886b82bdfd127c256daa15304cd7e5e4 diff --git a/net/ekiga/options.mk b/net/ekiga/options.mk new file mode 100644 index 00000000000..17665f67fc5 --- /dev/null +++ b/net/ekiga/options.mk @@ -0,0 +1,13 @@ +# $NetBSD: options.mk,v 1.1 2009/03/22 08:51:24 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga +PKG_SUPPORTED_OPTIONS+= avahi +PKG_SUGGESTED_OPTIONS+= avahi + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mavahi) +.include "../../net/avahi/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-avahi +.endif 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); + } + |